Update translations.

author: Andrei Karas <akaras@inbox.ru> 2018-05-19 23:52:10 +0300
committer: Andrei Karas <akaras@inbox.ru> 2018-05-19 23:52:10 +0300
commit: b56d398bf575459f40fcf27052ab98311af4fcd6 (patch)
tree: 1e230e426dfe81c35c080e47c83254b6a92120c9
parent: 62f6aea80258af22dd939546c29fcd85c489d965 (diff)
download: ManaVerse-b56d398bf575459f40fcf27052ab98311af4fcd6.tar.gz
ManaVerse-b56d398bf575459f40fcf27052ab98311af4fcd6.tar.bz2
ManaVerse-b56d398bf575459f40fcf27052ab98311af4fcd6.tar.xz
ManaVerse-b56d398bf575459f40fcf27052ab98311af4fcd6.zip
25 files changed, 13665 insertions, 12063 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d8e3da7a8..83bebba0b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -32,6 +32,7 @@ src/gui/widgets/attrs/changedisplay.cpp
 src/gui/widgets/characterdisplay.cpp
 src/gui/widgets/itemcontainer.cpp
 src/gui/widgets/itemlinkhandler.cpp
+src/gui/widgets/pincode.cpp
 src/gui/widgets/selldialog.cpp
 src/gui/widgets/setupitem.cpp
 src/gui/widgets/statspagebasic.cpp
@@ -105,6 +106,7 @@ src/gui/windows/ministatuswindow.cpp
 src/gui/windows/npcdialog.cpp
 src/gui/windows/npcselldialog.cpp
 src/gui/windows/outfitwindow.cpp
+src/gui/windows/pincodedialog.cpp
 src/gui/windows/questswindow.cpp
 src/gui/windows/quitdialog.cpp
 src/gui/windows/registerdialog.cpp
@@ -163,6 +165,7 @@ src/net/tmwa/generalhandler.cpp
 src/net/tmwa/generalrecv.cpp
 src/net/tmwa/loginrecv.cpp
 src/net/tmwa/skillrecv.cpp
+src/pincodemanager.cpp
 src/progs/dyecmd/client.cpp
 src/progs/dyecmd/dyemain.cpp
 src/progs/manaplus/actions/actions.cpp
diff --git a/po/ca.po b/po/ca.po
index 67fdfd9aa..f4f719c38 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2018-01-01 18:37+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"Last-Translator: Javier Muñoz Ramón <javier.mura84@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
 "ca/)\n"
 "Language: ca\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "Visible al mapa"
 
@@ -41,12 +41,12 @@ msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "I"
 
@@ -58,53 +58,53 @@ msgid "You were killed by %s."
 msgstr "Heu estat assassinat per %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "Heu intentat agafar un objecte inexistent."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "L'objecte pesa massa."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "L'objecte és massa lluny."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "L'inventari és ple."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "L'inventari és massa gran."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "L'objecte pertany a una altra persona."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr "No podeu recollir aquesta quantitat d'objectes."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr "El vostre inventari d'objectes té capacitat màxima."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "Problema desconegut en agafar l'objecte."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -113,58 +113,58 @@ msgstr[1] "Heu recollit %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "ofici"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr "Homun"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr "pv"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr "manà"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr "Segueix: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "Segueix cancel·lat"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitació: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "Imitació cancel·lada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr "Observa %s"
@@ -402,21 +402,18 @@ msgstr "S'ha produït un error de xarxa"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:831
-#, fuzzy
 msgid "Auto disable Show beings transparency"
-msgstr "Mostra transparència d'éssers"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Mostra efectes de partícules"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
-#, fuzzy
 msgid "Auto enable opacity cache"
-msgstr "Activa opacitat d'IGU"
+msgstr ""
 
 #. TRANSLATORS: move type in status bar
 #: src/gamemodifiers.cpp:149
@@ -803,32 +800,35 @@ msgstr "Absent"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "D'ACORD"
 
@@ -859,14 +859,14 @@ msgstr "(F) mode de càmera lliure"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Tanca"
 
@@ -912,7 +912,7 @@ msgstr "Porteu menys de la meitat del vostre pes. Podeu recuperar salut."
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "per defecte"
 
@@ -1362,9 +1362,9 @@ msgstr "Gremi: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "Comentari: %s"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1560,9 +1560,9 @@ msgstr "Diàleg"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1580,7 +1580,7 @@ msgstr "Compra"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1650,8 +1650,8 @@ msgstr "Alimenta"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "Anomena de nou"
 
@@ -1675,7 +1675,7 @@ msgstr "Llença el botí"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1709,6 +1709,7 @@ msgstr "Afegeix nom al xat"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1741,10 +1742,11 @@ msgstr "Afegeix nom al xat"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "Cancel·la"
@@ -1800,7 +1802,7 @@ msgstr "Suprimeix"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr "Teletransportació"
 
@@ -1822,7 +1824,7 @@ msgstr "Restaura la càmera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Vestuari"
@@ -1854,8 +1856,10 @@ msgstr "Edita conjur"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "Neteja"
 
@@ -2026,9 +2030,9 @@ msgstr "Afegeix tots al intercanvi"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "Emmagatzema"
 
@@ -2065,8 +2069,8 @@ msgstr "Mou a crear..."
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "Recupera"
 
@@ -2105,10 +2109,10 @@ msgstr "Recupera-ho tot"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Utilitza"
@@ -2261,7 +2265,7 @@ msgstr "Selecciona tipus d'encanteri d'habilitat"
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "Per defecte"
 
@@ -2297,7 +2301,7 @@ msgstr "Desatendre"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -2403,8 +2407,8 @@ msgstr "Protegeix objecte"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "Llença..."
 
@@ -2419,7 +2423,7 @@ msgstr "Llença tots"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Llença"
 
@@ -2478,7 +2482,7 @@ msgstr "Emmagatzematge"
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr "Carretó"
@@ -2696,10 +2700,10 @@ msgstr "Crea un esclau"
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "Informació"
 
@@ -2891,7 +2895,7 @@ msgstr "Xat"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3204,7 +3208,7 @@ msgstr "Camí"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "Màxim"
@@ -3216,9 +3220,9 @@ msgstr "Màxim"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3232,7 +3236,7 @@ msgstr "Nivell: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3259,9 +3263,9 @@ msgstr "Obre url"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "Afegeix"
@@ -3273,10 +3277,10 @@ msgstr "Afegeix"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Surt"
 
@@ -3285,24 +3289,24 @@ msgstr "Surt"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preu: %s / Total: %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Edita"
 
@@ -3387,54 +3391,51 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "Parpelleig de nom"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
-#, fuzzy
 msgid "Master name"
-msgstr "Nom del mapa:"
+msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "Nom del mapa:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Música:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Mapa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr "Nom del mapa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Minimapa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "Cursor:"
 
@@ -3445,224 +3446,232 @@ msgstr "Recompte de partícules:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Recompte d'agents al mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Recompte d'agents al mapa:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Posició del jugador:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr "Trucades de dibuix:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr "Vincles de textures:"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Programari)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr "%d FPS (OpenGL normal)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr "%d FPS (OpenGL segur)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr "%d FPS (OpenGL ES mòbil)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr "%d FPS (OpenGL ES 2 mòbil)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr "%d FPS (OpenGL modern)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr "%d FPS (SDL2 per defecte)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr "Recompte de textures:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Recompte de partícules: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Selecciona:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "ID de l'objectiu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr "Tipus d'objectiu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr "Nivell de l'objectiu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr "Raça de l'objectiu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr "Equip de l'objectiu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr "Gremi de l'objectiu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "Retard de l'atac:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr "Cop mínim:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr "Cop màxim:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr "Cop crític:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr "Karma:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr "Manera:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr "Efectes:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Nivell de l'objectiu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Equip de l'objectiu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Gremi de l'objectiu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Rebent: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Enviant: %d bytes/s"
@@ -3770,46 +3779,58 @@ msgstr "So de missatge xiuxiueig"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
 #, fuzzy
-msgid "Guild / party / clan message sound"
-msgstr "So de missatge de gremi / equip"
+msgid "Guild message sound"
+msgstr "So de missatge global"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "So de missatge d'error"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+#, fuzzy
+msgid "Clan message sound"
+msgstr "So de missatge global"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
 msgid "Highlight message sound"
 msgstr "So de missatge ressaltat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Global message sound"
 msgstr "So de missatge global"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Error message sound"
 msgstr "So de missatge d'error"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr "So de sol·licitud d'intercanvi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr "So de mostrar la finestra"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr "So d'amagar la finestra"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Activa xat de veu de murmuri"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Baixa música"
 
@@ -4469,27 +4490,27 @@ msgid "Assign"
 msgstr "Assigna"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "Desassigna"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr "Restaura totes les tecles"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr "Entrada"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "Conflicte de tecla(es) detectat."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4500,51 +4521,51 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr "desconegut"
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "Premeu el botó per iniciar el calibratge"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Calibra"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr "Detecta les palanques de control"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Activa la palanca de control"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr ""
 "Utilitza la palanca de control si la finestra del client es troba inactiva"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "Palanca de control"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "Atura"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr "Gireu la palanca de control i no premeu cap botó"
 
@@ -4864,7 +4885,7 @@ msgstr "Activa notificacions importants"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "Botiga"
 
@@ -5073,14 +5094,14 @@ msgstr "Sense mods presents"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "No"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr "Rendiment"
 
@@ -5418,19 +5439,19 @@ msgstr "Permet xiuxiuejos"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Esborra"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr "Relacions"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Quan s'està ignorant:"
 
@@ -5502,8 +5523,8 @@ msgstr "i"
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Tema"
 
@@ -5530,8 +5551,8 @@ msgstr "Tema canviat"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Reinicia client per a què els canvis tinguin efecte."
 
@@ -5623,9 +5644,9 @@ msgstr "Límit d'FPS:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Límit d'FPS alternatiu: "
 
@@ -5635,50 +5656,50 @@ msgid "Detect best mode"
 msgstr "Detecta el millor mode"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr "PPP Alt"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr "Mostra el cursor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Cursor personalitzat"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr "Activa ajustament de la mida"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr "Sense marc"
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "Res"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5686,7 +5707,7 @@ msgstr ""
 "fallat!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5694,43 +5715,43 @@ msgstr ""
 "també ha fallat!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "S'està canviant a pantalla completa"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "Reinici requerit per a què els canvis tinguin efecte."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "S'està canviant a OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicar un canvi a OpenGL requereix reinici."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolució personalitzada (exemple: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "Entra nova resolució:                "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "La resolució de la pantalla ha canviat"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "És possible que algunes finestres es moguin per adaptar-se a la resolució "
@@ -6068,7 +6089,7 @@ msgstr "AJU"
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Ajuda"
 
@@ -6123,7 +6144,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Equipament"
 
@@ -6235,9 +6256,8 @@ msgstr "Correu"
 
 #. TRANSLATORS: short button name for clan window.
 #: src/gui/windowmenu.cpp:190
-#, fuzzy
 msgid "CL"
-msgstr "C"
+msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
 #: src/gui/windowmenu.cpp:195
@@ -6269,20 +6289,20 @@ msgstr "CON"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Configuració"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "Clau: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr "Diners al banc: %s"
@@ -6293,7 +6313,7 @@ msgid "Withdraw"
 msgstr "Retira"
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr "Dipòsit"
 
@@ -6303,20 +6323,20 @@ msgid "Create items"
 msgstr "Crea objectes"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr "Quantitat:"
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "Crea"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr "Filtre:"
 
@@ -6371,15 +6391,15 @@ msgstr "Les direccions de correu electrònic no coincideixen."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Error"
 
@@ -6394,7 +6414,7 @@ msgstr "Canvia Contrasenya"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "Contrasenya:"
 
@@ -6435,8 +6455,8 @@ msgstr "Personatge nou"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "Nom:"
 
@@ -6451,16 +6471,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribueix %d punts"
@@ -6469,71 +6489,71 @@ msgstr "Distribueix %d punts"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "Color de cabells:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "Pentinat:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr "Raça:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr "Aparença:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr "M"
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr "C"
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr "D"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "El nom ha de tenir com a mínim 4 caràcters."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "Atributs de personatge correctes"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "Heu de suprimir %d punts"
@@ -6560,36 +6580,37 @@ msgid "Switch"
 msgstr "Canvia"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr "Contrasenya"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "Juga"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Canvia inici de sessió"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr "Compte %s"
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr "Estableix un nou codi PIN"
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr "Introduïu un nom nou"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6605,27 +6626,27 @@ msgstr ""
 "Diners: %s"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "Contrasenya incorrecta"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr "Introduïu el vostre correu electrònic per esborrar un personatge"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr "Introduïu correu electrònic:"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "Introduïu contrasenya per esborrar un personatge"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "Introduïu contrasenya:"
 
@@ -6667,7 +6688,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Sí"
 
@@ -6708,42 +6729,42 @@ msgid "Connect"
 msgstr "Connecta"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr "Utilitza la mateixa IP"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr "Adreça:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Tipus de servidor:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr "Descripció:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr "Llista en línia d'url:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr "Versió del paquet:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr "Escriviu com a mínim l'adreça i el port del servidor."
 
@@ -6778,7 +6799,7 @@ msgstr "E"
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr "Desconegut"
@@ -6813,7 +6834,7 @@ msgstr "Insereix"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6824,93 +6845,93 @@ msgid "Equip"
 msgstr "Equipa"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr "B"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr "Sol·licitud per inserir targeta"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "Voleu inserir %s a %s?"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "Tot"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "Selecciona la quantitat d'objectes per intercanviar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "Selecciona la quantitat d'objectes per llençar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "Selecciona la quantitat d'objectes per guardar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr "Selecciona la quantitat d'objectes per enviar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr "Selecciona la quantitat d'objectes per crear."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr "Selecciona la quantitat d'objectes per guardar al carretó."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "Selecciona la quantitat d'objectes per recuperar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr "Selecciona la quantitat d'objectes per recuperar del carretó."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "Selecciona la quantitat d'objectes per dividir."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "Afegeix a la botiga comprar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "Afegeix a la botiga vendre."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "Desconegut."
 
@@ -6920,52 +6941,52 @@ msgid "Reset stats"
 msgstr "Reinicia estadístiques"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "Reinicia temporitzador"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Morts: %s, exp total: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Exp Mitj.: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Num. mitj. de criatures per al següent nivell: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Morts/Min: %s, Exp/Min: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Rap. d'ex. per %d min: %s"
 msgstr[1] "Rap. d'ex. per %d min: %s"
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -6973,40 +6994,40 @@ msgstr[0] "Temps pel següent nivell per %d min: %s"
 msgstr[1] "Temps pel següent nivell per %d min: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr "Exp. de l'última mort:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Nivell: %d a %f%%"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr "Exp: %s/%s Esquerre: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr "1%% = %s exp, mitj. de criatures per 1%%: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Temps pel següent nivell: %s"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "Inicia de sessió"
 
@@ -7029,29 +7050,29 @@ msgstr "Canvia Servidor"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "Registra"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "Amfitrió personalitzat d'actualització"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "Servidor:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr "Obre url de registre"
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr "Actualitzacions per defecte"
 
@@ -7072,14 +7093,14 @@ msgstr "Per a:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr "Assumpte:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr "Diners:"
 
@@ -7090,7 +7111,7 @@ msgstr "Objecte:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr "Missatge:"
 
@@ -7114,22 +7135,22 @@ msgid "Get attach"
 msgstr "Aconsegueix adjunts"
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr "Contesta"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr "Hora:"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr "Des de:"
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr "Aconsegueix diners"
 
@@ -7139,24 +7160,29 @@ msgid "Refresh"
 msgstr "Refresca"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr "Nou"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr "Envelleix"
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr "Torna"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr "Obre"
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7298,62 +7324,62 @@ msgid "Switch character"
 msgstr "Canvia personatge"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Confirma:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "Home"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "Dona"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "Correu electrònic:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "El nom d'usuari ha de tenir com a mínim%u caràcters."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "El nom d'usuari ha de tenir menys de %ucaràcters."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "La contrasenya ha de tenir com a mínim%u caràcters."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "La contrasenya ha de tenir menys de%u caràcters."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Les contrasenyes no coincideixen."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr "Correu electrònic incorrecte."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr "Correu electrònic massa llarg."
 
@@ -7363,48 +7389,53 @@ msgid "Choose Your Server"
 msgstr "Escolliu el vostre servidor"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Carrega"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Escolliu el vostre servidor  *** MODE SEGUR ***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "Escolliu el vostre servidor  *** MODE SEGUR ***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 msgid "Use same ip for game sub servers"
 msgstr "Utilitza la mateixa IP per a sub-servidors del joc"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "S'està baixant la llista de servidors...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "S'està esperant el servidor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "S'està preparant la baixada"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "S'ha produït un error en recuperar la llista de servidors!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "requereix una versió més nova"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "requereix v%s"
@@ -7462,72 +7493,72 @@ msgid "Reset Windows"
 msgstr "Restaura Finestres"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "Botiga personal"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr "Publica"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "Anuncia"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "Mostra enllaços a l'anunci"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr "Introduïu un nom de botiga nou"
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr "No publiquis"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr "error: jugador ocupat"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr "error: No podeu vendre aquest objecte"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr "error: No podeu comprar aquest objecte"
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr "%s vol comprar %s accepteu?"
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr "%s vol vendre %s accepteu?"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "Sol·licitud d'intercanvi"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Botiga personal - %s"
@@ -7544,46 +7575,46 @@ msgid "Skill points available: %d"
 msgstr "Punts d'habilitat restants: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr "Conjunt d'habilitats %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "Habilitat %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr "Habilitat %u"
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nivell: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr "L'habilitat ha fallat: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Afegeix text a l'habilitat %s"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr "Text: "
 
@@ -7793,35 +7824,35 @@ msgid "Trade: You"
 msgstr "Intercanvi: Vós"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "Heu aconseguit %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "Canvia"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "Oferiu:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "No teniu diners suficients."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "No s'ha pogut afegir objecte. No podeu afegir més d'un mateix tipus "
 "d'objecte a la finestra."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr "No s'ha pogut afegir objecte. No podeu intercanviar objectes equipats."
 
@@ -7896,7 +7927,7 @@ msgid "Change Login"
 msgstr "Canvia inici de sessió"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Tria Món"
 
@@ -9071,9 +9102,8 @@ msgstr "Finestra de configuració"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "Finestra del carretó"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9290,33 +9320,33 @@ msgstr "Connexió amb el servidor finalitzada. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr "S'ha produït un error en canviar el nom del personatge."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr "S'ha canviat el nom del personatge."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr "No es permès canviar el nom."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr "No s'ha establert el nom."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr "No s'ha trobat el personatge."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "S'ha produït un error en eliminar el personatge."
 
@@ -9346,13 +9376,13 @@ msgid "Work in progress."
 msgstr "Treball en curs."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "No s'ha pogut enviar el missatge, el canal %s no existeix."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "No es pot obrir el canal. El canal %s no existeix."
@@ -9369,7 +9399,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr "Voleu acceptar a %s i a %s com a pares?"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "Heu estat desconnectat del servidor!"
 
@@ -9625,108 +9655,108 @@ msgid "You were killed by unknown source."
 msgstr "Heu estat assassinat per una força desconeguda."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Error d'habilitat desconegut: %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr "Error d'habilitat desconegut: %d."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Encara no heu aconseguit el nivell necessari!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "PV insuficients!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "PH insuficients!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "No teniu cap nota!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "No podeu fer això!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Sembla ser que necessiteu més diners... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "No podeu utilitzar aquesta habilitat amb aquest tipus d'arma!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Necessiteu una altra gemma vermella!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Necessiteu una altra gemma blava!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Porteu massa objectes per fer això!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr "La invocació ha fallat."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr "Necessiteu esperits."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr "Necessiteu l'equipament %s."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr "Necessiteu l'equipament %s (x %d)"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr "Necessiteu l'objecte %s."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr "Necessiteu l'objecte %s (x %d)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr "L'habilitat ha fallat!"
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr "Selecciona objectiu de teletransportació"
 
@@ -9834,8 +9864,55 @@ msgstr "No heu pogut robar res."
 msgid "Poison had no effect..."
 msgstr "El verí no ha tingut cap efecte."
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "Introduïu contrasenya:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+#, fuzzy
+msgid "New pincode"
+msgstr "Estableix un nou codi PIN"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+#, fuzzy
+msgid "Enter new pincode"
+msgstr "Estableix un nou codi PIN"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Canvia l'avís"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr "Quant a"
 
@@ -9855,7 +9932,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr "Arxiu pujat"
 
@@ -9863,9 +9940,8 @@ msgstr "Arxiu pujat"
 #. TRANSLATORS: clear fonts cache message
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
 msgid "Cache cleared"
-msgstr "Memòria cau netejada"
+msgstr ""
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9883,9 +9959,8 @@ msgstr "Imatges de recursos:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "Imatges de recursos:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9894,48 +9969,40 @@ msgstr "Variables d'entorn buidades"
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1638
-#, fuzzy
 msgid "Config uploaded to:"
-msgstr "Arxiu pujat"
+msgstr ""
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1648
-#, fuzzy
 msgid "Server config Uploaded to:"
-msgstr "Valor de la configuració del servidor: %s"
+msgstr ""
 
 #. TRANSLATORS: upload log chat message
 #: src/progs/manaplus/actions/actions.cpp:1658
-#, fuzzy
 msgid "Log uploaded to:"
-msgstr "Registre pujada a:"
+msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
-"Desactiva l'opció vist per última vegada. Activa-la en jugadors / recull els "
-"ID del jugadors i el registre de vist."
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
-msgstr "No heu vist aquest usuari."
+msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr "Vist per última vegada a les %s: %s"
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
-msgstr "No heu vist aquest usuari."
+msgstr ""
 
 #. TRANSLATORS: whisper send
 #: src/progs/manaplus/actions/chat.cpp:279
@@ -10187,57 +10254,57 @@ msgid "Accepting incoming trade requests"
 msgstr "Acceptant sol·licituds d'intercanvi"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "S'està connectant al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "S'està iniciant sessió"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "S'està accedint al món del joc"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "S'estan sol·licitant personatges"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "S'està connectant al servidor del joc"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "S'estan canviant els servidors del joc"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "S'estan sol·licitant detalls de registre"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Canvi de contrasenya"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "Contrasenya canviada amb èxit!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "Canvi de correu electrònic"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "Correu electrònic canviat amb èxit!"
 
@@ -11544,12 +11611,3 @@ msgstr "%d segon"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segons"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Imatges de recurs orfe:"
-
-#~ msgid "Uploaded config into:"
-#~ msgstr "Configuració pujada a:"
-
-#~ msgid "Uploaded server config into:"
-#~ msgstr "Configuració de servidor pujada a:"
diff --git a/po/cs.po b/po/cs.po
index 261ef1be4..a0afef582 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,19 +14,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"Last-Translator: samuraiii <samurai.no.dojo@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
 "cs/)\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n "
+"<= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "Viditelný na mapě"
 
@@ -45,12 +46,12 @@ msgid "miss"
 msgstr "minutí"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "I"
 
@@ -62,114 +63,115 @@ msgid "You were killed by %s."
 msgstr "Byl jsi zabit %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "Snažili jste se sebrat neexistující předmět."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "Předmět je příliš těžký."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "Předmět je příliš daleko."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "Inventář je plný."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "Hromada je příliš velká."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "Předmět patří někomu jinému."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr "Nemůžeš zvednout toto možství předmětů."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr "Tvůj počet předmětů dasáhl maxima."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "Neznámý problém při pokusu sebrat předmět."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Sebral jsi  %d [@@%d|%s@@]."
 msgstr[1] "Sebral jsi  %d [@@%d|%s@@]."
 msgstr[2] "Sebral jsi %d [@@%d|%s@@]."
+msgstr[3] "Sebral jsi %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "zk"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "práce"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr "Nasledovat: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "Následování zrušeno."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitace: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "Imitace zrušena."
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr "Vidíš %s"
@@ -406,15 +408,13 @@ msgstr "Chyba sítě"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:831
-#, fuzzy
 msgid "Auto disable Show beings transparency"
-msgstr "Zobrazit objekty průhledné"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Částicové efekty"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
@@ -806,32 +806,35 @@ msgstr "Pryč"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "OK"
 
@@ -862,14 +865,14 @@ msgstr "(F) mód volné kamery"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Zavřít"
 
@@ -916,7 +919,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "výchozí"
 
@@ -1366,9 +1369,9 @@ msgstr "Guilda: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "Komentář: %s"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1564,9 +1567,9 @@ msgstr "Promluv"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1584,7 +1587,7 @@ msgstr "Nákup"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1654,8 +1657,8 @@ msgstr "Nakrmit"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "Přejmenovat"
 
@@ -1679,7 +1682,7 @@ msgstr "Upustit kořist"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1713,6 +1716,7 @@ msgstr "Vložit jméno do chatu"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1745,10 +1749,11 @@ msgstr "Vložit jméno do chatu"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "Zrušit"
@@ -1804,7 +1809,7 @@ msgstr "Odebrat"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr "Přesun"
 
@@ -1826,7 +1831,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Výstroje"
@@ -1858,8 +1863,10 @@ msgstr "Upravit kouzlo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "Vymazat"
 
@@ -2030,9 +2037,9 @@ msgstr "Přidat vše k obchodu"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "Uložit"
 
@@ -2069,8 +2076,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "Vzít"
 
@@ -2109,10 +2116,10 @@ msgstr "Vzít všechny"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Použít"
@@ -2265,7 +2272,7 @@ msgstr ""
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "Výchozí"
 
@@ -2301,7 +2308,7 @@ msgstr "Přehlížet"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Ignorovat"
 
@@ -2407,8 +2414,8 @@ msgstr "Chránit předmět"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "Upustit..."
 
@@ -2423,7 +2430,7 @@ msgstr "Upustit vše"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Upustit"
 
@@ -2482,7 +2489,7 @@ msgstr "Sklad"
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr "Košík"
@@ -2700,10 +2707,10 @@ msgstr ""
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "Informace"
 
@@ -2895,7 +2902,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3208,7 +3215,7 @@ msgstr "Bod na cestě"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "Vše"
@@ -3220,9 +3227,9 @@ msgstr "Vše"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3236,7 +3243,7 @@ msgstr "Úroveň: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3263,9 +3270,9 @@ msgstr "Otevři web adresu"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "Přidat"
@@ -3277,10 +3284,10 @@ msgstr "Přidat"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Ukončit"
 
@@ -3289,24 +3296,24 @@ msgstr "Ukončit"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cena: %s / Celkem %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Upravit"
 
@@ -3391,54 +3398,51 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "Blikat jménem"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
-#, fuzzy
 msgid "Master name"
-msgstr "Smazaná jména"
+msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "Jména GM"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Hudba:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Mapa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Minimapa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "Kurzor:"
 
@@ -3449,224 +3453,232 @@ msgstr "Počet částic:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Počet hráčů na mapě:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Počet hráčů na mapě:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Pozice hráče:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr "Draw calls:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr "Navázání Textur:"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr "%d FPS (normalní OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr "%d FPS (bezpečné OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr "%d FPS (moderní OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr "%d FPS (SDL2 výchozí)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr "Počet textur:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Počet částic: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Cíl:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "Id cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr "Typ cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr "Úroveň cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr "Rasa cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr "Parta cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr "Gilda cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "Prodleva útoku:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr "Minimální zásah:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr "Maximální zásah:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr "Kritický zásah:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr "Karma:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr "Vychování:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Úroveň cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Parta cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Gilda cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Příchozí: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Odchozí: %d bytes/s"
@@ -3774,46 +3786,58 @@ msgstr "Zvuk šeptané zprávy"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
 #, fuzzy
-msgid "Guild / party / clan message sound"
-msgstr "Zvuk zprávy Gildy / Party"
+msgid "Guild message sound"
+msgstr "Zvuk globálního oznámení"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "Zvuk chybového oznámení"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+#, fuzzy
+msgid "Clan message sound"
+msgstr "Zvuk globálního oznámení"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
 msgid "Highlight message sound"
 msgstr "Zvuk zvýrazněné zprávy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Global message sound"
 msgstr "Zvuk globálního oznámení"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Error message sound"
 msgstr "Zvuk chybového oznámení"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr "Zvuk požadavku na obchod"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr "Zvuk zobrazení okna"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr "Zvuk zavření okna"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Povolit mumble hlasový chat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Stáhnout hudbu"
 
@@ -4338,27 +4362,27 @@ msgid "Assign"
 msgstr "Přiřadit"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "Odebrat"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr "Resetovat všecky klávesy"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr "Vstup"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "Kolize kláves detekována/y."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4369,50 +4393,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr "neznámý"
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "Stiskněte tlačítko pro zahájení kalibrace"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Kalibrovat"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr "Detekovat joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Zapnout joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr "Používat joystick když není aktivní okno klienta"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "Zastavit"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr "Točte s pákou a nemačkejte tlačítka"
 
@@ -4732,7 +4756,7 @@ msgstr "Povolit upozornění na váhu"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "Obchod"
 
@@ -4941,14 +4965,14 @@ msgstr "Nejsou dostupné žádné modifikace"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "Ne"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr "Výkon"
 
@@ -5287,19 +5311,19 @@ msgstr "Povolit šeptání"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Smazat"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr "Vztahy"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Když ignoruji:"
 
@@ -5371,8 +5395,8 @@ msgstr "i"
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Téma"
 
@@ -5399,8 +5423,8 @@ msgstr "Téma změněno"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Restartujte klient pro aplikováni změn."
 
@@ -5492,9 +5516,9 @@ msgstr "Omezení FPS:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Altern. FPS omezení: "
 
@@ -5504,57 +5528,57 @@ msgid "Detect best mode"
 msgstr "Detekuj nejlepší režim"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr "Zobrazit kurzor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Vlastní kurzor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr "Povolit změnu velikosti"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr "Žádný rámeček"
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "Žádné"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Selhalo přepnutí do módu v okně a obnovení předchozího módu taktéž selhalo!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5562,43 +5586,43 @@ msgstr ""
 "selhalo!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "Přepínám na celou obrazovku"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "Pro uplatnění změn je potřeba restart."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "Měním na OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "Změny v OpenGL vyžadují restart."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Vlastní rozlišení (příklad: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "Zadej nové rozlišení:                "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "Rozlišení obrazovky změněno"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Některá okna mohou být přesunuta aby se vešla do menšího okna."
 
@@ -5934,7 +5958,7 @@ msgstr "POM"
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Nápověda"
 
@@ -5989,7 +6013,7 @@ msgstr "VYB"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Vybavení"
 
@@ -6134,20 +6158,20 @@ msgstr "NAS"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Nastavení"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "Klávesa: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr "Peníze v bance: %s"
@@ -6158,7 +6182,7 @@ msgid "Withdraw"
 msgstr "Vybrat"
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr "Vložit"
 
@@ -6168,20 +6192,20 @@ msgid "Create items"
 msgstr "Vytvořit předměty"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr "Počet:"
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "Vytvořit"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr "Filtr:"
 
@@ -6236,15 +6260,15 @@ msgstr "Emailové adresy nesouhlasí."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Chyba"
 
@@ -6259,7 +6283,7 @@ msgstr "Změnit heslo"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "Heslo:"
 
@@ -6300,8 +6324,8 @@ msgstr "Nová postava"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "Jméno:"
 
@@ -6316,16 +6340,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Rozdělte prosím %d bodů"
@@ -6334,71 +6358,71 @@ msgstr "Rozdělte prosím %d bodů"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "Barva vlasů:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "Účes:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr "Rasa:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr "Vzhled:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr "P"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "Vaše jméno musí mít nejméně 4 znaky."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "Stav postavy je v pořádku"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "Odstraňte prosím %d bodů"
@@ -6425,36 +6449,37 @@ msgid "Switch"
 msgstr "Přepnout"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr "Heslo"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "Hrát"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Změň přihlášení"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr "Účet %s"
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr "Prosím nastavte nový pin kód"
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr "Prosím zadejte nové jméno"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6465,27 +6490,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "Špatné heslo"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "Zadej heslo pro smazání postavy"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "Zadej heslo:"
 
@@ -6527,7 +6552,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Ano"
 
@@ -6568,42 +6593,42 @@ msgid "Connect"
 msgstr "Připojit"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr "Použít stejnou IP adresu"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr "Adresa:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Typ serveru:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr "Popis:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr "Url online seznamu:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr "Prosím zadejte alespoň adresu a port serveru."
 
@@ -6638,7 +6663,7 @@ msgstr ""
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr "Neznámý"
@@ -6673,7 +6698,7 @@ msgstr "Insert"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6684,93 +6709,93 @@ msgid "Equip"
 msgstr "Vybavit"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "Vše"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "Vyberte množství předmětů, se kterými budete obchodovat."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "Vyberte množství předmětů, které chcete upustit."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "Vyberte množství předmětů, které chcete uskladnit."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "Vyberte množství předmětů, které chcete obdržet."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "Vyberte množství předmětů, které chcete rozdělit."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "Přidat k nákupu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "Přidat k prodeji."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "Neznámý."
 
@@ -6780,95 +6805,97 @@ msgid "Reset stats"
 msgstr "Reset statistik"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "Reset časů"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Zabití: %s, celkem zk %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Prům Zk: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Počet prům. oblud do úrovně: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Zabití/Min: %s, Zk/Min: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Rychlost Zk za %d min: %s"
 msgstr[1] "Rychlost Zk za %d min: %s"
 msgstr[2] "Rychlost Zk za %d min: %s"
+msgstr[3] "Rychlost Zk za %d min: %s"
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Čas do další úrovně při %d min: %s"
 msgstr[1] "Čas do další úrovně při %d min: %s"
 msgstr[2] "Čas do další úrovně při %d min: %s"
+msgstr[3] "Čas do další úrovně při %d min: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr "Zk za poslední zabití:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Úroveň: %d na %f%%"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Čas do další úrovně: %s"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "Přihlášení"
 
@@ -6891,29 +6918,29 @@ msgstr "Změnit server"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "Registrace"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "Vlastní host updatů"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr "Otevřít registrační url"
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr ""
 
@@ -6934,14 +6961,14 @@ msgstr "Komu:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr ""
 
@@ -6952,7 +6979,7 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr ""
 
@@ -6976,22 +7003,22 @@ msgid "Get attach"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr ""
 
@@ -7001,24 +7028,29 @@ msgid "Refresh"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr ""
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7160,62 +7192,62 @@ msgid "Switch character"
 msgstr "Přepnout postavu"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Potvrdit:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "Muž"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "Žena"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "E-mail:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Jméno musí mít nejméně %u znaků."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Jméno musí mít méně než %u znaků."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "Heslo musí mít nejméně %u znaků."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Heslo musí mít méně než %u znaků."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr "Špatný e-mail."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr ""
 
@@ -7225,48 +7257,53 @@ msgid "Choose Your Server"
 msgstr "Zvolte server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Načíst"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Zvolte server *** BEZPEČNÝ MÓD ***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "Zvolte server *** BEZPEČNÝ MÓD ***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 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:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Stahuji seznam serverů...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "Čekám na odezvu serveru..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "Připravuji stažení"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "Chyba při získávání seznamu serverů!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "potřebuje novější verzi"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "potřebuje v%s"
@@ -7324,72 +7361,72 @@ msgid "Reset Windows"
 msgstr "Resetovat okna"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "Osobní obchod"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "Oznámit"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "Zobrazit odkazy v oznámení"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "Požadavek k obchodování"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -7406,46 +7443,46 @@ msgid "Skill points available: %d"
 msgstr "Dovednostních bodů: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr "Dovednost nastavena %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "Dovednost %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Úroveň: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Neúspěšná dovednost: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr ""
 
@@ -7655,33 +7692,33 @@ msgid "Trade: You"
 msgstr "Obchod: Ty"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "Dostaneš: %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "Změnit"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "Dáváš:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "Nemáš dost peněz."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Přidání věci selhalo. Nelze předávat stejný předmět v jednom okně."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -7756,7 +7793,7 @@ msgid "Change Login"
 msgstr "Změň přihlášení"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Vyber svět"
 
@@ -8933,9 +8970,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "Bankovní Okno"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9148,33 +9184,33 @@ msgstr "Spojení se serverem ukončeno. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr "Chyba přejmenování postavy."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr "Postava přejmenována."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr "Přejmenování není povoleno."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr "Nové jméno nebylo nastaveno."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr "Postava nenalezena."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "Nepodařilo se odstranit postavu."
 
@@ -9204,13 +9240,13 @@ msgid "Work in progress."
 msgstr "Na tomhle se pracuje."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "Zpráva nemohla být poslána. Kanál %s neexistuje."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "Není možné otevřít kanál %s. Kanál neexistuje."
@@ -9227,7 +9263,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "Byl jsem odpojen od server!"
 
@@ -9483,108 +9519,108 @@ msgid "You were killed by unknown source."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Nedosáhl jste ještě dostatečně vysoké úrovně!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Nedostatek životů (HP)!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Nedostatek bodů dovednosti (SP)!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Nemáte žádné zprávy!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Toto momentálně nemůžete udělat!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Vypadá to že potřebujete více peněz... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Nemůžete použít tuto dovednost s touto zbraní!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Potřebujete další rubín!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Potřebujete další safír!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Neseš příliš mnoho na to abys mohl udělat toto!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr ""
 
@@ -9692,8 +9728,55 @@ msgstr "Neleze ukrást nic..."
 msgid "Poison had no effect..."
 msgstr "Jed nemá žádný účinek..."
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "Zadej heslo:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+#, fuzzy
+msgid "New pincode"
+msgstr "Prosím nastavte nový pin kód"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+#, fuzzy
+msgid "Enter new pincode"
+msgstr "Prosím nastavte nový pin kód"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Změnit mód zobrazení mapy"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr "O ManaPlus"
 
@@ -9713,7 +9796,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr "Soubor byl uploadován"
 
@@ -9721,9 +9804,8 @@ msgstr "Soubor byl uploadován"
 #. TRANSLATORS: clear fonts cache message
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
 msgid "Cache cleared"
-msgstr "Vyrovnávací paměť vyčištěna"
+msgstr ""
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9741,9 +9823,8 @@ msgstr "Resource images:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "Resource images:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9752,9 +9833,8 @@ msgstr "Systémové proměnné uloženy"
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1638
-#, fuzzy
 msgid "Config uploaded to:"
-msgstr "Soubor byl uploadován"
+msgstr ""
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1648
@@ -9763,29 +9843,28 @@ msgstr ""
 
 #. TRANSLATORS: upload log chat message
 #: src/progs/manaplus/actions/actions.cpp:1658
-#, fuzzy
 msgid "Log uploaded to:"
-msgstr "Nahrány záznmy do:"
+msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
 msgstr ""
 
@@ -10038,57 +10117,57 @@ msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "Vyžaduji postavy"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "Vyměňuji herní servery"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Změna hesla"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "Změna emailu"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
@@ -11364,12 +11443,3 @@ msgstr "%d vteřinu"
 #, c-format
 msgid "%d seconds"
 msgstr "%d vteřin"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Resource orphaned images:"
-
-#~ msgid "Uploaded config into:"
-#~ msgstr "Nahráno nastavení do:"
-
-#~ msgid "Uploaded server config into:"
-#~ msgstr "Nahráno nastavení serveru do:"
diff --git a/po/de.po b/po/de.po
index 400ceb8ab..005ca720b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -43,9 +43,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2018-01-01 18:39+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"Last-Translator: Kristin Joris <kristin.joris@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
 "de/)\n"
 "Language: de\n"
@@ -55,7 +55,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "Auf der Karte sichtbar"
 
@@ -74,12 +74,12 @@ msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "I"
 
@@ -91,53 +91,53 @@ msgid "You were killed by %s."
 msgstr "Du wurdest von %s getötet."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "Du versuchst, einen nicht existierenden Gegenstand aufzuheben."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "Gegenstand ist zu schwer."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "Gegenstand ist zu weit weg."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "Inventar ist voll."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "Stapel ist zu groß."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "Gegenstand gehört jemand anderem."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr "Du kannst nicht diese Menge an Gegenständen aufnehmen."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr "Dein Gegenstandsstapel hat das Maximum erreicht."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "Fehler bei dem Aufheben des Items."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -146,58 +146,58 @@ msgstr[1] "Du hast %d [@@%d|%s@@] aufgehoben."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "EP"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "Job"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr "Homun"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr "hp"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr "mana"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr "Folgen: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "Folgen abgebrochen"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitation: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "Imitation abgebrochen"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr "Du siehst %s"
@@ -438,21 +438,18 @@ msgstr "Netzwerkfehler"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:831
-#, fuzzy
 msgid "Auto disable Show beings transparency"
-msgstr "Transparenz von Wesen anzeigen"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Partikeleffekte anzeigen"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
-#, fuzzy
 msgid "Auto enable opacity cache"
-msgstr "Gui Transparenz einschalten"
+msgstr ""
 
 #. TRANSLATORS: move type in status bar
 #: src/gamemodifiers.cpp:149
@@ -839,32 +836,35 @@ msgstr "Abwesend"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "OK"
 
@@ -895,14 +895,14 @@ msgstr "(F) Kameramodus: Frei"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Schließen"
 
@@ -952,7 +952,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "Standard"
 
@@ -1402,9 +1402,9 @@ msgstr "Gilde: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "Kommentar: %s"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1600,9 +1600,9 @@ msgstr "Sprechen"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1620,7 +1620,7 @@ msgstr "Kaufen"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1690,8 +1690,8 @@ msgstr "Füttern"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "Umbenennen"
 
@@ -1715,7 +1715,7 @@ msgstr "Beute wegwerfen"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1749,6 +1749,7 @@ msgstr "Name zum Chat hinzufügen"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1781,10 +1782,11 @@ msgstr "Name zum Chat hinzufügen"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -1840,7 +1842,7 @@ msgstr "Entfernen"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr "Teleport"
 
@@ -1862,7 +1864,7 @@ msgstr "Kamera wiederherstellen"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Ausrüstungset"
@@ -1894,8 +1896,10 @@ msgstr "Zauberspruch bearbeiten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "Leeren"
 
@@ -2066,9 +2070,9 @@ msgstr "Alles zum Handeln hinzufügen"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "Aufbewahren"
 
@@ -2105,8 +2109,8 @@ msgstr "Zum Herstellen bewegen..."
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "Abholen"
 
@@ -2145,10 +2149,10 @@ msgstr "Alles abholen"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Benutzen"
@@ -2301,7 +2305,7 @@ msgstr "Fähigkeitszauber-Typ wählen"
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "Standard"
 
@@ -2337,7 +2341,7 @@ msgstr "Missachten"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Ignorieren"
 
@@ -2443,8 +2447,8 @@ msgstr "Gegenstand schützen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "Wegwerfen..."
 
@@ -2459,7 +2463,7 @@ msgstr "Alles wegwerfen"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Wegwerfen"
 
@@ -2518,7 +2522,7 @@ msgstr "Lager"
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr "Einkaufswagen"
@@ -2736,10 +2740,10 @@ msgstr "Sklave erzeugen"
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "Info"
 
@@ -2931,7 +2935,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3244,7 +3248,7 @@ msgstr "Wegpunkt"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "Max"
@@ -3256,9 +3260,9 @@ msgstr "Max"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3272,7 +3276,7 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3299,9 +3303,9 @@ msgstr "URL öffnen"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "Hinzufügen"
@@ -3313,10 +3317,10 @@ msgstr "Hinzufügen"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Beenden"
 
@@ -3325,24 +3329,24 @@ msgstr "Beenden"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preis: %s / Gesamt: %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Ändern"
 
@@ -3427,54 +3431,51 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "Blinkender Name"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
-#, fuzzy
 msgid "Master name"
-msgstr "Kartenname:"
+msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "Kartenname:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Musik:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Karte:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr "Kartenname:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Minikarte:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "Zeiger:"
 
@@ -3485,224 +3486,232 @@ msgstr "Partikelanzahl:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Anzahl aktiver Kartenobjekte:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Anzahl aktiver Kartenobjekte:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Spielerposition:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr "Aufrufe anzeigen:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr "Texturbindungen:"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr "%d FPS (Normales OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr "%d FPS (Sicheres OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr "%d FPS (mobiles OpenGL ES)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr "%d FPS (mobiles OpenGL ES 2)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr "%d FPS (Modernes OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr "%d FPS (SDL2 Standart)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr "Texturanzahl:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Partikelanzahl: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Ziel:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "Ziel ID:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr "Art des Ziels:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr "Ziel Level:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr "Ziel Rasse:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr "Ziel Party:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr "Ziel Gilde:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "Angriffsverzug:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr "Minimaler Treffer:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr "Maximaler Treffer:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr "Kritischer Treffer:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr "Karma:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr "Verhalten:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr "Effekte:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Ziel Level:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Ziel Gruppe:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Ziel Gilde:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Eingehend: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Ausgehend: %d bytes/s"
@@ -3810,46 +3819,58 @@ msgstr "Geräusch für Flüsternachrichten"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
 #, fuzzy
-msgid "Guild / party / clan message sound"
-msgstr "Geräusch für Gilden-/Gruppennachrichten"
+msgid "Guild message sound"
+msgstr "Geräusch für allgemeine Nachrichten"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "Geräusch für Fehlermeldungen"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+#, fuzzy
+msgid "Clan message sound"
+msgstr "Geräusch für allgemeine Nachrichten"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
 msgid "Highlight message sound"
 msgstr "Nachrichtengeräusch hervorheben"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Global message sound"
 msgstr "Geräusch für allgemeine Nachrichten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Error message sound"
 msgstr "Geräusch für Fehlermeldungen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr "Geräusch für Handelsanfragen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr "Geräusch für Fenster anzeigen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr "Geräusch für Fenster verbergen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Mumble voice chat einschalten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Musik herunterladen"
 
@@ -4507,27 +4528,27 @@ msgid "Assign"
 msgstr "Zuweisen"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "Zuweisen rückgängig machen"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr "Alle Tastenbelegungen zurücksetzen"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr "Eingabe"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "Tastenkonflikt erkannt."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4538,50 +4559,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr "unbekannt"
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "Knopf drücken um die Kalibrierung zu starten"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Kalibrieren"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr "Joysticks erkennen"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Joystick aktivieren"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr "Joystick benutzen, wenn das Clientfenster inaktiv ist"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "Stop"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr "Drehe den Joystick und drücke keine Tasten"
 
@@ -4901,7 +4922,7 @@ msgstr "Benachrichtigungen über Gewicht aktivieren"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "Laden"
 
@@ -5112,14 +5133,14 @@ msgstr "Keine Mods vorhanden"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "Nein"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr "Leistung"
 
@@ -5458,19 +5479,19 @@ msgstr "Flüstern erlauben"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Löschen"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr "Beziehungen"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Wenn ignorierend:"
 
@@ -5542,8 +5563,8 @@ msgstr "i"
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Theme"
 
@@ -5570,8 +5591,8 @@ msgstr "Theme geändert"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Starte das Spiel neu, um die Änderungen zu übernehmen."
 
@@ -5663,9 +5684,9 @@ msgstr "FPS Grenze:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Alternative FPS Grenze: "
 
@@ -5675,50 +5696,50 @@ msgid "Detect best mode"
 msgstr "Besten Modus ermitteln"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr "Hohe DPI"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr "Zeiger anzeigen"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Benutzerdefinierter Zeiger"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr "Größenanpassung erlauben"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr "Kein Fensterrahmen"
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "Kein(e)"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5726,7 +5747,7 @@ msgstr ""
 "Auflösung schlug fehl!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5734,45 +5755,45 @@ msgstr ""
 "Auflösung schlug fehl!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "Wechsle zum Vollbildmodus"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "Wechsle zu OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Benutzerdefinierte Auflösung (zum Beispiel: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "Neue Auflösung eingeben:            "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "Bildschirmauflösung wurde geändert"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Einige Fenster könnten verschoben werden um in die herabgesetzte Auflösung "
@@ -6110,7 +6131,7 @@ msgstr "HIF"
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Hilfe"
 
@@ -6165,7 +6186,7 @@ msgstr "AUS"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Ausrüstung"
 
@@ -6277,9 +6298,8 @@ msgstr "Nachricht"
 
 #. TRANSLATORS: short button name for clan window.
 #: src/gui/windowmenu.cpp:190
-#, fuzzy
 msgid "CL"
-msgstr "C"
+msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
 #: src/gui/windowmenu.cpp:195
@@ -6311,20 +6331,20 @@ msgstr "EINST"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Einstellungen"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "Taste: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr "Geld in der Bank: %s"
@@ -6335,7 +6355,7 @@ msgid "Withdraw"
 msgstr "Abheben"
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr "Einzahlen"
 
@@ -6345,20 +6365,20 @@ msgid "Create items"
 msgstr "Gegenstände erstellen"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr "Menge:"
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "Erstellen"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr "Filter:"
 
@@ -6413,15 +6433,15 @@ msgstr "Die eingetragenen E-Mailadressen stimmen nicht überein."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Fehler"
 
@@ -6436,7 +6456,7 @@ msgstr "Passwort ändern"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "Passwort:"
 
@@ -6477,8 +6497,8 @@ msgstr "Neuer Charakter"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "Name:"
 
@@ -6493,16 +6513,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Bitte verteile %d Punkte"
@@ -6511,71 +6531,71 @@ msgstr "Bitte verteile %d Punkte"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "Haarfarbe:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "Frisur:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr "Rasse:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr "Schau:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr "W"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr "M"
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr "U"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "Charakterattribute OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "Bitte entferne %d Punkte"
@@ -6602,36 +6622,37 @@ msgid "Switch"
 msgstr "Wechseln"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr "Passwort"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "Spielen"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Login ändern"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr "Account %s"
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr "Bitte neuen Pincode eingeben"
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr "Bitte einen neuen Namen eingeben"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6647,27 +6668,27 @@ msgstr ""
 "Geld: %s"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "Falsches Passwort"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr "Gebe deine E-Mail ein, um den Charakter zu löschen"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr "E-Mail eingeben:"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "Gib dein Passwort ein, um den Charakter zu löschen"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "Gib dein Passwort ein:"
 
@@ -6709,7 +6730,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Ja"
 
@@ -6750,42 +6771,42 @@ msgid "Connect"
 msgstr "Verbinden"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr "Selbe IP benutzen"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr "Adresse:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Server Typ:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr "Beschreibung:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr "Link der Online-Liste:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr "Paket Version:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr "Bitte die Adresse und den Port eines Servers eingeben."
 
@@ -6820,7 +6841,7 @@ msgstr "T"
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr "Unbekannt"
@@ -6855,7 +6876,7 @@ msgstr "Einfügen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6866,93 +6887,93 @@ msgid "Equip"
 msgstr "Ausrüsten"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr "Anfrage, Karte einzulegen"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "Lege %s in %s ein?"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "Anzahl der Gegenstände zum Handeln auswählen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "Anzahl der Gegenstände zum Wegwerfen auswählen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "Anzahl der Gegenstände zum Aufbewaren auswählen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr "Anzahl der Gegenstände zum Senden auswählen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr "Anzahl der Gegenstände zum herstellen auswählen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr "Anzahl der Gegenstände vom Stand zum Einkaufswagen auswählen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "Anzahl der Gegenstände zum Abholen auswählen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr "Anzahl der Gegenstände zum Abholen vom Einkaufswagen auswählen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "Anzahl der Gegenstände zum Aufteilen auswählen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "Zum Einkaufsstand hinzufügen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "Zum Verkaufsstand hinzufügen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "Unbekannt."
 
@@ -6962,52 +6983,52 @@ msgid "Reset stats"
 msgstr "Statistik zurücksetzen"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "Zähler zurücksetzen"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Getötet: %s, Gesamte EP: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Durchschn. EP: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Durchschn.  Monsteranz. zum nächsten Level:  %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Tötungen/Min: %s, EP/Min: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Erfahrungspunkte Geschwindigkeit pro %d Min: %s"
 msgstr[1] "Geschwindigkeit der EP pro %d Min: %s"
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -7015,40 +7036,40 @@ msgstr[0] "Zeit bis zum nächsten Level pro %d Min: %s"
 msgstr[1] "Zeit bis zum nächsten Level pro %d Min: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr "EP vom letzter Tötung:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Level: %d bei %f%%"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr "Erfahrung: %s/%s übrig: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr "1 %% = %s exp, durchschn. Monsteranzahl für 1%%:%s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Zeit bis zum nächsten Level: %s"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "Anmelden"
 
@@ -7071,29 +7092,29 @@ msgstr "Server wechseln"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "Registrieren"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "Benutzerdefinierter Updateserver"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr "Registrierungslink öffnen"
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr "Normale Updates"
 
@@ -7114,14 +7135,14 @@ msgstr "Nach:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr "Betreff:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr "Geld:"
 
@@ -7132,7 +7153,7 @@ msgstr "Gegenstand:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr "Nachricht:"
 
@@ -7156,22 +7177,22 @@ msgid "Get attach"
 msgstr "Anhang herausnehmen"
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr "Antworten"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr "Zeit:"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr "Von:"
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr "Geld abheben"
 
@@ -7181,24 +7202,29 @@ msgid "Refresh"
 msgstr "Aktualisieren"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr "Neu"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr "Alt werden"
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr "Zurück senden"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr "Öffnen"
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7340,62 +7366,62 @@ msgid "Switch character"
 msgstr "Spielfigur wechseln"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "Männlich"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "Weiblich"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "E-Mail:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Der Benutzername muss mindestens %u Zeichen lang sein."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Der Benutzername darf nicht länger als %u Zeichen sein."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "Das Passwort muss mindestens %u Zeichen lang sein."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Das Passwort darf nicht länger als %u Zeichen sein."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr "Falsche E-Mail-Adresse."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr "E-Mail ist zu lang."
 
@@ -7405,48 +7431,53 @@ msgid "Choose Your Server"
 msgstr "Wähle deinen Server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Laden"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Wähle deinen Server  ***SICHERER MODUS ***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "Wähle deinen Server  ***SICHERER MODUS ***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 msgid "Use same ip for game sub servers"
 msgstr "Selbe IP auf Zweitservern des Spiels benutzen"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Serverliste herunterladen...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "Auf den Server warten..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "Download wird vorbereitet"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "Fehler beim Empfangen der Serverliste!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "benötigt eine neuere Version"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "benötigt v%s"
@@ -7504,72 +7535,72 @@ msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "Persönlicher Stand"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr "Veröffentlichen"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "Ankündigen"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "Links in Ankündigungen anzeigen"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr "Bitte neuen Namen für den Stand eingeben"
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr "Verstecke"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr "Fehler: Spieler ist beschäftigt"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr "Fehler: Kann diesen Gegenstand nicht verkaufen"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr "Fehler: Kann diesen Gegenstand nicht kaufen"
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr "%s möchte %s kaufen. Akzeptierst du?"
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr "%s möchte %s verkaufen. Akzeptierst du?"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "Handel anfordern"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Persönlicher Stand - %s"
@@ -7586,46 +7617,46 @@ msgid "Skill points available: %d"
 msgstr "Fähigkeitspunkte verfügbar: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr "Fähigkeitenset %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "Fähigkeit %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr "Fähigkeit %u"
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Fähigkeit fehlgeschlagen: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Text zum Skill %s hinzufügen"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr "Text: "
 
@@ -7835,35 +7866,35 @@ msgid "Trade: You"
 msgstr "Handel: Du"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "Du bekommst %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "Ändern"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "Du gibst:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "Du hast nicht genügend Geld."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
 "Gegenstände hinzufügen."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 "Gegenstand hinzufügen fehlgeschlagen. Du kannst micht mit ausgerüsteten "
@@ -7940,7 +7971,7 @@ msgid "Change Login"
 msgstr "Login ändern"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Welt auswählen"
 
@@ -9115,9 +9146,8 @@ msgstr "Fenster: Schnelle Einstellungen"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "Fenster: Warenkorb"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9335,33 +9365,33 @@ msgstr "Verbindung mit Server abgebrochen. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr "Fehler beim Umbennen des Charakters."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr "Charakter umbenannt."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr "Umbennen ist nicht erlaubt."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr "Neuer Name ist nicht gesetzt."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr "Charakter nicht gefunden."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "Konnte Charakter nicht löschen."
 
@@ -9391,13 +9421,13 @@ msgid "Work in progress."
 msgstr "Ist in Arbeit."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "Nachricht konnte nicht gesendet werden, Kanal %s gibt es nicht."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "Kann Kanal nicht öffnen. Kanal %s gibt es nicht."
@@ -9414,7 +9444,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr "Akzeptierst Du %s und %s als deine Eltern?"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "Verbindung zum Server unterbrochen!"
 
@@ -9670,108 +9700,108 @@ msgid "You were killed by unknown source."
 msgstr "Du wurdest von unbekannt getötet."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Unbekannter Fähigkeitsfehler: %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr "Unbekannter Fähigkeitsfehler: %d."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Dein Level ist noch nicht hoch genug!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Unzureichende HP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Unzureichende SP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Du hast keine Erinnerungen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Das kannst du im Moment nicht tun!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Sieht aus, als ob du mehr Geld brauchst.... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kannst die Fähigkeit nicht mit dieser Art von Waffe benutzen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Du brauchst ein weiteres rotes Juwel!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Du brauchst ein weiteres blaues Juwel!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Du trägst zu viel mit dir herum, um das zu tun!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr "Beschwörung fehlgeschlagen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr "Geister benötigt."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr "Gegenstand %s benötigt."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr "Gegenstand %s und Menge %d benötigt."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr "Gegenstand %s benötigt."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr "Gegenstand %s benötigt und Menge %d"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr "Fähigkeit fehlgeschlagen!"
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr "Warp Ziel auswählen"
 
@@ -9879,8 +9909,55 @@ msgstr "Konnte nichts stehlen..."
 msgid "Poison had no effect..."
 msgstr "Gift hatte kein Effekt..."
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "Gib dein Passwort ein:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+#, fuzzy
+msgid "New pincode"
+msgstr "Bitte neuen Pincode eingeben"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+#, fuzzy
+msgid "Enter new pincode"
+msgstr "Bitte neuen Pincode eingeben"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Notiz ändern"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr "Über"
 
@@ -9900,7 +9977,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr "Datei hochgeladen"
 
@@ -9908,9 +9985,8 @@ msgstr "Datei hochgeladen"
 #. TRANSLATORS: clear fonts cache message
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
 msgid "Cache cleared"
-msgstr "Zwischenspeicher geleert"
+msgstr ""
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9928,9 +10004,8 @@ msgstr "Bild-Quellen:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "Bild-Quellen:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9939,48 +10014,40 @@ msgstr "Umgebungsvariablen ausgegeben"
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1638
-#, fuzzy
 msgid "Config uploaded to:"
-msgstr "Datei hochgeladen"
+msgstr ""
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1648
-#, fuzzy
 msgid "Server config Uploaded to:"
-msgstr "Konfigurationswert des Servers: %s"
+msgstr ""
 
 #. TRANSLATORS: upload log chat message
 #: src/progs/manaplus/actions/actions.cpp:1658
-#, fuzzy
 msgid "Log uploaded to:"
-msgstr "Log hoch geladen zu:"
+msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
-"Zuletzt deaktiviert gesehen. Aktiviere in Spieler / Rufe Player ID ab und "
-"prüfe Log."
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
-msgstr "Du hast diesen Spieler nicht gesehen."
+msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr "Zuletzt gesehen für %s: %s"
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
-msgstr "Du hast diesen Spieler nicht gesehen."
+msgstr ""
 
 #. TRANSLATORS: whisper send
 #: src/progs/manaplus/actions/chat.cpp:279
@@ -10233,57 +10300,57 @@ msgid "Accepting incoming trade requests"
 msgstr "Eingehende Handelsanfragen akzeptieren"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "Anmelden"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "Spielfiguren werden abgefragt"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Spielserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "Spielserver wechseln"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Passwort ändern"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
@@ -11532,7 +11599,7 @@ msgstr ""
 #: src/utils/stringutils.cpp:960
 #, c-format
 msgid "%d week"
-msgstr "%d Wochen"
+msgstr ""
 
 #: src/utils/stringutils.cpp:960
 #, c-format
@@ -11543,7 +11610,7 @@ msgstr "%d Wochen"
 #: src/utils/stringutils.cpp:971
 #, c-format
 msgid "%d day"
-msgstr "%d Tage"
+msgstr "%d Tag"
 
 #: src/utils/stringutils.cpp:971
 #, c-format
@@ -11554,7 +11621,7 @@ msgstr "%d Tage"
 #: src/utils/stringutils.cpp:981
 #, c-format
 msgid "%d hour"
-msgstr "%d Stunden"
+msgstr "%d Stunde"
 
 #: src/utils/stringutils.cpp:981
 #, c-format
@@ -11565,7 +11632,7 @@ msgstr "%d Stunden"
 #: src/utils/stringutils.cpp:991
 #, c-format
 msgid "%d minute"
-msgstr "%d Minuten"
+msgstr "%d Minute"
 
 #: src/utils/stringutils.cpp:991
 #, c-format
@@ -11576,18 +11643,9 @@ msgstr "%d Minuten"
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d second"
-msgstr "%d Sekunden"
+msgstr ""
 
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Quelle verwaister Bilddataien:"
-
-#~ msgid "Uploaded config into:"
-#~ msgstr "Konfiguration hochgeladen zu:"
-
-#~ msgid "Uploaded server config into:"
-#~ msgstr "Serverconfig hochgeladen zu:"
diff --git a/po/eo.po b/po/eo.po
index 1c7acf4b5..05d8779ea 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Esperanto (http://www.transifex.com/akaras/manaplus/language/"
 "eo/)\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "Videbla sur mapo"
 
@@ -41,12 +41,12 @@ msgid "miss"
 msgstr "preter"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "F"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "N"
 
@@ -58,53 +58,53 @@ msgid "You were killed by %s."
 msgstr "Vin mortigis %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "Provis preni neekzistantan objekton."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "Objekto estas tro peza."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "Objekto estas tro malproksima."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "Objektujo estas plena."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "Stako estas tro granda."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "Objekto apartenas al iu alia."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr "Vi ne povas preni tiom da objektoj."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr "Via objekta stako havas la maksimuman nombron."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "Nekonata eraro prenante objekton."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -113,58 +113,58 @@ msgstr[1] "Vi prenis %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "sperto"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "lerto"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr "Artohomo"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr "sano"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr "manao"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr "Sekvi: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "Sekvado ĉesis"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imiti: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "Imitado ĉesis"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr "Vi vidas %s"
@@ -402,21 +402,18 @@ msgstr "Reta Eraro"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:831
-#, fuzzy
 msgid "Auto disable Show beings transparency"
-msgstr "Montri travideblecon de estaĵoj"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Montri partiklojn"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
-#, fuzzy
 msgid "Auto enable opacity cache"
-msgstr "Ŝalti fasadan opakecon"
+msgstr ""
 
 #. TRANSLATORS: move type in status bar
 #: src/gamemodifiers.cpp:149
@@ -803,32 +800,35 @@ msgstr "For"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "Bone"
 
@@ -859,14 +859,14 @@ msgstr "(F) libera reĝimo de vidpunkto"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Fermi"
 
@@ -912,7 +912,7 @@ msgstr "Vi portas malpli ol duonon de via pezo. Vi povas resaniĝi."
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "implicita"
 
@@ -1362,9 +1362,9 @@ msgstr "Gildo: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "Komento: %s"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1560,9 +1560,9 @@ msgstr "Paroli"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1580,7 +1580,7 @@ msgstr "Aĉeti"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1650,8 +1650,8 @@ msgstr "Nutri"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "Renomi"
 
@@ -1675,7 +1675,7 @@ msgstr "Demeti predon"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1709,6 +1709,7 @@ msgstr "Aldoni nomon al retbabilo"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1741,10 +1742,11 @@ msgstr "Aldoni nomon al retbabilo"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "Rezigni"
@@ -1800,7 +1802,7 @@ msgstr "Forigi"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr "Varpo"
 
@@ -1822,7 +1824,7 @@ msgstr "Restaŭri vidpunkton"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Vestaroj"
@@ -1854,8 +1856,10 @@ msgstr "Redakti sorĉon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "Vakigi"
 
@@ -2026,9 +2030,9 @@ msgstr "Aldoni al negoco ĉion"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "Deponi"
 
@@ -2065,8 +2069,8 @@ msgstr "Movi al metio..."
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "Maldeponi"
 
@@ -2105,10 +2109,10 @@ msgstr "Maldeponi ĉion"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Uzi"
@@ -2261,7 +2265,7 @@ msgstr "Elektu tipon de scipova uzo"
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "Implicita"
 
@@ -2297,7 +2301,7 @@ msgstr "Malobservi"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Malatenti"
 
@@ -2403,8 +2407,8 @@ msgstr "Sekurigi objekton"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "Demeti..."
 
@@ -2419,7 +2423,7 @@ msgstr "Demeti ĉion"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Demeti"
 
@@ -2478,7 +2482,7 @@ msgstr "Deponejo"
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr "Ĉaro"
@@ -2696,10 +2700,10 @@ msgstr "Generi sklavon"
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "Informoj"
 
@@ -2891,7 +2895,7 @@ msgstr "Retbabilado"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3204,7 +3208,7 @@ msgstr "Vojpunkto"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "Maksimume"
@@ -3216,9 +3220,9 @@ msgstr "Maksimume"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3232,7 +3236,7 @@ msgstr "Nivelo: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3259,9 +3263,9 @@ msgstr "Malfermi url"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "Aldoni"
@@ -3273,10 +3277,10 @@ msgstr "Aldoni"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Eliri"
 
@@ -3285,24 +3289,24 @@ msgstr "Eliri"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Kosto: %s / Entute: %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Redakti"
 
@@ -3387,54 +3391,51 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "Pulsa nomo"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
-#, fuzzy
 msgid "Master name"
-msgstr "Nomo de mapo:"
+msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "Nomo de mapo:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Muziko:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Mapo:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr "Nomo de mapo:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Mapeto:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "Kursoro:"
 
@@ -3445,224 +3446,232 @@ msgstr "Nombro da partikloj:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Nombro de roluloj en mapo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Nombro de roluloj en mapo:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Pozicio de Avataro:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr "Desegnaj vokoj:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr "Teksturaj bindoj:"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d KS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr "%d LS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d KS (Programa)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr "%d KS (normala OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr "%d KS (sendanĝera OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr "%d KS (portebla OpenGL ES)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr "%d KS (portebla OpenGL ES 2)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr "%d KS (moderna OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr "%d KS (SDL2 implicita)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr "Nombro da teksturoj:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Nombro da partikloj: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Celo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "Identigaĵo de Celo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr "Tipo de celo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr "Nivelo de celo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr "Gento de celo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr "Partio de celo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr "Gildo de celo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "Ataka prokrasto:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr "Minimuma trafo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr "Maksimuma trafo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr "Ega trafo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr "Karmo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr "Konduto:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr "Efektoj:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Nivelo de Celo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Partio de Celo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Gildo de Celo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Resondado: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "En: %d bajtoj/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "El: %d bajtoj/s"
@@ -3770,46 +3779,58 @@ msgstr "Sono de flustra mesaĝo"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
 #, fuzzy
-msgid "Guild / party / clan message sound"
-msgstr "Sono de gilda / partia mesaĝo"
+msgid "Guild message sound"
+msgstr "Sono de tutluda mesaĝo"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "Sono de erara mesaĝo"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+#, fuzzy
+msgid "Clan message sound"
+msgstr "Sono de tutluda mesaĝo"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
 msgid "Highlight message sound"
 msgstr "Sono de marka mesaĝo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Global message sound"
 msgstr "Sono de tutluda mesaĝo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Error message sound"
 msgstr "Sono de erara mesaĝo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr "Sono de negoca mesaĝo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr "Sono de fenestra montro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr "Sono de fenestra kaŝo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Ŝalti voĉbabilon per Mumble"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Elŝuti muzikon"
 
@@ -4450,27 +4471,27 @@ msgid "Assign"
 msgstr "Atribui"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "Malatribui"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr "Reŝarĝi ĉiujn klavojn"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr "Enigo"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "Detektitaj konfliktoj de klavoj."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4481,50 +4502,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr "nekonata"
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "Premu klavon por komencigi kalibron"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "kalibri"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr "Detekti stirstangojn"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Ŝalti stirstangojn"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr "Uzi stirstangon se la klienta fenestro ne estas fokusita"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "Stirstango"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "Halti"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr "Turni stangon kaj ne premu klavojn"
 
@@ -4844,7 +4865,7 @@ msgstr "Ŝalti avizojn pri pezo"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "Butiko"
 
@@ -5054,14 +5075,14 @@ msgstr "Neniaj modifoj ĉeestantaj"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "Ne"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr "Rendimento"
 
@@ -5394,19 +5415,19 @@ msgstr "Permesi flustrojn"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Forigi"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr "Rilatoj"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Dum ignorado:"
 
@@ -5478,8 +5499,8 @@ msgstr "i"
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Etoso"
 
@@ -5506,8 +5527,8 @@ msgstr "Etoso Ŝanĝita"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Restartigi vian klienton por efektivigi la ŝanĝon."
 
@@ -5599,9 +5620,9 @@ msgstr "KS limo:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Alternativa KS limo: "
 
@@ -5611,50 +5632,50 @@ msgid "Detect best mode"
 msgstr "Detekti plej bonan reĝimon"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr "Montri kursoron"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Propra kursoro"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr "Permesi regrandigon"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr "Sen kadro"
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "Nenia"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5662,7 +5683,7 @@ msgstr ""
 "malsukcesis!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5670,43 +5691,43 @@ msgstr ""
 "malsukcesis!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "Ŝaltanta Tutekranon"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "Restartigo bezonata por efektivigi la ŝanĝojn."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "Ŝaltanta OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ŝanĝi OpenGL bezonas restartigon."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Propra distingivo (ekzemple: 1024:768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "Enigu novan distingivon:                "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "Distingivo de Ekrano Ŝanĝita"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Iaj fenestroj eble moviĝos por konformi al la pli malgranda distingivo."
@@ -6043,7 +6064,7 @@ msgstr "HEL"
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Helpo"
 
@@ -6098,7 +6119,7 @@ msgstr "SUR"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Surhavaro"
 
@@ -6210,9 +6231,8 @@ msgstr "Poŝto"
 
 #. TRANSLATORS: short button name for clan window.
 #: src/gui/windowmenu.cpp:190
-#, fuzzy
 msgid "CL"
-msgstr "Ĉ"
+msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
 #: src/gui/windowmenu.cpp:195
@@ -6244,20 +6264,20 @@ msgstr "AG"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Agordoj"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "Klavo: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr "Mono en banko: %s"
@@ -6268,7 +6288,7 @@ msgid "Withdraw"
 msgstr "Retrati"
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr "Deponi"
 
@@ -6278,20 +6298,20 @@ msgid "Create items"
 msgstr "Krei objektojn"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr "Kvanto:"
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "Krei"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr "Filtrilo:"
 
@@ -6346,15 +6366,15 @@ msgstr "La retpoŝtadresoj ne kongruas."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Eraro"
 
@@ -6369,7 +6389,7 @@ msgstr "Ŝanĝi Pasvorton"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "Pasvorto:"
 
@@ -6410,8 +6430,8 @@ msgstr "Nova Avataro"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "Nomo:"
 
@@ -6426,16 +6446,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Bonvolu disdoni %d poentojn"
@@ -6444,71 +6464,71 @@ msgstr "Bonvolu disdoni %d poentojn"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "Har-koloro:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "Har-stilo:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr "Raso:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr "Aspekto:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr "A"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr "B"
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr "V"
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr "N"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "Via nomo devas esti longa almenaŭ 4 signoj."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "Avataraj atributoj bonas"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "Bonvolu forpreni %d poentojn"
@@ -6535,36 +6555,37 @@ msgid "Switch"
 msgstr "Ŝanĝi"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr "Pasvorto"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "Ludi"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Ŝanĝi Saluton"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr "Konto %s"
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr "Bonvolu agordi novan PIN-on"
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr "Bonvolu entajpi novan nomon"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6575,27 +6596,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "Malĝusta pasvorto"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr "Enigu vian retpoŝtadreson por forigi avataron"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr "Enigu retpoŝtadreson:"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "Enigu pasvorton por forigi avataron"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "Enigu pasvorton:"
 
@@ -6637,7 +6658,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Jes"
 
@@ -6678,42 +6699,42 @@ msgid "Connect"
 msgstr "Konekti"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr "Uzi saman IP"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr "Adreso:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Pordo:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Servilo-tipo:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr "Priskribo:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr "URL de listo de enretaj:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr "Paketa versio:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr "Bonvolu almenaŭ entajpi ambaŭ la adreson kaj pardon de la servilo."
 
@@ -6748,7 +6769,7 @@ msgstr "M"
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr "Nekonata"
@@ -6783,7 +6804,7 @@ msgstr "Enmeti"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6794,93 +6815,93 @@ msgid "Equip"
 msgstr "Surhavi"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr "Ĉ"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr "B"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr "Peto enmeti karton"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "Ĉu enmeti %s en %s-n?"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "Ĉio"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "Elektu kiom da objektojn transdoni."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "Elektu kiom da objektojn demeti."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "Elektu kiom da objektojn deponi."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr "Elektu kiom da objektojn sendi."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr "Elektu kiom da objektojn krei."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr "Elektu kiom da objektojn deponi en ĉaron."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "Elektu kiom da objektojn preni."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr "Elektu kiom da objektojn preni de ĉaro."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "Elektu kiom da objektojn dividi."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "Aldoni al aĉetejo."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "Aldoni al vendejo."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "Nekonata."
 
@@ -6890,52 +6911,52 @@ msgid "Reset stats"
 msgstr "Reŝarĝi atributojn"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "Rekomencigi horloĝon"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Mortigoj: %s, tuta sperto: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Meza Sperto: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "N-ro da mezaj monstroj ĝis la sekva nivelo: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Mortigoj/Min: %s, Sperto/Min: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Sperta rapido po %d min: %s"
 msgstr[1] "Sperta rapido po %d min: %s"
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -6943,40 +6964,40 @@ msgstr[0] "Tempo por sekva nivelo po %d min: %s"
 msgstr[1] "Tempo por sekva nivelo po %d min: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr "Sperto el lasta mortigo:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Nivelo: %d je %f%%"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Tempo por sekva nivelo: %s"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "Saluti"
 
@@ -6999,29 +7020,29 @@ msgstr "Ŝanĝi Servilon"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "Registriĝi"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "Propra gastiga ĝisdatiga komputilo"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "Servilo:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr "Malfermi registriĝan url-n"
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr "implicitaj ĝisdatigoj"
 
@@ -7042,14 +7063,14 @@ msgstr "Al:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr "Temo:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr "Mono:"
 
@@ -7060,7 +7081,7 @@ msgstr "Objekto:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr "Mesaĝo:"
 
@@ -7084,22 +7105,22 @@ msgid "Get attach"
 msgstr "Akiri aldonaĵon"
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr "Respondi"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr "Tempo:"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr "De:"
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr ""
 
@@ -7109,24 +7130,29 @@ msgid "Refresh"
 msgstr "Aktualigi"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr "Nova"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr ""
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr "Revenigi"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr "Malfermi"
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7268,62 +7294,62 @@ msgid "Switch character"
 msgstr "Ŝanĝi avataron"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Konfirmi:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "Iĉa"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "Ina"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "Retpoŝtadreso:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "La uzantnomo devas esti longa almenaŭ %u signoj."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "La uzantnomo devas esti pli mallonga ol %u signoj."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "La pasvorto devas esti longa almenaŭ %u signoj."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "La pasvorto devas esti pli mallonga ol %u signoj."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Pasvortoj ne kongruas."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr "Malĝusta retpoŝtadreso."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr "Retpoŝtadreso tro longa."
 
@@ -7333,48 +7359,53 @@ msgid "Choose Your Server"
 msgstr "Elektu Vian Servilon"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Ŝarĝi"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Elektu Vian Servilon *** SENDANĜERA REĜIMO ***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "Elektu Vian Servilon *** SENDANĜERA REĜIMO ***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 msgid "Use same ip for game sub servers"
 msgstr "Uzi la saman ip adreson por subludaj serviloj"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Elŝutanta liston de serviloj...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "Atendanta servilon..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "Pretiganta elŝuton"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "Eraro ricevante liston de serviloj!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "postuli novan version"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "bezonas v%s"
@@ -7432,72 +7463,72 @@ msgid "Reset Windows"
 msgstr "Rekomencigi Fenestrojn"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "Persona Butiko"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr "Publikigi"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "Anonci"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "Montri ligilojn dum konekto"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr "Bonvolu entajpi novan nomon de butiko"
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr "Malpublikigi"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr "eraro: ludanto okupita"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr "eraro: Ne eblas vendi tiun ĉi objekton"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr "eraro: Ne eblas aĉeti tiun ĉi objekton"
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr "%s volas aĉeti %s ĉu vi akceptas?"
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr "%s volas vendi %s ĉu vi akceptas?"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "Negoca Peto"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Persona Butiko - %s"
@@ -7514,46 +7545,46 @@ msgid "Skill points available: %d"
 msgstr "Scipovaj poentoj disponeblaj: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr "Scipovaro %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "Scipovo %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr "Scipovo %u"
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niv: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Malsukcesa scipovo: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Aldoni tekston al scipovo %s"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr "Teksto: "
 
@@ -7763,35 +7794,35 @@ msgid "Trade: You"
 msgstr "Negoco: Vi"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "Vi ricevas %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "Ŝanĝi"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "Vi donas:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "Vi ne havas sufiĉe da mono."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Malsukcesis aldoni objekton. Vi ne povas sinkovri unu specon de objekto sur "
 "la fenestron."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 "Malsukcesis aldoni objekton. Vi ne povas transdoni surhavatajn objektojn."
@@ -7867,7 +7898,7 @@ msgid "Change Login"
 msgstr "Ŝanĝi Saluton"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Elekti Mondon"
 
@@ -9042,9 +9073,8 @@ msgstr "Rapida agorda fenestro"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "Ĉara fenestro"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9258,33 +9288,33 @@ msgstr "Konekto al servilo finita. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr "Eraro renomi avataron."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr "Avataro renomita."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr "Renomo ne permesita."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr "Nova nomo ne agordita."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr "Avataro ne trovita."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "Malsukcesis forigi avataron."
 
@@ -9314,13 +9344,13 @@ msgid "Work in progress."
 msgstr "Farata laboro."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "Ne eblas sendi mesaĝon, kanalo %s ne ekzistas."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "Ne eblas malfermi kanalon. Kanalo %s ne ekzistas."
@@ -9337,7 +9367,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr "Ĉu vi akceptas %s-n kaj %s-n kiel gepatrojn?"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "Malkonektigita de servilo!"
 
@@ -9593,108 +9623,108 @@ msgid "You were killed by unknown source."
 msgstr "Vin mortigis nekonataĵo."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Eraro de nekonata scipovo: %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr "Eraro de nekonata scipovo: %d."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Vi ankoraŭ ne atingis sufiĉe altan nivelon!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Nesufiĉa sano!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Nesufiĉa manao!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Vi ne havas memorigilojn!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Vi ne povas fari tion nun!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Ŝajnas, ke vi bezonas pli multe da mono... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Vi ne povas uzi tiun ĉi scipovon kun tia armilo!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Vi bezonas pluan ruĝan brilianton!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Vi bezonas pluan bluan brilianton!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Vi portas tro multe por fari tion!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr "Malsukcesa voko."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr "Bezonas feojn."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr "Bezonas surhavatan %s."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr "Bezonas surhavatan %s kaj nombron %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr "Bezonas objekton %s."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr "Bezonas objekton %s kaj nombron %d"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr "Malsukcesis scipovo!"
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr "Elekti varpan celon"
 
@@ -9802,8 +9832,55 @@ msgstr "Malsukcesis ion ajn ŝteli..."
 msgid "Poison had no effect..."
 msgstr "Veneno malefikis..."
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "Enigu pasvorton:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+#, fuzzy
+msgid "New pincode"
+msgstr "Bonvolu agordi novan PIN-on"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+#, fuzzy
+msgid "Enter new pincode"
+msgstr "Bonvolu agordi novan PIN-on"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Ŝanĝi avizon"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr "Pri"
 
@@ -9823,7 +9900,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr "Dosiero alŝutita"
 
@@ -9831,9 +9908,8 @@ msgstr "Dosiero alŝutita"
 #. TRANSLATORS: clear fonts cache message
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
 msgid "Cache cleared"
-msgstr "Kaŝmemoro malplenigita"
+msgstr ""
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9851,9 +9927,8 @@ msgstr "Risurcaj bildoj:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "Risurcaj bildoj:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9862,48 +9937,40 @@ msgstr "Mediaj variabloj ŝutitaj"
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1638
-#, fuzzy
 msgid "Config uploaded to:"
-msgstr "Dosiero alŝutita"
+msgstr ""
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1648
-#, fuzzy
 msgid "Server config Uploaded to:"
-msgstr "Servila agorda valoro: %s"
+msgstr ""
 
 #. TRANSLATORS: upload log chat message
 #: src/progs/manaplus/actions/actions.cpp:1658
-#, fuzzy
 msgid "Log uploaded to:"
-msgstr "Protokolo alŝutita al:"
+msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
-"Lastatempa vido malŝaltita. Ŝalti en ludantoj / kolekti identigaĵojn kaj "
-"vidajn protokolojn de ludantoj."
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
-msgstr "Vi ne vidis tiun ĉi kaŝnomon."
+msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr "Lastatempe vidita dum %s: %s"
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
-msgstr "Vi ne vidis tiun ĉi kaŝnomon."
+msgstr ""
 
 #. TRANSLATORS: whisper send
 #: src/progs/manaplus/actions/chat.cpp:279
@@ -10154,57 +10221,57 @@ msgid "Accepting incoming trade requests"
 msgstr "Atentanta envenantajn negocajn petojn"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "Konektanta al servilo"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "Ensalutanta"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "Eniranta ludan mondon"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "Petanta avatarojn"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "Konektanta al la luda servilo"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "Ŝanĝanta ludajn servilojn"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "Petanta detalojn de registrado"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Ŝanĝo de Pasvorto"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "Sukcese ŝanĝis pasvorton!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "Ŝanĝo de Retpoŝtadreso"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "Sukcese ŝanĝis retpoŝtadreson!"
 
@@ -11482,12 +11549,3 @@ msgstr "%d sekundo"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekundoj"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Risurcaj orfaj bildoj:"
-
-#~ msgid "Uploaded config into:"
-#~ msgstr "Agordaro alŝutita al:"
-
-#~ msgid "Uploaded server config into:"
-#~ msgstr "Servila agordado alŝutita al:"
diff --git a/po/es.po b/po/es.po
index 1444b998e..09ff2e6a9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -29,9 +29,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-11-03 12:38+0000\n"
-"Last-Translator: Albert\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"Last-Translator: Nelson Martell <nelson6e65@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/"
 "es/)\n"
 "Language: es\n"
@@ -41,7 +41,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "Visibles en el mapa"
 
@@ -60,12 +60,12 @@ msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "I"
 
@@ -77,53 +77,53 @@ msgid "You were killed by %s."
 msgstr "Fuiste asesinado por %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistente."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr "No puedes recoger esta cantidad de objetos."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr "Tu montón de objetos esta al máximo."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "Problema desconocido al intentar recoger el artículo."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -132,58 +132,58 @@ msgstr[1] "Recogiste %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "exp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "trabajo"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr "Homúnculo"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr "hp"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr "maná"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguir: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "Seguimiento cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitación: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr "Tú ves %s"
@@ -422,21 +422,18 @@ msgstr "Error de Red"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:831
-#, fuzzy
 msgid "Auto disable Show beings transparency"
-msgstr "Mostrar transparencia de criaturas"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Mostrar efectos de partículas"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
-#, fuzzy
 msgid "Auto enable opacity cache"
-msgstr "Habilitar opacidad del la interfaz"
+msgstr ""
 
 #. TRANSLATORS: move type in status bar
 #: src/gamemodifiers.cpp:149
@@ -823,32 +820,35 @@ msgstr "Lejos del Teclado"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "OK"
 
@@ -879,14 +879,14 @@ msgstr "(F) modo de cámara libre"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Cerrar"
 
@@ -935,7 +935,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "predeterminado"
 
@@ -1385,9 +1385,9 @@ msgstr "Gremio: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "Comentario: %s"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1583,9 +1583,9 @@ msgstr "Hablar"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1603,7 +1603,7 @@ msgstr "Comprar"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1673,8 +1673,8 @@ msgstr "Alimentar"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "Renombrar"
 
@@ -1698,7 +1698,7 @@ msgstr "Soltar botín"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1732,6 +1732,7 @@ msgstr "Agregar nombre al chat"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1764,10 +1765,11 @@ msgstr "Agregar nombre al chat"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "Cancelar"
@@ -1823,7 +1825,7 @@ msgstr "Quitar"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr "Saltar a"
 
@@ -1845,7 +1847,7 @@ msgstr "Restaurar cámara"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Vestimenta"
@@ -1877,8 +1879,10 @@ msgstr "Editar hechizo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "Limpiar"
 
@@ -2049,9 +2053,9 @@ msgstr "Agregar todo al intercambio"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "Almacenar"
 
@@ -2088,8 +2092,8 @@ msgstr "Moverse a crear..."
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "Recuperar"
 
@@ -2128,10 +2132,10 @@ msgstr "Recuperar todo"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Usar"
@@ -2284,7 +2288,7 @@ msgstr "Seleccionar tipo de invocación de habilidad"
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -2320,7 +2324,7 @@ msgstr "Desatender"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -2426,8 +2430,8 @@ msgstr "Proteger artículo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "Tirar..."
 
@@ -2442,7 +2446,7 @@ msgstr "Tirar todo"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Tirar"
 
@@ -2501,7 +2505,7 @@ msgstr "Almacenamiento"
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr "Mochila"
@@ -2719,10 +2723,10 @@ msgstr "Engendrar esclavo"
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "Información"
 
@@ -2914,7 +2918,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3227,7 +3231,7 @@ msgstr "Punto de recorrido"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "Máx"
@@ -3239,9 +3243,9 @@ msgstr "Máx"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3255,7 +3259,7 @@ msgstr "Nivel: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3282,9 +3286,9 @@ msgstr "Abrir url"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "Añadir"
@@ -3296,10 +3300,10 @@ msgstr "Añadir"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Salir"
 
@@ -3308,24 +3312,24 @@ msgstr "Salir"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Precio: %s / Total: %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Editar"
 
@@ -3410,54 +3414,51 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "Parpadear nombre"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
-#, fuzzy
 msgid "Master name"
-msgstr "Nombre del mapa:"
+msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "Nombre del mapa:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Música:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Mapa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr "Nombre del mapa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Minimapa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "Cursor:"
 
@@ -3468,224 +3469,232 @@ msgstr "Recuento de partículas:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Numero de agentes en el mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Numero de agentes en el mapa:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Posición del jugador:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr "Dibujar llamadas:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr "Enlaces de texturas:"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr "%d FPS (OpenGL normal)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr "%d FPS (OpenGL seguro)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr "%d FPS (OpenGL ES movil)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr "%d FPS (OpenGL ES 2 movil)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr "%d FPS (OpenGL moderno)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr "%d FPS (SDL2 predeterminado)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr "Contador de Texturas:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Recuento de partículas: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "Id de Objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr "Tipo de objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr "Nivel del objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr "Raza del objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr "Grupo de objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr "Gremio del objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "Retraso de ataque:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr "Golpe mínimo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr "Golpe máximo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr "Golpe crítico:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr "Karma:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr "Comportamiento:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr "Efectos:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Nivel del objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Grupo del Objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Gremio del objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Recibiendo: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Enviando: %d bytes/s"
@@ -3793,46 +3802,58 @@ msgstr "Sonido de susurro"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
 #, fuzzy
-msgid "Guild / party / clan message sound"
-msgstr "Sonido de mensajes de Gremio / Grupo"
+msgid "Guild message sound"
+msgstr "Sonido de mensaje global"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "Sonido de mensaje de error"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+#, fuzzy
+msgid "Clan message sound"
+msgstr "Sonido de mensaje global"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
 msgid "Highlight message sound"
 msgstr "Sonido de mensaje resaltado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Global message sound"
 msgstr "Sonido de mensaje global"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Error message sound"
 msgstr "Sonido de mensaje de error"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr "Sonido de petición de intercambio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr "Mostrar ventana de sonido"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr "Ocultar ventana de sonido"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Habilitar el chat de voz de mumble"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Descargar música"
 
@@ -4493,27 +4514,27 @@ msgid "Assign"
 msgstr "Asignar"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "Retirar"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr "Restablecer todas las teclas"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr "Entrada"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "Detectado conflicto de teclas."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4524,50 +4545,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr "Desconocido"
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "Presiona el botón para empezar la calibración"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Calibrar"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr "Detectar palancas de mando"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Habilitar la palanca de mando"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr "Usar la palanca de mando si la ventana del cliente está inactiva"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "Palanca de Mando"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "Parar"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr "Girar la palanca y no presionar los botones"
 
@@ -4887,7 +4908,7 @@ msgstr "Habilitar notificaciones de peso"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "Tienda"
 
@@ -5099,14 +5120,14 @@ msgstr "No hay mods presentes"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "No"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr "Rendimiento"
 
@@ -5443,19 +5464,19 @@ msgstr "Permitir mensajes privados"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Borrar"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr "Relaciones"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Cuando se ignora a alguien:"
 
@@ -5527,8 +5548,8 @@ msgstr "i"
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Tema"
 
@@ -5555,8 +5576,8 @@ msgstr "Tema cambiado"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Reinicia el cliente para que los cambios surtan efecto."
 
@@ -5648,9 +5669,9 @@ msgstr "Límite de FPS:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Límite alternativo de FPS: "
 
@@ -5660,50 +5681,50 @@ msgid "Detect best mode"
 msgstr "Detectar el mejor modo"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr "Alto DPI"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr "Mostrar cursor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Cursor personalizado"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr "Permitir cambio de tamaño"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr "Sin marco"
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "Nada"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5711,7 +5732,7 @@ msgstr ""
 "también falló!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5719,43 +5740,43 @@ msgstr ""
 "modo anterior también falló!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "Cambiando a pantalla completa"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "Reinicio necesario para que los cambios surtan efecto."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "Cambiando a OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "Se necesita reiniciar para aplicar el cambio a OpenGL."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolución personalizada (ejemplo: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "Ingrese la nueva resolución:        "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "Resolución de pantalla cambiada"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algunas ventanas pueden ser movidas para adaptarlas a la resolución más baja."
@@ -6092,7 +6113,7 @@ msgstr "HLP"
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Ayuda"
 
@@ -6147,7 +6168,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Equipamiento"
 
@@ -6259,9 +6280,8 @@ msgstr "Correo"
 
 #. TRANSLATORS: short button name for clan window.
 #: src/gui/windowmenu.cpp:190
-#, fuzzy
 msgid "CL"
-msgstr "C"
+msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
 #: src/gui/windowmenu.cpp:195
@@ -6293,20 +6313,20 @@ msgstr "SET"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Configuración"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr "Dinero en el banco: %s"
@@ -6317,7 +6337,7 @@ msgid "Withdraw"
 msgstr "Retirar"
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr "Depositar"
 
@@ -6327,20 +6347,20 @@ msgid "Create items"
 msgstr "Crear artículos"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr "Cantidad:"
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "Crear"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr "Filtro:"
 
@@ -6399,15 +6419,15 @@ msgstr "Las direcciones de correo suministradas no concuerdan."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Error"
 
@@ -6422,7 +6442,7 @@ msgstr "Cambiar contraseña"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "Contraseña:"
 
@@ -6463,8 +6483,8 @@ msgstr "Nuevo Personaje"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -6479,16 +6499,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor, distribuye %d puntos"
@@ -6497,71 +6517,71 @@ msgstr "Por favor, distribuye %d puntos"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "Color de cabello:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "Peinado:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr "Raza:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr "Apariencia:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr "M"
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr "D"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "Tu nombre debe tener como mínimo 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "Atributos del personaje OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor, borra %d puntos"
@@ -6588,36 +6608,37 @@ msgid "Switch"
 msgstr "Cambiar"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr "Contraseña"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "Jugar"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Cambiar de Login"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr "Cuenta %s"
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr "Por favor, crea un nuevo código pin"
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr "Por favor, ingresa un nuevo nombre"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6633,27 +6654,27 @@ msgstr ""
 "Dinero: %s"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "Contraseña incorrecta"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr "Ingresa tu correo para borrar el personaje"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr "Ingresa tu correo:"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "Ingrese la contraseña para borrar el personaje"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
@@ -6695,7 +6716,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Sí"
 
@@ -6736,42 +6757,42 @@ msgid "Connect"
 msgstr "Conectar"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr "Usar la misma IP"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr "Dirección:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Puerto:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr "Descripción:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr "URL de lista de conectados:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr "Versión del paquete:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 "Por favor, por lo menos especifique el nombre y el puerto del servidor."
@@ -6807,7 +6828,7 @@ msgstr "T"
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr "Desconocido"
@@ -6842,7 +6863,7 @@ msgstr "Insert"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6853,93 +6874,93 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr "Inserta la tarjeta requerida"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "¿Insertar %s en %s?"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "Todo"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "Selecciona la cantidad de artículos a intercambiar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "Seleccione la cantidad de artículos a tirar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "Seleccione la cantidad de objetos a almacenar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr "Selecciona la cantidad de artículos a enviar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr "Selecciona la cantidad de artículos a crear."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr "Seleccione la cantidad de objetos a almacenar en el carrito."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "Seleccione la cantidad de artículos a recuperar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr "Seleccione la cantidad de artículos a recuperar del carrito."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "Seleccione la cantidad de artículos."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "Agregar tienda (compra)."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "Agregar a la tienda (venta)."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "Desconocido."
 
@@ -6949,52 +6970,52 @@ msgid "Reset stats"
 msgstr "Restablecer estadísticas"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "Restablecer cronometrador"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Muertes: %s, exp. total: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Exp. Prom.: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Nro. de criaturas promedio para el siguiente nivel: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Matanza/Mín: %s, Exp/Mín: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Rapidez de experiencia por %d minuto: %s"
 msgstr[1] "Rapidez de experiencia por %d minutos: %s"
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -7002,40 +7023,40 @@ msgstr[0] "Tiempo para el siguiente nivel por %d minuto: %s"
 msgstr[1] "Tiempo para el siguiente nivel por %d minutos: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr "Exp de último eliminado:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Nivel: %d de %f%%"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr "Exp: %s/%s Faltan: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr "1%% = %s exp, avg mob para 1%%: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Tiempo para el siguiente nivel: %s"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "Inicio de sesión"
 
@@ -7058,29 +7079,29 @@ msgstr "Cambiar de servidor"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "Registrar"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "Host de actualización personalizado"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "Servidor:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr "Abrir url de registro"
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr "Actalizaciones predeterminadas"
 
@@ -7101,14 +7122,14 @@ msgstr "Para:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr "Asunto:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr "Dinero:"
 
@@ -7119,7 +7140,7 @@ msgstr "Artículo:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr "Mensaje:"
 
@@ -7143,22 +7164,22 @@ msgid "Get attach"
 msgstr "Adjuntar"
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr "Contestar"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr "Tiempo:"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr "De:"
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr "Obtener dinero"
 
@@ -7168,24 +7189,29 @@ msgid "Refresh"
 msgstr "Recargar"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr "Nuevo"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr "Envejecer"
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr "Regresar"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr "Abrir"
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7327,64 +7353,64 @@ msgid "Switch character"
 msgstr "Cambiar de personaje"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Confirmar:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "Masculino"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "Femenino"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "Correo:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 "El nombre de usuario necesita tener al menos %u caracteres de longitud."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 "El nombre de usuario necesita tener menos de %u caracteres de longitud."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "La contraseña necesita tener al menos %u caracteres de longitud."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "La contraseña necesita tener menos de %u caracteres de longitud."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr "E-mail incorrecto."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr "Email demasiado largo."
 
@@ -7394,48 +7420,53 @@ msgid "Choose Your Server"
 msgstr "Escoge tu servidor"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Cargar"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Elige tu servidor  *** MODO SEGURO ***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "Elige tu servidor  *** MODO SEGURO ***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 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:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Descargando lista de servidores...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "Esperando al servidor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "Preparando la descarga"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "¡Error al recuperar la lista de servidores!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "requiere una versión más nueva"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "requiere v%s"
@@ -7493,72 +7524,72 @@ msgid "Reset Windows"
 msgstr "Restablecer ventanas"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "Tienda personal"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr "Publicar"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "Anunciar"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "Mostrar enlaces en el anuncio"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr "Por favor, introduce el nuevo nombre de la tienda"
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr "Des-publicar"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr "error: jugador ocupado"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr "error: No se puede vender este artículo"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr "error: No se puede comprar este artículo"
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr "%s quiere comprarte %s ¿aceptas?"
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr "%s quiere venderte %s ¿aceptas?"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "Propuesta de intercambio"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Tienda Personal - %s"
@@ -7575,46 +7606,46 @@ msgid "Skill points available: %d"
 msgstr "Puntos disponibles: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidades %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidad %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr "Habilidad %u"
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nivel: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Habilidad fallida: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Añadir texto a la habilidad %s"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr "Texto: "
 
@@ -7824,35 +7855,35 @@ msgid "Trade: You"
 msgstr "Intercambio: Tú"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "Tú recibes %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "Cambiar"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "Tú das:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "No tienes suficiente dinero."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
 "la ventana."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr "Fallo al agregar artículo. No puedes intercambiar artículos equipados."
 
@@ -7927,7 +7958,7 @@ msgid "Change Login"
 msgstr "Cambiar de Login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Escoger Mundo"
 
@@ -9102,9 +9133,8 @@ msgstr "Ventana de configuraciones rápidas"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "Ventana del Carrito"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9323,33 +9353,33 @@ msgstr "Conexión al servidor terminada. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr "Error de renombrado del personaje."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr "Personaje renombrado."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr "No se permite renombrar."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr "El nuevo nombre no está establecido."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr "Personaje no encontrado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "Fallo al borrar el personaje."
 
@@ -9379,13 +9409,13 @@ msgid "Work in progress."
 msgstr "Trabajo en progreso."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "El mensaje no se pudo enviar, el canal %s no existe."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "No se puede abrir el cana. El canal %s no existe."
@@ -9402,7 +9432,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr "¿Aceptas a %s y %s como tus padres?"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "¡Desconectado del servidor!"
 
@@ -9658,108 +9688,108 @@ msgid "You were killed by unknown source."
 msgstr "Has sido asesinado por \"algo\" desconocido."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Error de habilidad desconocido: %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr "Error de habilidad desconocido: %d."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "¡Aún no has alcanzado un nivel lo suficientemente alto!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "¡Insuficiente HP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "¡SP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "¡No tienes ningún memo!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "¡No puedes hacer esto ahora mismo!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que necesitas más dinero... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "¡No puedes usar esta habilidad con este tipo de arma!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "¡Necesitas otra gema roja!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "¡Necesitas otra gema azul!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "¡Estás llevando muchas cosas para hacer esto!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr "Invocación fallida."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr "Se necesitan espíritus."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr "Se necesita elequipo %s."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr "Se necesita el equipo %s (x%d)"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr "Se necesita %s."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr "Se necesita el artículo %s (x%d)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr "¡Habilidad fallida!"
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr "Seleccionar portal objetivo"
 
@@ -9867,8 +9897,55 @@ msgstr "No puedes robar nada..."
 msgid "Poison had no effect..."
 msgstr "Veneno no tuvo ningún efecto..."
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "Ingrese contraseña:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+#, fuzzy
+msgid "New pincode"
+msgstr "Por favor, crea un nuevo código pin"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+#, fuzzy
+msgid "Enter new pincode"
+msgstr "Por favor, crea un nuevo código pin"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Cambiar nota"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr "Acerca de..."
 
@@ -9888,7 +9965,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd archivoOrigen archivoDestino"
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr "Archivo subido"
 
@@ -9896,9 +9973,8 @@ msgstr "Archivo subido"
 #. TRANSLATORS: clear fonts cache message
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
 msgid "Cache cleared"
-msgstr "Caché limpiada"
+msgstr ""
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9916,9 +9992,8 @@ msgstr "Imágenes de recurso:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "Imágenes de recurso:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9927,48 +10002,40 @@ msgstr "Variables de entorno vaciadas"
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1638
-#, fuzzy
 msgid "Config uploaded to:"
-msgstr "Archivo subido"
+msgstr ""
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1648
-#, fuzzy
 msgid "Server config Uploaded to:"
-msgstr "Valor de configuración del servidor: %s"
+msgstr ""
 
 #. TRANSLATORS: upload log chat message
 #: src/progs/manaplus/actions/actions.cpp:1658
-#, fuzzy
 msgid "Log uploaded to:"
-msgstr "Registro subido a:"
+msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
-"Deshabilitada opción para mostrar última vez visto. Habilítala en "
-"Jugadores / \"Registrar ID de jugador y última vez visto\"."
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
-msgstr "No habías visto a este jugador."
+msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr "Última vez que viste a %s: %s"
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
-msgstr "No habías visto a este jugador."
+msgstr ""
 
 #. TRANSLATORS: whisper send
 #: src/progs/manaplus/actions/chat.cpp:279
@@ -10220,57 +10287,57 @@ msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "Cambio de Email"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
@@ -11509,7 +11576,7 @@ msgstr ""
 #: src/utils/stringutils.cpp:960
 #, c-format
 msgid "%d week"
-msgstr "%d semanas"
+msgstr ""
 
 #: src/utils/stringutils.cpp:960
 #, c-format
@@ -11520,7 +11587,7 @@ msgstr "%d semanas"
 #: src/utils/stringutils.cpp:971
 #, c-format
 msgid "%d day"
-msgstr "%d días"
+msgstr "%d día"
 
 #: src/utils/stringutils.cpp:971
 #, c-format
@@ -11531,7 +11598,7 @@ msgstr "%d días"
 #: src/utils/stringutils.cpp:981
 #, c-format
 msgid "%d hour"
-msgstr "%d horas"
+msgstr "%d hora"
 
 #: src/utils/stringutils.cpp:981
 #, c-format
@@ -11542,7 +11609,7 @@ msgstr "%d horas"
 #: src/utils/stringutils.cpp:991
 #, c-format
 msgid "%d minute"
-msgstr "%d minutos"
+msgstr "%d minuto"
 
 #: src/utils/stringutils.cpp:991
 #, c-format
@@ -11553,18 +11620,9 @@ msgstr "%d minutos"
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d second"
-msgstr "%d segundos"
+msgstr ""
 
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Imágenes de recurso huérfano:"
-
-#~ msgid "Uploaded config into:"
-#~ msgstr "Configuraciones subidas a:"
-
-#~ msgid "Uploaded server config into:"
-#~ msgstr "Configuraciones del servidor subidas a:"
diff --git a/po/fi.po b/po/fi.po
index f1bd485e6..64cda9483 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
 "fi/)\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
@@ -40,12 +40,12 @@ msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "P"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "-"
 
@@ -57,53 +57,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "Yritit poimia olemattoman tavaran."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "Tuntematon ongelma esti tavaran poimimisen."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -112,58 +112,58 @@ msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -400,15 +400,13 @@ msgstr "Verkkovirhe"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:831
-#, fuzzy
 msgid "Auto disable Show beings transparency"
-msgstr "Näytä olioiden läpinäkyvyys"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Hiukkastehosteet"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
@@ -800,32 +798,35 @@ msgstr "Poissa"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "Ok"
 
@@ -856,14 +857,14 @@ msgstr "(F) vapaa kamera"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Sulje"
 
@@ -909,7 +910,7 @@ msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen."
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "oletus"
 
@@ -1359,9 +1360,9 @@ msgstr "Kilta: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "Kommentti: %s"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1557,9 +1558,9 @@ msgstr "Keskustele"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1577,7 +1578,7 @@ msgstr "Osta"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1647,8 +1648,8 @@ msgstr ""
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
@@ -1672,7 +1673,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1706,6 +1707,7 @@ msgstr "Lisää nimi keskusteluun"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1738,10 +1740,11 @@ msgstr "Lisää nimi keskusteluun"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "Peru"
@@ -1797,7 +1800,7 @@ msgstr "Poista"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr "Warppaa"
 
@@ -1819,7 +1822,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Asukokonaisuudet"
@@ -1851,8 +1854,10 @@ msgstr "Muokkaa loitsua"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "Tyhjennä"
 
@@ -2023,9 +2028,9 @@ msgstr "Lisää kaikki kauppaan"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "Varastoi"
 
@@ -2062,8 +2067,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "Ota"
 
@@ -2102,10 +2107,10 @@ msgstr "Ota kaikki"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Käytä"
@@ -2258,7 +2263,7 @@ msgstr ""
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "Oletus"
 
@@ -2294,7 +2299,7 @@ msgstr "Vaimenna"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Ohita"
 
@@ -2400,8 +2405,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "Pudota..."
 
@@ -2416,7 +2421,7 @@ msgstr "Pudota kaikki"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Pudota"
 
@@ -2475,7 +2480,7 @@ msgstr "Varasto"
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr "Kärry"
@@ -2693,10 +2698,10 @@ msgstr ""
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "Tietoja"
 
@@ -2888,7 +2893,7 @@ msgstr "Keskustelu"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3201,7 +3206,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "Max"
@@ -3213,9 +3218,9 @@ msgstr "Max"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3229,7 +3234,7 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3256,9 +3261,9 @@ msgstr ""
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "Lisää"
@@ -3270,10 +3275,10 @@ msgstr "Lisää"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Sulje"
 
@@ -3282,24 +3287,24 @@ msgstr "Sulje"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Hinta: %s / Kaikkiaan: %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Muokkaa"
 
@@ -3384,9 +3389,8 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "Vilkuta nimeä"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
@@ -3395,42 +3399,41 @@ msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "nimi"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Musiikki:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Kartta:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Minikartta:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "Osoitin:"
 
@@ -3441,224 +3444,232 @@ msgstr "Hiukkasten määrä:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Toimijoita kartalla:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Toimijoita kartalla:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Pelaajan sijainti:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr ""
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (ei kiihdytystä)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr "Tekstuurien määrä:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Hiukkasluku: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Kohde:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "Kohteen tunniste:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "Hyökkäysviive:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr "Minimivahinko:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr "Maksimivahinko:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr "Kriittinen osuma:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Kohteen taso:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Kohteen ryhmä:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Kohteen kilta:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Sisään: %d tavua/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Ulos: %d tavua/s"
@@ -3765,46 +3776,57 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-msgid "Guild / party / clan message sound"
-msgstr ""
+#, fuzzy
+msgid "Guild message sound"
+msgstr "Kiltamestari: %s"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-msgid "Highlight message sound"
+msgid "Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-msgid "Global message sound"
+msgid "Clan message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
-msgid "Error message sound"
+msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:163
-msgid "Trade request sound"
+msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:168
-msgid "Show window sound"
+msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:173
-msgid "Hide window sound"
+msgid "Trade request sound"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:178
+msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:183
+msgid "Hide window sound"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Ota muminaäänikeskustelu käyttöön"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Lataa musiikki"
 
@@ -4329,27 +4351,27 @@ msgid "Assign"
 msgstr "Aseta"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "Poista asetus"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "Päällekkäisiä näppäinoikopolkuja löytyi."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4360,50 +4382,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Kalibroi"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Ota peliohjain käyttöön"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr "Käytä peliohjainta jos asiakasikkuna ei ole aktiivinen"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "Peliohjain"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "Lopeta"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -4723,7 +4745,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "Kauppa"
 
@@ -4932,14 +4954,14 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "Ei"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr ""
 
@@ -5271,19 +5293,19 @@ msgstr "Salli kuiskaukset"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Poista"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr "Suhteet"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Kun jätät huomiotta:"
 
@@ -5355,8 +5377,8 @@ msgstr ""
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Teema"
 
@@ -5383,8 +5405,8 @@ msgstr "Ulkoasua muutettu"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
 
@@ -5476,9 +5498,9 @@ msgstr "Piirtonopeusrajoitin (FPS):"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Vaihtoehtoinen FPS-rajoitin: "
 
@@ -5488,98 +5510,98 @@ msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Tyylitelty hiiren osoitin"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Kuva"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "-"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Kokoruututilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "Vaihdan kokoruututilaan"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "Vaihdetaan käyttämään OpenGL:ää"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetuksen muutos vaatii ohjelman uudelleenkäynnistyksen."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Oma tarkkuus (esim. 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "Anna uusi tarkkuus:                  "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "Ikkunan koko vaihdettu"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
@@ -5916,7 +5938,7 @@ msgstr ""
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Apua"
 
@@ -5971,7 +5993,7 @@ msgstr "Var"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Varusteet"
 
@@ -6116,20 +6138,20 @@ msgstr "Ase"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Asetukset"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "Näppäin: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -6140,7 +6162,7 @@ msgid "Withdraw"
 msgstr ""
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr ""
 
@@ -6150,20 +6172,20 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr "Määrä:"
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "Luo"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr "Suodin:"
 
@@ -6218,15 +6240,15 @@ msgstr "Annetut sähköpostiosoitteet eivät täsmää."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Virhe"
 
@@ -6241,7 +6263,7 @@ msgstr "Vaihda salasana"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "Salasana:"
 
@@ -6282,8 +6304,8 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -6298,16 +6320,16 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Jaa %d pistettä"
@@ -6316,71 +6338,71 @@ msgstr "Jaa %d pistettä"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "Hiusten väri:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "Hiustyyli:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr "Rotu:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nimessäsi täytyy olla ainakin 4 merkkiä."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "Hahmon pistejako OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "%d pistettä liikaa, ole hyvä ja poista ylimäärä"
@@ -6407,36 +6429,37 @@ msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "Pelaa"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Vaihda kirjautumistietoja"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr ""
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6447,27 +6470,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "Väärä salasana"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "Anna salasana hahmon poistamiseksi"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "Salasana:"
 
@@ -6509,7 +6532,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Kyllä"
 
@@ -6550,42 +6573,42 @@ msgid "Connect"
 msgstr "Yhdistä"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Portti:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Palvelintyyppi:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -6620,7 +6643,7 @@ msgstr ""
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr ""
@@ -6655,7 +6678,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6666,93 +6689,93 @@ msgid "Equip"
 msgstr "Ota käyttöön"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "Kaikki"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "Anna vaihtokaupattavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "Anna pudotettavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "Anna varastoitavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "Anna varastosta otettavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "Anna eri pinoon jaettavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "Lisää ostokauppaan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "Lisää myyntikauppaan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "Tuntematon."
 
@@ -6762,52 +6785,52 @@ msgid "Reset stats"
 msgstr "Nollaa tiedot"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "Nollaa ajastin"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Tappoja: %s, kp kaikkiaan: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Tappoa/min: %s, kp/min: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Kokemustahti / %d min: %s"
 msgstr[1] "Kokemustahti / %d min: %s<"
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -6815,40 +6838,40 @@ msgstr[0] "Aika ensi tasolle %d min perusteella: %s"
 msgstr[1] "Aika ensi tasolle %d min perusteella: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr "Viime tapon kp:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Taso: %d @ %f%%"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Aika seur. tasolle: %s"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
@@ -6871,29 +6894,29 @@ msgstr "Vaihda palvelinta"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "Rekisteröidy"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "Käytä omaa päivityspalvelinta"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "Palvelin:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr ""
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr ""
 
@@ -6914,14 +6937,14 @@ msgstr "Vastaanottaja:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr ""
 
@@ -6932,7 +6955,7 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr ""
 
@@ -6956,22 +6979,22 @@ msgid "Get attach"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr ""
 
@@ -6981,24 +7004,29 @@ msgid "Refresh"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr ""
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7140,62 +7168,62 @@ msgid "Switch character"
 msgstr "Vaihda hahmoa"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Vahvista:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "Miespuolinen"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "Naispuolinen"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "Sähköpostiosoite:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr ""
 
@@ -7205,48 +7233,53 @@ msgid "Choose Your Server"
 msgstr "Valitse palvelimesi"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Lataa"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Valitse palvelimesi  *** VARMUUSTILA ***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "Valitse palvelimesi  *** VARMUUSTILA ***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 msgid "Use same ip for game sub servers"
 msgstr "Käytä samaa IP-osoitetta alipalvelimille"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lataan palvelinluettelon...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "Odotan palvelinta..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "Valmistelen latausta"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "Palvelinluettelon hakeminen epäonnistui!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "vaatii uudemman version"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "vaatii version %s"
@@ -7304,72 +7337,72 @@ msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "Oma kauppa"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "Ilmoita"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "Näytä linkit ilmoituksessa"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "Kaupantekoehdotus"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -7386,46 +7419,46 @@ msgid "Skill points available: %d"
 msgstr "%d taitopistettä käyttämättä"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr "Taitojoukko %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "Taito %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Taso: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr ""
 
@@ -7635,33 +7668,33 @@ msgid "Trade: You"
 msgstr "Kauppa: Sinä"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "Saat %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "Muuta"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "Annat:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "Sinulla ei ole tarpeeksi rahaa."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -7736,7 +7769,7 @@ msgid "Change Login"
 msgstr "Vaihda kirjautumistietoja"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Valitse pelimaailma"
 
@@ -8911,9 +8944,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "Keskusteluikkuna"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9125,33 +9157,33 @@ msgstr "Yhteys palvelimeen katkaistu. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "Hahmon poisto epäonnistui."
 
@@ -9181,13 +9213,13 @@ msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -9204,7 +9236,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "Yhteys palvelimeen katkesi!"
 
@@ -9460,108 +9492,108 @@ msgid "You were killed by unknown source."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Et ole vielä riittävän korkealla tasolla!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Voimapisteesi eivät riitä!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Manapisteesi eivät riitä!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Sinulla ei ole muistioita (memo)!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Et voi tehdä tätä juuri nyt!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Näyttää siltä että tarvitset lisää rahaa... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Et voi käyttää tätä taitoa tuollaisen aseen kanssa!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Tarvitset toisen punaisen helmen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Tarvitset toisen sinisen helmen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Kannat liian paljon tehdäksesi tällaista!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr ""
 
@@ -9669,8 +9701,53 @@ msgstr "Varastaminen ei onnistunut..."
 msgid "Poison had no effect..."
 msgstr "Myrkyllä ei ollut vaikutusta..."
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "Salasana:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+msgid "New pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+msgid "Enter new pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Vaihda karttanäkymää"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr ""
 
@@ -9690,7 +9767,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr ""
 
@@ -9717,9 +9794,8 @@ msgstr "Resurssikuvat:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "Resurssikuvat:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9742,24 +9818,24 @@ msgid "Log uploaded to:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
 msgstr ""
 
@@ -10012,57 +10088,57 @@ msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
@@ -11291,7 +11367,7 @@ msgstr ""
 #: src/utils/stringutils.cpp:960
 #, c-format
 msgid "%d week"
-msgstr "%d viikkoa"
+msgstr ""
 
 #: src/utils/stringutils.cpp:960
 #, c-format
@@ -11302,7 +11378,7 @@ msgstr "%d viikkoa"
 #: src/utils/stringutils.cpp:971
 #, c-format
 msgid "%d day"
-msgstr "%d päivää"
+msgstr ""
 
 #: src/utils/stringutils.cpp:971
 #, c-format
@@ -11313,7 +11389,7 @@ msgstr "%d päivää"
 #: src/utils/stringutils.cpp:981
 #, c-format
 msgid "%d hour"
-msgstr "%d tuntia"
+msgstr ""
 
 #: src/utils/stringutils.cpp:981
 #, c-format
@@ -11324,7 +11400,7 @@ msgstr "%d tuntia"
 #: src/utils/stringutils.cpp:991
 #, c-format
 msgid "%d minute"
-msgstr "%d minuuttia"
+msgstr ""
 
 #: src/utils/stringutils.cpp:991
 #, c-format
@@ -11335,12 +11411,9 @@ msgstr "%d minuuttia"
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d second"
-msgstr "%d sekuntia"
+msgstr ""
 
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekuntia"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Orvot resurssikuvat:"
diff --git a/po/fr.po b/po/fr.po
index d8fe9a767..4b2133cfa 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,6 +15,7 @@
 # Escales Loïc <loic.escales@gmail.com>, 2014-2015
 # Jacques Bossu <ja.bossu@caramail.com>, 2015
 # Jumpy <antoinebcn@hotmail.com>, 2011
+# Lucas Helaine <lucashelaine14@gmail.com>, 2018
 # mortis tmw <mortistmw@gmail.com>, 2015
 # mortis tmw <mortistmw@gmail.com>, 2015
 # NOpe Nope <lvswgh@protonmail.com>, 2016
@@ -30,9 +31,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-10-04 11:33+0000\n"
-"Last-Translator: Alige\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-04-23 20:57+0000\n"
+"Last-Translator: Lucas Helaine <lucashelaine14@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
 "fr/)\n"
 "Language: fr\n"
@@ -42,7 +43,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
@@ -61,12 +62,12 @@ msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "I"
 
@@ -78,53 +79,53 @@ msgid "You were killed by %s."
 msgstr "Tu as été tué par %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "Tu as essayé de prendre un objet qui n'existe pas."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "L'inventaire est plein."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "La pile est trop grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr "Tu ne peux pas ramasser cette quantité d'objets."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr "Ta pile de cet objet est pleine."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "Problème inconnu pour ramasser l'objet."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -133,58 +134,58 @@ msgstr[1] "Tu as ramassé %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "job"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr "Homon"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr "PV"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr "Mana"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr "Suivre : %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imiter : %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr "Tu vois %s"
@@ -429,21 +430,18 @@ msgstr "Erreur Réseau"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:831
-#, fuzzy
 msgid "Auto disable Show beings transparency"
-msgstr "Afficher les créatures en transparence"
+msgstr "Désactivation automatique de l'affichage de la transparence"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Montrer les effets de particules"
+msgstr "Réduction automatique des effets de particules "
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
-#, fuzzy
 msgid "Auto enable opacity cache"
-msgstr "Activer l'opacité GUI"
+msgstr "Activer automatiquement le cache d'opacité"
 
 #. TRANSLATORS: move type in status bar
 #: src/gamemodifiers.cpp:149
@@ -830,32 +828,35 @@ msgstr "Inactif"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "Ok"
 
@@ -886,14 +887,14 @@ msgstr "(F) Mode camera libre"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Fermer"
 
@@ -943,7 +944,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "défaut"
 
@@ -1393,9 +1394,9 @@ msgstr "Guilde : %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "Commentaire : %s"
+msgstr "%s Clan"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1591,9 +1592,9 @@ msgstr "Parler"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1611,7 +1612,7 @@ msgstr "Acheter"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1681,8 +1682,8 @@ msgstr "Nourrir"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "Renommer"
 
@@ -1706,7 +1707,7 @@ msgstr "Abandonne le butin"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1740,6 +1741,7 @@ msgstr "Ajouter le nom dans la conversation"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1772,10 +1774,11 @@ msgstr "Ajouter le nom dans la conversation"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "Annuler"
@@ -1831,7 +1834,7 @@ msgstr "Enlever"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr "Téléportation"
 
@@ -1853,7 +1856,7 @@ msgstr "Restorer la caméra"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Costumes"
@@ -1885,8 +1888,10 @@ msgstr "Éditer le sortilège"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "Effacer"
 
@@ -2057,9 +2062,9 @@ msgstr "Ajouter tout dans l'échange"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "Entreposer"
 
@@ -2096,8 +2101,8 @@ msgstr "Passer à l'artisanat..."
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "Récupérer"
 
@@ -2136,10 +2141,10 @@ msgstr "Reprendre tout"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Utiliser"
@@ -2292,7 +2297,7 @@ msgstr "Sélectionner le type de jet de compétence"
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "Par défaut"
 
@@ -2328,7 +2333,7 @@ msgstr "Éviter"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Ignorer"
 
@@ -2434,8 +2439,8 @@ msgstr "Objet protégé"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "Abandonner..."
 
@@ -2450,7 +2455,7 @@ msgstr "Abandonner tout..."
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Abandonner"
 
@@ -2509,7 +2514,7 @@ msgstr "Entrepôt"
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr "Panier"
@@ -2727,10 +2732,10 @@ msgstr "Faire apparaître un esclave"
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "Informations"
 
@@ -2922,7 +2927,7 @@ msgstr "Conversation"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3235,7 +3240,7 @@ msgstr "Point de route"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "Max."
@@ -3247,9 +3252,9 @@ msgstr "Max."
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3263,7 +3268,7 @@ msgstr "Niveau : %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3290,9 +3295,9 @@ msgstr "Ouvrir l'adresse"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "Ajouter"
@@ -3304,10 +3309,10 @@ msgstr "Ajouter"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Quitter"
 
@@ -3316,24 +3321,24 @@ msgstr "Quitter"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prix : %s / Total : %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Éditer"
 
@@ -3383,7 +3388,7 @@ msgstr "%s est maintenant Hors Ligne."
 #: src/gui/widgets/tabs/chat/clantab.cpp:39 src/gui/windowmenu.cpp:192
 #: src/gui/windows/clanwindow.cpp:41
 msgid "Clan"
-msgstr ""
+msgstr "Clan"
 
 #. TRANSLATORS: guild chat tab name
 #. TRANSLATORS: tab in social window
@@ -3414,58 +3419,55 @@ msgstr "Groupe"
 #. TRANSLATORS: not in clan label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:57
 msgid "Not in clan"
-msgstr ""
+msgstr "Pas dans le Clan"
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "Fais clignoter le nom"
+msgstr "Nom de Clan"
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
-#, fuzzy
 msgid "Master name"
-msgstr "Nom de la Carte :"
+msgstr "Nom du leader"
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "Nom de la Carte :"
+msgstr "Nom de la carte"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Musique :"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Carte :"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr "Nom de la Carte :"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Mini Carte :"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "Curseur :"
 
@@ -3476,224 +3478,232 @@ msgstr "Comptage de particules :"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Nombre d'acteurs sur la carte :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Nombre d'acteurs sur la carte :"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Position du joueur :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr "Dessiner les appels :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr "Textures se lient :"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Logiciel)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr "%d FPS (OpenGL normal)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr "%d FPS (OpenGL sécurisé)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr "%d FPS (mobile OpenGL ES)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr "%d FPS (mobile OpenGL ES 2)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr "%d IPS (OpenGL moderne)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr "%d FPS (SDL2 défaut)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr "Comptage des trames :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Nombre de particules : %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "ID de la Cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr "Type de cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr "Niveau de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr "Race de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr "Groupe de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr "Guilde de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "Délai d'attaque :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr "Coup Mini :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr "Coup Max :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr "Coup Critique :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr "Karma :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr "Manière :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr "Effets :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Niveau de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Groupe de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Guilde de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping : %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Entrée : %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Sortie : %d bytes/s"
@@ -3801,46 +3811,58 @@ msgstr "Son des messages privés"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
 #, fuzzy
-msgid "Guild / party / clan message sound"
-msgstr "Son des messages de Groupe / Guilde"
+msgid "Guild message sound"
+msgstr "Son des messages globaux"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "Son des messages d'erreur"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+#, fuzzy
+msgid "Clan message sound"
+msgstr "Son des messages globaux"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
 msgid "Highlight message sound"
 msgstr "Son des surlignages"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Global message sound"
 msgstr "Son des messages globaux"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Error message sound"
 msgstr "Son des messages d'erreur"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr "Son des demandes d'échange"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr "Afficher le son des fenêtres"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr "Cacher le son des fenêtres"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Activer la conversation avec mumble"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Télécharger la musique"
 
@@ -4510,27 +4532,27 @@ msgid "Assign"
 msgstr "Assigner"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "Désassigner"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr "Réinitialiser toutes les touches"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr "Contrôles"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "Conflit(s) de touche détecté(s)."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4541,50 +4563,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr "inconnu"
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "Presser le bouton pour démarrer la calibration"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Calibrer"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr "Détecter les joysticks"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Activer la manette de jeu"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr "Utiliser le joystick si la fenêtre est au second plan."
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "Manette"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "Stop"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr "Tournes le manche et n'appuies pas sur les boutons"
 
@@ -4904,7 +4926,7 @@ msgstr "Activer les notifications de poids"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "Boutique"
 
@@ -5114,14 +5136,14 @@ msgstr "Pas de mods présent"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "Non"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr "Performance"
 
@@ -5463,19 +5485,19 @@ msgstr "Autoriser les messages privés"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Supprimer"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr "Relations"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Quand tu ignores :"
 
@@ -5547,8 +5569,8 @@ msgstr "i"
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Thème"
 
@@ -5575,8 +5597,8 @@ msgstr "Thème changé"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Redémarres le jeu pour que les changements soient appliqués."
 
@@ -5668,9 +5690,9 @@ msgstr "Limite FPS :"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Limite FPS alternative : "
 
@@ -5680,50 +5702,50 @@ msgid "Detect best mode"
 msgstr "Détecter le meilleur mode"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr "PPI élevé"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr "Afficher curseur"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Curseur personnalisé"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr "Activer le redimensionnement"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr "Pas d'image"
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Vidéo"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "Aucun"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5731,7 +5753,7 @@ msgstr ""
 "également pas accessible !"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5739,44 +5761,44 @@ msgstr ""
 "également pas accessible !"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "Passage en plein écran"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "Activation d'OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "Le changement à OpenGL requiert le redémarrage du jeu."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Résolution personnalisée (exemple : 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "Entre la nouvelle résolution :       "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "Résolution de l'écran modifiée"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Certaines fenêtres pourraient être modifiées pour coïncider à la résolution "
@@ -6114,7 +6136,7 @@ msgstr "AID"
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Aide"
 
@@ -6169,7 +6191,7 @@ msgstr "Equ"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Équipement"
 
@@ -6281,9 +6303,8 @@ msgstr "Mail"
 
 #. TRANSLATORS: short button name for clan window.
 #: src/gui/windowmenu.cpp:190
-#, fuzzy
 msgid "CL"
-msgstr "C"
+msgstr "CL"
 
 #. TRANSLATORS: short button name for server info window.
 #: src/gui/windowmenu.cpp:195
@@ -6315,20 +6336,20 @@ msgstr "Cfg"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Configuration"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "Touche : %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr "Argent dans la banque : %s"
@@ -6339,7 +6360,7 @@ msgid "Withdraw"
 msgstr "Retirer"
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr "Dépôt"
 
@@ -6349,20 +6370,20 @@ msgid "Create items"
 msgstr "Créer des objets"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr "Montant :"
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "Créer"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr "Filtre :"
 
@@ -6417,15 +6438,15 @@ msgstr "Les deux adresses mail ne sont pas identiques."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Erreur"
 
@@ -6440,7 +6461,7 @@ msgstr "Changer le mot de passe"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "Mot de passe :"
 
@@ -6481,8 +6502,8 @@ msgstr "Nouveau Personnage"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "Nom :"
 
@@ -6497,16 +6518,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribues %d points"
@@ -6515,71 +6536,71 @@ msgstr "Distribues %d points"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "Couleur :"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "Coupe :"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr "Race :"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr "Apparence :"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr "H"
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr "I"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ton nom doit comporter un minimum de 4 caractères."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "Caractéristiques du personnage Ok"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "Retires %d points"
@@ -6606,36 +6627,37 @@ msgid "Switch"
 msgstr "Changer"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr "Mot de passe"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "Jouer"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Changer de Compte"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr "Compte %s"
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr "Définis le nouveau code pin"
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr "Merci d'entrer un nouveau nom"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6651,27 +6673,27 @@ msgstr ""
 "Argent : %s"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr "Saisis ton adresse mail pour supprimer ce personnage."
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr "Écris ton mail :"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "Entre le mot de passe pour effacer le personnage"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "Entre le mot de passe :"
 
@@ -6705,15 +6727,15 @@ msgstr "Nom invalide détecté : "
 #. TRANSLATORS: clan window tab
 #: src/gui/windows/clanwindow.cpp:67
 msgid "Ally"
-msgstr ""
+msgstr "allié"
 
 #. TRANSLATORS: clan window tab
 #: src/gui/windows/clanwindow.cpp:69
 msgid "Antagonist"
-msgstr ""
+msgstr "Antagoniste"
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Oui"
 
@@ -6754,42 +6776,42 @@ msgid "Connect"
 msgstr "Connexion..."
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr "Utiliser le même ip"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr "Adresse :"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Port :"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Type de serveur :"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr "Description :"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr "URL de la liste en ligne :"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr "Version du paquet :"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr "Entre au moins l'adresse et le port du serveur."
 
@@ -6824,7 +6846,7 @@ msgstr "T"
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr "Inconnu"
@@ -6859,7 +6881,7 @@ msgstr "Insérer"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6870,93 +6892,93 @@ msgid "Equip"
 msgstr "Équiper"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr "Insère ta demande de carte"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "Insérer %s dans %s?"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "Tout"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "Choisir le nombre d'objets à échanger."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "Choisi le nombre d'objets à abandonner."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "Choisir le nombre d'objets à stocker."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr "Sélectionner le montant d'objets à envoyer."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr "Sélectionner le montant d'objets à fabriquer."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr "Sélectionne la quantité d'articles à mettre dans ton panier."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "Choisir le nombre d'objet à reprendre."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr "Sélectionne la quantité d'articles à récupérer de ton panier."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "Choisir le nombre d'objets à séparer."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "Ajouter à la boutique d'achats."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "Ajouter à la boutique de ventes."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "Inconnu."
 
@@ -6966,52 +6988,52 @@ msgid "Reset stats"
 msgstr "Remettre les statistiques"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "Remettre le temps"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Nbre Tués : %s, total exp : %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Exp. Moy. : %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Nb. de monstres moy. pour niv. suiv. : %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Tués/Min : %s, Exp/Min : %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Rapidité exp pour %d min: %s"
 msgstr[1] "Rapidité exp pour %d min : %s"
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -7019,40 +7041,40 @@ msgstr[0] "Temps pour le prochain niveau %d min: %s"
 msgstr[1] "Temps pour le prochain niveau %d min : %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr "Exp du dernier tué :"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Niveau : %d à %f%%"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr "Exp : %s/%s Reste : %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr "1%% = %s exp, moy. monstre pour 1%%: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Temps pour le prochain niveau : %s"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "Connexion"
 
@@ -7075,29 +7097,29 @@ msgstr "Changer de Serveur"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "S'inscrire"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "Serveur de mise à jour personnalisé"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "Serveur :"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr "Ouvrir l'URL d'inscription"
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr "mises-à-jour par défault"
 
@@ -7118,14 +7140,14 @@ msgstr "Vers :"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr "Sujet :"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr "Argent :"
 
@@ -7136,7 +7158,7 @@ msgstr "Objet :"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr "Message:"
 
@@ -7160,22 +7182,22 @@ msgid "Get attach"
 msgstr "Ajouter une pièce jointe"
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr "Réponse"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr "Heure :"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr "De :"
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr "Avoir de l'argent"
 
@@ -7185,24 +7207,29 @@ msgid "Refresh"
 msgstr "Rafraîchir"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr "Nouveau"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr "Devenir vieux"
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr "Retourner"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr "Ouvrir"
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7344,62 +7371,62 @@ msgid "Switch character"
 msgstr "Changer de personnage"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Vérification :"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "Masculin"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "Féminin"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "Mail :"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Le nom d'utilisateur doit être long d'au moins %u caractères."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Le nom d'utilisateur doit être long d'au plus %u caractères."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "Le mot de passe doit être long d'au moins %u caractères."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Le mot de passe doit être long d'au plus %u caractères."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe sont différents."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr "Mail incorrect."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr "Le mail est trop long."
 
@@ -7409,48 +7436,53 @@ msgid "Choose Your Server"
 msgstr "Choisis le serveur"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Charger"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Choisis ton serveur  *** Mode Sûr ***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "Choisis ton serveur  *** Mode Sûr ***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 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:427
+#: src/gui/windows/serverdialog.cpp:435
 #, 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:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "En attente du serveur..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "Préparation du téléchargement"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 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:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "requiert une nouvelle version"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "requiert la v%s"
@@ -7508,72 +7540,72 @@ msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "Boutique Personnelle"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr "Publier"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "Annoncer"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "Montrer les liens dans l'annonce"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr "Merci d'entrer le nouveau nom du magasin"
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr "Supprimer"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr "erreur : joueur occupé"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr "erreur : Ne peux pas vendre cet objet"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr "erreur : Ne peux pas acheter cet objet"
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr "%s souhaite acheter %s acceptes-tu ?"
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr "%s souhaite vendre %s acceptes-tu ?"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "Demande d'échange"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Magasin personnel - %s"
@@ -7590,46 +7622,46 @@ msgid "Skill points available: %d"
 msgstr "Points de compétences : %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr "Compétence choisie: %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "Compétence %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr "Compétence %u"
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niveau : %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Compétence ratée : %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Ajouter du texte à la compétence %s"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr "Texte : "
 
@@ -7843,35 +7875,35 @@ msgid "Trade: You"
 msgstr "Échange : Toi"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "Tu reçois %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "Changer"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "Tu donnes :"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "Tu n'as pas assez d'argent."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "L'objet ne peux pas être ajouté. Tu ne peux pas ajouter deux fois le même "
 "objet dans cette fenêtre."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 "L'ajout de l'objet a échoué. Tu ne peux pas échanger les objets que tu "
@@ -7948,7 +7980,7 @@ msgid "Change Login"
 msgstr "Changer de Compte"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Choix du monde"
 
@@ -9123,9 +9155,8 @@ msgstr "Fenêtre de réglages rapides"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "Fenêtre Panier"
+msgstr "Fenêtre de clan"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9344,33 +9375,33 @@ msgstr "Connexion au serveur terminée. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr "Erreur de renommage du personnage."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr "Personnage renommé."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr "Renommage non permis."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr "Le nouveau nom n'est pas appliqué."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr "Personnage non trouvé."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "La suppression du personnage n'a pu s'effectuer."
 
@@ -9400,13 +9431,13 @@ msgid "Work in progress."
 msgstr "Travail en cours."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "Le message n'a pas pu être envoyé, la chaîne %s n'existe pas."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "Ne peut pas ouvrir la chaîne. La chaîne %s n'existe pas."
@@ -9423,7 +9454,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr "Accepte tu %s et %s comme parents ?"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "Tu as été déconnecté du serveur !"
 
@@ -9565,12 +9596,12 @@ msgstr "Race non permise."
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:165
 msgid "Access restricted in hours 00:00 to 06:00."
-msgstr ""
+msgstr "Accès limité de 00:00 à 06:00."
 
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:169
 msgid "You was banned."
-msgstr ""
+msgstr "Vous avez été banni."
 
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:173 src/net/tmwa/generalrecv.cpp:79
@@ -9679,108 +9710,108 @@ msgid "You were killed by unknown source."
 msgstr "Tu as été tué par une source inconnue."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Erreur de compétence inconnue : %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr "Erreur de compétence inconnue : %d."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Tu n'as pas encore atteint le niveau minimum requis !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Pas assez de vie !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP insuffisants !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Tu n'as pas d'aide-mémoire !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Tu ne peux pas faire ça tout de suite !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Il semblerait que tu aies besoin de plus d'argent... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Tu ne peux pas utiliser cette compétence avec ce type d'arme !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Tu as besoin d'une autre pierre précieuse rouge !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Tu as besoin d'une autre pierre précieuse bleue !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Tu portes trop de choses pour pouvoir faire ça !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr "Invocation ratée."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr "Besoin d'esprits."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr "Besoin de l'équipement %s."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr "Besoin de l'équipement %s en quantité %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr "Besoin de l'objet %s."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr "Besoin de l'objet %s en quantité %d"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr "La compétence a échoué !"
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr "Sélectionner la cible de téléportation"
 
@@ -9888,8 +9919,55 @@ msgstr "Tu n'as rien pu voler..."
 msgid "Poison had no effect..."
 msgstr "Le poison n'a pas eu d'effet..."
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "Entre le mot de passe :"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+#, fuzzy
+msgid "New pincode"
+msgstr "Définis le nouveau code pin"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+#, fuzzy
+msgid "Enter new pincode"
+msgstr "Définis le nouveau code pin"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Changer la notice"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr "À propos"
 
@@ -9909,7 +9987,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr "Fichier mis en ligne"
 
@@ -9917,9 +9995,8 @@ msgstr "Fichier mis en ligne"
 #. TRANSLATORS: clear fonts cache message
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
 msgid "Cache cleared"
-msgstr "Cache nettoyé"
+msgstr "Cache effacé"
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9937,9 +10014,8 @@ msgstr "Images des ressources :"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "Images des ressources :"
+msgstr "Images de ressource inconnues:"
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9948,48 +10024,42 @@ msgstr "Variables d'environnement effacées"
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1638
-#, fuzzy
 msgid "Config uploaded to:"
-msgstr "Fichier mis en ligne"
+msgstr "Config mise en ligne à:"
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1648
-#, fuzzy
 msgid "Server config Uploaded to:"
-msgstr "Valeur de configuration serveur : %s"
+msgstr "Config serveur mise en ligne à:"
 
 #. TRANSLATORS: upload log chat message
 #: src/progs/manaplus/actions/actions.cpp:1658
-#, fuzzy
 msgid "Log uploaded to:"
-msgstr "Historique ajouté dans :"
+msgstr "Log mis en ligne à:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
-"Dernière fois vu désactivé. Activer dans joueurs / collecter les id des "
-"joueurs et l'historique de vue."
+"Dernière vue désactivée. Activation des joueurs / collecter les ID des "
+"joueurs vue par le log"
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
-msgstr "Tu n'as pas vu ce ce pseudo."
+msgstr "Vous n'avez jamais vu ce pseudo."
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr "Dernière fois vu pour %s : %s"
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
-msgstr "Tu n'as pas vu ce ce pseudo."
+msgstr "Vous n'avez jamais vu ce pseudo auparavant."
 
 #. TRANSLATORS: whisper send
 #: src/progs/manaplus/actions/chat.cpp:279
@@ -10243,57 +10313,57 @@ msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "Connexion"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "Entrée dans le monde de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "Modification de l'adresse mail"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "L'adresse mail a été changée avec succès !"
 
@@ -10881,6 +10951,8 @@ msgstr "Carte insérée."
 #: src/resources/notifications.h:424
 msgid "Bank check failed. Bank probably disabled."
 msgstr ""
+"La vérification de la banque a échoué. La banque est  probablement "
+"désactivée."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:428
@@ -11539,7 +11611,7 @@ msgstr ""
 #: src/utils/stringutils.cpp:960
 #, c-format
 msgid "%d week"
-msgstr "%d semaines"
+msgstr "%d semaine"
 
 #: src/utils/stringutils.cpp:960
 #, c-format
@@ -11550,7 +11622,7 @@ msgstr "%d semaines"
 #: src/utils/stringutils.cpp:971
 #, c-format
 msgid "%d day"
-msgstr "%d jours"
+msgstr "%d jour"
 
 #: src/utils/stringutils.cpp:971
 #, c-format
@@ -11561,7 +11633,7 @@ msgstr "%d jours"
 #: src/utils/stringutils.cpp:981
 #, c-format
 msgid "%d hour"
-msgstr "%d heures"
+msgstr "%d heure"
 
 #: src/utils/stringutils.cpp:981
 #, c-format
@@ -11572,7 +11644,7 @@ msgstr "%d heures"
 #: src/utils/stringutils.cpp:991
 #, c-format
 msgid "%d minute"
-msgstr "%d minutes"
+msgstr "%d minute"
 
 #: src/utils/stringutils.cpp:991
 #, c-format
@@ -11583,18 +11655,12 @@ msgstr "%d minutes"
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d second"
-msgstr "%d secondes"
+msgstr "%d seconde"
 
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondes"
 
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Images des ressources non affectées :"
-
-#~ msgid "Uploaded config into:"
-#~ msgstr "Config ajoutée dans :"
-
-#~ msgid "Uploaded server config into:"
-#~ msgstr "Config serveur ajoutée dans :"
+#~ msgid "Guild / party / clan message sound"
+#~ msgstr "Son de message de la Guilde / Groupe / Clan "
diff --git a/po/id.po b/po/id.po
index 64159d1c4..2efb14fe9 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"Last-Translator: Aviv wahyudin <apip45@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
 "id/)\n"
 "Language: id\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "Terlihat di peta"
 
@@ -44,12 +44,12 @@ msgid "miss"
 msgstr "luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "I"
 
@@ -61,53 +61,53 @@ msgid "You were killed by %s."
 msgstr "Kamu dibunuh oleh %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "Mencoba mengambil item yang tidak ada."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "Barang terlalu berat."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "Barang terlalu jauh."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "Penyimpanan sudah penuh."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "Tumpukan terlalu besar."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "Barang masih milik orang lain."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr "Kamu tidak bisa mengambil barang dalam jumlah ini."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr "Jumlah tumpukan barangmu sudah maksimal."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "Masalah mengambil barang yang tidak diketahui."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -115,58 +115,58 @@ msgstr[0] "Kamu mengambil %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "pekerjaan"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr "Ikuti: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr "Tiruan: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr "Kamu lihat %s"
@@ -407,9 +407,8 @@ msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Efek partikel"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
@@ -801,32 +800,35 @@ msgstr "Pergi"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "OK"
 
@@ -857,14 +859,14 @@ msgstr "(F) mode kamera bebas"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Tutup"
 
@@ -911,7 +913,7 @@ msgstr "Kamu membawa kurang dari separuh beratmu. Kamu bisa regenerasi darah."
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "dasar"
 
@@ -1361,9 +1363,9 @@ msgstr "Organisasi: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "Komentar: %s"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1559,9 +1561,9 @@ msgstr "Berbicara"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1579,7 +1581,7 @@ msgstr "Beli"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1649,8 +1651,8 @@ msgstr "Beri makan"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "Ubah nama"
 
@@ -1674,7 +1676,7 @@ msgstr "Jatuhkan rampasan"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1708,6 +1710,7 @@ msgstr "Tambah nama ke obrolan"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1740,10 +1743,11 @@ msgstr "Tambah nama ke obrolan"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "Batal"
@@ -1799,7 +1803,7 @@ msgstr "Hapus"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr "Jebakan"
 
@@ -1821,7 +1825,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Perlengkapan"
@@ -1853,8 +1857,10 @@ msgstr "Edit mantra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "Hapus"
 
@@ -2025,9 +2031,9 @@ msgstr "Tambah semua ke dagangan"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "Simpan"
 
@@ -2064,8 +2070,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "Ambil"
 
@@ -2104,10 +2110,10 @@ msgstr "Ambil semua"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Gunakan"
@@ -2260,7 +2266,7 @@ msgstr ""
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "Asal"
 
@@ -2296,7 +2302,7 @@ msgstr "Abaikan"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Abaikan"
 
@@ -2402,8 +2408,8 @@ msgstr "Proteksi item"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "Buang..."
 
@@ -2418,7 +2424,7 @@ msgstr "Buang semua"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Buang"
 
@@ -2477,7 +2483,7 @@ msgstr "Tempat penyimpanan"
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr ""
@@ -2695,10 +2701,10 @@ msgstr ""
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr ""
 
@@ -2890,7 +2896,7 @@ msgstr "Obrolan"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3203,7 +3209,7 @@ msgstr "Titik jalan"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "Maks"
@@ -3215,9 +3221,9 @@ msgstr "Maks"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3231,7 +3237,7 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3258,9 +3264,9 @@ msgstr "Buka url"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "Tambah"
@@ -3272,10 +3278,10 @@ msgstr "Tambah"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Keluar"
 
@@ -3284,24 +3290,24 @@ msgstr "Keluar"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Harga: %s / Total: %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Ubah"
 
@@ -3386,54 +3392,51 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "Nama kosong"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
-#, fuzzy
 msgid "Master name"
-msgstr "Nama yang dihapus"
+msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "Nama GM"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Musik:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Peta:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Peta mini:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "Kursor:"
 
@@ -3444,224 +3447,232 @@ msgstr "Jumlah partikel:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Jumlah aktor di peta:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Jumlah aktor di peta:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Posisi Pemain:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr "Menggambar panggilan:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr "Ikat tekstur:"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Perangkat lunak)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr "%d FPS (normal OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr "%d FPS (safe OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr "%d FPS (modern OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr "%d FPS (SDL2 default)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr "Jumlah tekstur:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Jumlah partikel: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "Id target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr "Tipe target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr "Level target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr "Ras target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr "Kelompok target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr "Organisasi target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "Tunda serang:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr "Pukulan minimal:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr "Pukulan maksimum:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr "Pukulan kritikal:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr "Karma:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr "Manner:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Level Target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Kelompok Target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Organisasi Target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Masuk: %d bytes/det"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Keluar: %d bytes/det"
@@ -3769,46 +3780,58 @@ msgstr "Suara pesan bisikan"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
 #, fuzzy
-msgid "Guild / party / clan message sound"
-msgstr "Suara pesan Organisasi / Kelompok"
+msgid "Guild message sound"
+msgstr "Suara pesan global"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "Suara pesan error"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+#, fuzzy
+msgid "Clan message sound"
+msgstr "Suara pesan global"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
 msgid "Highlight message sound"
 msgstr "Suara pesan sorotan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Global message sound"
 msgstr "Suara pesan global"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Error message sound"
 msgstr "Suara pesan error"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr "Suara pesan perdagangan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr "Suara tampil jendela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr "Suara tutup jendela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Aktifkan gumaman obrolan suara"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Unduh musik"
 
@@ -4333,27 +4356,27 @@ msgid "Assign"
 msgstr "Tetapkan"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "Batal menetapkan"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr "Reset semua key"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr "Masukan"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "Konflik key terdeteksi."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4362,50 +4385,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr "tak diketahui"
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "Tekan tombol untuk memulai kalibrasi"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Kalibrasi"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr "Deteksi joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Aktifkan joistik"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr "Pakai joystick jika jendela klien tak aktif"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "Berhenti"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr "Putar stick dan jangan tekan tombol"
 
@@ -4725,7 +4748,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "Toko"
 
@@ -4934,14 +4957,14 @@ msgstr "Tak ada modif"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "Tidak"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr "Performa"
 
@@ -5273,19 +5296,19 @@ msgstr "Perbolehkan berbisik"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Hapus"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Ketika menolak:"
 
@@ -5357,8 +5380,8 @@ msgstr ""
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Tema"
 
@@ -5385,8 +5408,8 @@ msgstr "Tema diganti"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Restart client anda untuk memberikan efek."
 
@@ -5478,9 +5501,9 @@ msgstr "Batas FPS:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "batas Alt FPS: "
 
@@ -5490,98 +5513,98 @@ msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Modifikasi kursor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Vidio"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "Tidak ada"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "Mengubah ke mode Layar penuh"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "Mengubah ke OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Modifikasi resolusi (contoh: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "Masukkan resolusi baru:              "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "Resolusi layar diubah"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -5917,7 +5940,7 @@ msgstr ""
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Bantuan"
 
@@ -5972,7 +5995,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Perlengkapan"
 
@@ -6117,20 +6140,20 @@ msgstr ""
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Pengaturan"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "Kunci: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -6141,7 +6164,7 @@ msgid "Withdraw"
 msgstr ""
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr ""
 
@@ -6151,20 +6174,20 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "Buat"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr "Penyaring:"
 
@@ -6219,15 +6242,15 @@ msgstr "Pengisian alamat email tidak cocok."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Kesalahan"
 
@@ -6242,7 +6265,7 @@ msgstr "Ganti sandi"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "Kata Sandi:"
 
@@ -6283,8 +6306,8 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "Nama:"
 
@@ -6299,16 +6322,16 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Tolong distribusikan %d point"
@@ -6317,71 +6340,71 @@ msgstr "Tolong distribusikan %d point"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "Warna rambut:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "Gaya rambut:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr "Ras:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nama anda paling sedikit harus mengandung 4 karakter."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "Stats Karakter OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "Tolong hilangkan %d poin"
@@ -6408,36 +6431,37 @@ msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "Main"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Ubah"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr ""
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6448,27 +6472,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "Sandi tidak benar"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "Masukan Sandi untuk menghapus karakter"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "Masukkan sandi:"
 
@@ -6510,7 +6534,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Ya"
 
@@ -6551,42 +6575,42 @@ msgid "Connect"
 msgstr "Menyambung"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Tipe server:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -6621,7 +6645,7 @@ msgstr ""
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr "Tak diketahui"
@@ -6656,7 +6680,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6667,93 +6691,93 @@ msgid "Equip"
 msgstr "Pakai"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "Semua"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "Pilih jumlah item yang mau di perdagangkan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "Pilih jumlah item yang ingin dibuang."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "Pilih jumlah item yang ingin disimpan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "Pilih jumlah item yang ingin diambil kembali."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "Pilih jumlah item yang ingin dipisahkan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "Tambahkan ke daftar beli."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "Tambahkan ke daftar jual."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "Tidak diketahui."
 
@@ -6763,91 +6787,91 @@ msgid "Reset stats"
 msgstr "Atur ulang stats"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "Atur ulang penghitung waktu"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Membunuh: %s, exp total: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Membunuh/menit: %s, Exp/menit: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Kecepatan Exp per %d menit: %s"
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Waktu sebelum naik ke level selanjutnya %d menit: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr "Exp terakhir:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Level: %d pada %f%%"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Waktu untuk ke level selanjutnya: %s"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "Login"
 
@@ -6870,29 +6894,29 @@ msgstr "Menganti Server"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "Mendaftar"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "Modifikasi sumber update"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr ""
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr ""
 
@@ -6913,14 +6937,14 @@ msgstr "Kepada:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr ""
 
@@ -6931,7 +6955,7 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr ""
 
@@ -6955,22 +6979,22 @@ msgid "Get attach"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr ""
 
@@ -6980,24 +7004,29 @@ msgid "Refresh"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr ""
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7139,62 +7168,62 @@ msgid "Switch character"
 msgstr "Ganti Karakter"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Konfirmasi:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "Laki-laki"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "Perempuan"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Kata sandi cocok."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr ""
 
@@ -7204,48 +7233,53 @@ msgid "Choose Your Server"
 msgstr "Pilih Server Anda"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Memuat"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Pilih Servermu *** SAFE MODE ***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "Pilih Servermu *** SAFE MODE ***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 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:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Mengunduh daftar server... %2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "Menyambung ke server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "Menyiapkan pengunduhan"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "Gagal mengunduh data server!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "Membutuhkan versi terbaru"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "Membutuhkan v%s"
@@ -7303,72 +7337,72 @@ msgid "Reset Windows"
 msgstr "Atur ulang jendela"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "Toko personal"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "Umumkan"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "Perlihatkan link di Umumkan"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "Meminta untuk menukar"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -7385,46 +7419,46 @@ msgid "Skill points available: %d"
 msgstr "poin Skill yang tersedia: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr ""
 
@@ -7634,33 +7668,33 @@ msgid "Trade: You"
 msgstr "Tukar: Anda"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "Kamu mendapatkan %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "Ubah"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "Anda memberikan:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "Anda tidak memiliki cukup uang."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -7735,7 +7769,7 @@ msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr ""
 
@@ -8910,9 +8944,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "Bersihkan jendela buang"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9121,33 +9154,33 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr ""
 
@@ -9177,13 +9210,13 @@ msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -9200,7 +9233,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr ""
 
@@ -9456,108 +9489,108 @@ msgid "You were killed by unknown source."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Anda tidak dapat melakukannya sekarang!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Tidak dapat menggunakan skill tersebut dengan senjata tersebut!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr ""
 
@@ -9665,8 +9698,53 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "Masukkan sandi:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+msgid "New pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+msgid "Enter new pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Ubah posisi di organisasi"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr "Tentang"
 
@@ -9686,7 +9764,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "pewarnacmd sumberpewarnastring datadst"
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr "Data telah terunggah"
 
@@ -9694,9 +9772,8 @@ msgstr "Data telah terunggah"
 #. TRANSLATORS: clear fonts cache message
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
 msgid "Cache cleared"
-msgstr "Cache dibersihkan"
+msgstr ""
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9714,9 +9791,8 @@ msgstr "Sumber gambar:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "Sumber gambar:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9725,9 +9801,8 @@ msgstr "Variabel sekitar dibuang"
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1638
-#, fuzzy
 msgid "Config uploaded to:"
-msgstr "Data telah terunggah"
+msgstr ""
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1648
@@ -9736,29 +9811,28 @@ msgstr ""
 
 #. TRANSLATORS: upload log chat message
 #: src/progs/manaplus/actions/actions.cpp:1658
-#, fuzzy
 msgid "Log uploaded to:"
-msgstr "Mengunggah catatan ke:"
+msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
 msgstr ""
 
@@ -10012,57 +10086,57 @@ msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "Terhubung ke server"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "Masuk"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "Mengambil karakter"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "Terhubung ke server permainan"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "Mengganti server"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Perubahan Sandi"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "Perubahan email"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil!"
 
@@ -11339,12 +11413,3 @@ msgstr "%d detik"
 #, c-format
 msgid "%d seconds"
 msgstr "%d detik"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Sumber gambar tak diketahui:"
-
-#~ msgid "Uploaded config into:"
-#~ msgstr "Mengunggah setelan ke:"
-
-#~ msgid "Uploaded server config into:"
-#~ msgstr "Mengunggah setelan server ke:"
diff --git a/po/it.po b/po/it.po
index 123dc54d7..7aac64130 100644
--- a/po/it.po
+++ b/po/it.po
@@ -19,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-11-26 16:44+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"Last-Translator: crifxer .\n"
 "Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
 "it/)\n"
 "Language: it\n"
@@ -31,7 +31,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "Visibile nella mappa"
 
@@ -50,12 +50,12 @@ msgid "miss"
 msgstr "Mancato"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "I"
 
@@ -67,53 +67,53 @@ msgid "You were killed by %s."
 msgstr "Sei stato ucciso da %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "Forza raccolta oggetti non-esistenti."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "L'oggetto è troppo pesante."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "L'oggetto è troppo lontano."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "L'inventario è pieno."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "Troppi oggetti impilati."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "L'oggetto è riservato ad un altro giocatore."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "Raccolta oggetto fallita. Errore sconosciuto."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -122,58 +122,58 @@ msgstr[1] "Hai raccolto %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "EXP"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "Job"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr "Segui: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "Modalità Segui cancellata"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imita: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "Modalità Imitazione cancellata"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -412,15 +412,13 @@ msgstr "Errore di rete"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:831
-#, fuzzy
 msgid "Auto disable Show beings transparency"
-msgstr "Mostra trasparenza personaggi"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Effetti particelle"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
@@ -812,32 +810,35 @@ msgstr "Assente"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "OK"
 
@@ -868,14 +869,14 @@ msgstr "(F) Modalita' camera libera"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Chiudi"
 
@@ -924,7 +925,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "Predefinito"
 
@@ -1374,9 +1375,9 @@ msgstr "Gilda: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "Commento: %s"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1572,9 +1573,9 @@ msgstr "Parla"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1592,7 +1593,7 @@ msgstr "Compra"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1662,8 +1663,8 @@ msgstr ""
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "Rinomina"
 
@@ -1687,7 +1688,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1721,6 +1722,7 @@ msgstr "Aggiungi nome alla chat"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1753,10 +1755,11 @@ msgstr "Aggiungi nome alla chat"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "Annulla"
@@ -1812,7 +1815,7 @@ msgstr "Rimuovi"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr "Teletrasporto"
 
@@ -1834,7 +1837,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Attrezzatura"
@@ -1866,8 +1869,10 @@ msgstr "Modifica Incantesimo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "Cancella"
 
@@ -2038,9 +2043,9 @@ msgstr "Aggiungi tutti"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "Magazzino"
 
@@ -2077,8 +2082,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "Recupera"
 
@@ -2117,10 +2122,10 @@ msgstr "Ritira tutto"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Usa"
@@ -2273,7 +2278,7 @@ msgstr ""
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "Predefinito"
 
@@ -2309,7 +2314,7 @@ msgstr "Ignora"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -2415,8 +2420,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "Lascia..."
 
@@ -2431,7 +2436,7 @@ msgstr "Lascia tutto"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Lascia"
 
@@ -2490,7 +2495,7 @@ msgstr "Magazzino"
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr "Carrello"
@@ -2708,10 +2713,10 @@ msgstr ""
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "Informazioni"
 
@@ -2903,7 +2908,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3216,7 +3221,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "Massimo"
@@ -3228,9 +3233,9 @@ msgstr "Massimo"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3244,7 +3249,7 @@ msgstr "Livello: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3271,9 +3276,9 @@ msgstr "Apri url"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "Aggiungi"
@@ -3285,10 +3290,10 @@ msgstr "Aggiungi"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Esci"
 
@@ -3297,24 +3302,24 @@ msgstr "Esci"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prezzo: %s / Totale: %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Modifica"
 
@@ -3399,9 +3404,8 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "per nome"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
@@ -3410,42 +3414,41 @@ msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "per nome"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Musica:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Mappa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Mini mappa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "Cursore:"
 
@@ -3456,224 +3459,232 @@ msgstr "Contatore Particelle:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Contatore generatori mappa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Contatore generatori mappa:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Posizione giocatore:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr ""
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr "Conteggio Textures:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Conto particelle: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "Target ID:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr "Livello target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr "Razza target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr "Party target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr "Gilda target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "Ritardo Attacco:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr "Danno minimo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr "Danno massimo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr "Colpo critico:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Livello Target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Party del Target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Gilda del Target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "In: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Out: %d bytes/s"
@@ -3781,46 +3792,58 @@ msgstr "Suono per il sussurro"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
 #, fuzzy
-msgid "Guild / party / clan message sound"
+msgid "Guild message sound"
 msgstr "Suono per i messaggi globali"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "Suono per gli errori"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+#, fuzzy
+msgid "Clan message sound"
+msgstr "Suono per i messaggi globali"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Global message sound"
 msgstr "Suono per i messaggi globali"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Error message sound"
 msgstr "Suono per gli errori"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr "Suono per la richiesta di scambio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr "Mostra finestra dell'audio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr "Nascondi finestra dell'audio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Abilita chat vocale mumble"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Scarica musica"
 
@@ -4345,27 +4368,27 @@ msgid "Assign"
 msgstr "Imposta"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "Annullare l'assegnazione"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr "Resetta tutte le scorciatoie"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr "Input"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "Sono stati rilevati conflitti nei tasti."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4376,50 +4399,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr "sconosciuto"
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "Premi il pulsante per cominciare la calibrazione"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Calibra"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr "Rileva i joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Abilita joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "Ferma"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -4739,7 +4762,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "Negozio"
 
@@ -4948,14 +4971,14 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "No"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr ""
 
@@ -5287,19 +5310,19 @@ msgstr "Permetti sussurri"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Elimina"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr "Relazioni"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Quando si ignora:"
 
@@ -5371,8 +5394,8 @@ msgstr ""
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Tema"
 
@@ -5399,8 +5422,8 @@ msgstr "Tema cambiato"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Per applicare le modifiche, è necessario riavviare il client."
 
@@ -5492,9 +5515,9 @@ msgstr "Limite FPS:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Limite Alt FPS: "
 
@@ -5504,50 +5527,50 @@ msgid "Detect best mode"
 msgstr "Trova modalita' migliore"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr "Mostra cursore"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Cursore personalizzato"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr "Permetti ridimensiona"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "Nessuno"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5555,7 +5578,7 @@ msgstr ""
 "precedente è fallito!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5563,43 +5586,43 @@ msgstr ""
 "modalità precedente è fallito!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "Cambiamento a schermo intero"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "Passa a OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "Riavvia per passare a OpenGL."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Risoluzione scelta (esempio 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "Nuova risoluzione:                   "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "RIsoluzione schermo cambiata"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Alcune finestre potrebbero essere spostate per addattarsi alla risoluzione "
@@ -5937,7 +5960,7 @@ msgstr ""
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Aiuto"
 
@@ -5992,7 +6015,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
@@ -6137,20 +6160,20 @@ msgstr "SET"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Impostazioni"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "Chiave: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -6161,7 +6184,7 @@ msgid "Withdraw"
 msgstr ""
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr ""
 
@@ -6171,20 +6194,20 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr "Quantita':"
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "Crea"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr "Filtro:"
 
@@ -6239,15 +6262,15 @@ msgstr "Gli indirizzi email immessi non coincidono."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Errore"
 
@@ -6262,7 +6285,7 @@ msgstr "Cambia la Password"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "Password:"
 
@@ -6303,8 +6326,8 @@ msgstr "Nuovo Personaggio"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "Nome:"
 
@@ -6319,16 +6342,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribuire %d punti"
@@ -6337,71 +6360,71 @@ msgstr "Distribuire %d punti"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "Colore dei capelli:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "Taglio di capelli:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr "Razza:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "Il tuo nome deve contenere almeno 4 caratteri."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "Statistiche personaggio OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "Rimuovere %d punti"
@@ -6428,36 +6451,37 @@ msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "Gioca"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Cambia login"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr "Account %s"
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr ""
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6468,27 +6492,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "Password non valida"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "Digitare password per eliminare un personaggio"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "Digitare password:"
 
@@ -6530,7 +6554,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Sì"
 
@@ -6571,42 +6595,42 @@ msgid "Connect"
 msgstr "Connetti"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr "Indirizzo:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Porta:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Tipo di server:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr "Descrizione:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr "Per favore indicare almeno l'indirizzo e la porta del server."
 
@@ -6641,7 +6665,7 @@ msgstr ""
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr "Sconosciuto"
@@ -6676,7 +6700,7 @@ msgstr "Insert"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6687,93 +6711,93 @@ msgid "Equip"
 msgstr "Equipaggia"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "Tutti"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "Seleziona la quantità di oggetti da scambiare."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "Seleziona la quantità di oggetti da lasciare."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "Selezionare la quantità di oggetti da riporre."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "Seleziona la quantità di oggetti da ritirare."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "Seleziona la quantità di oggetti da dividere."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "Aggiungi allo shop di acquisto."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "Aggiungi allo shop di vendita."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "Sconosciuto."
 
@@ -6783,52 +6807,52 @@ msgid "Reset stats"
 msgstr "Reset statistiche"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "Reset timer"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -6836,40 +6860,40 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr "Punti Exp ultimo Kill:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Livello: %d al %f%%"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "Autenticazione"
 
@@ -6892,29 +6916,29 @@ msgstr "Cambia server"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "Registra"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "Aggiornamento host"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr "Apri URL di registrazione"
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr ""
 
@@ -6935,14 +6959,14 @@ msgstr "A:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr ""
 
@@ -6953,7 +6977,7 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr ""
 
@@ -6977,22 +7001,22 @@ msgid "Get attach"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr ""
 
@@ -7002,24 +7026,29 @@ msgid "Refresh"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr ""
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr "Apri"
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7161,62 +7190,62 @@ msgid "Switch character"
 msgstr "Cambia personaggio"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Conferma:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "Maschio"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "Femmina"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr "Email errata."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr ""
 
@@ -7226,48 +7255,53 @@ msgid "Choose Your Server"
 msgstr "Scegli il tuo server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Carica"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Scegli Il Tuo Server  *** MODALITA' SICURA ***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "Scegli Il Tuo Server  *** MODALITA' SICURA ***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 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:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloading server list... %2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "Attesa del server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "Preparazione download"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "Errore nel ricevimento della lista sei server!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "Richiede una versione più nuova"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "Richiede v%s"
@@ -7325,72 +7359,72 @@ msgid "Reset Windows"
 msgstr "Resetta finestre"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "Negozio personale"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "Annuncia"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "Mostra link nell'annuncio"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "Richiesta di commercio"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -7407,46 +7441,46 @@ msgid "Skill points available: %d"
 msgstr "Punti abilità disponibili: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr "Abilità impostata %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "Abilità %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr ""
 
@@ -7656,35 +7690,35 @@ msgid "Trade: You"
 msgstr "Commercia: Tu"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "Ottieni %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "Cambia"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "Dai:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "Non hai abbastanza denaro."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 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 "
 "finestra."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -7759,7 +7793,7 @@ msgid "Change Login"
 msgstr "Cambia login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Scegli parola"
 
@@ -8934,9 +8968,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "Finestra della Chat"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9149,33 +9182,33 @@ msgstr "Connessione al server terminata. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "Eliminazione personaggio fallita."
 
@@ -9205,13 +9238,13 @@ msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -9228,7 +9261,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "Disconnesso dal server!"
 
@@ -9484,108 +9517,108 @@ msgid "You were killed by unknown source."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Non hai raggiunto un Livello sufficientemente alto!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP insufficienti!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP Insufficienti!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Non hai nessun promemoria!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Al momento non puoi farlo!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Sembra tu abbia bisogno di più soldi... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Non puoi usare questa Abilità con questa arma!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Hai bisogno un'altra Gemma Rossa!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Hai bisogno un'altra Gemma Blu!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Stai trasportando troppo carico per compiere quest'azione!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr ""
 
@@ -9693,8 +9726,53 @@ msgstr "Non riesci a rubare niente..."
 msgid "Poison had no effect..."
 msgstr "Il veleno non ha effetto..."
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "Digitare password:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+msgid "New pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+msgid "Enter new pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Cambia visualiz. mappa"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr "Info"
 
@@ -9714,7 +9792,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr "File caricato"
 
@@ -9722,9 +9800,8 @@ msgstr "File caricato"
 #. TRANSLATORS: clear fonts cache message
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
 msgid "Cache cleared"
-msgstr "Cache puliti"
+msgstr ""
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9742,9 +9819,8 @@ msgstr "Risorsa immagine:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "Risorsa immagine:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9753,9 +9829,8 @@ msgstr "Variabile d'ambiente dumping"
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1638
-#, fuzzy
 msgid "Config uploaded to:"
-msgstr "File caricato"
+msgstr ""
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1648
@@ -9764,29 +9839,28 @@ msgstr ""
 
 #. TRANSLATORS: upload log chat message
 #: src/progs/manaplus/actions/actions.cpp:1658
-#, fuzzy
 msgid "Log uploaded to:"
-msgstr "Carica log in:"
+msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
 msgstr ""
 
@@ -10040,57 +10114,57 @@ msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "Accesso all'account"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "Caricamento personaggi"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Cambia password"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "Cambia Email"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
@@ -11318,7 +11392,7 @@ msgstr ""
 #: src/utils/stringutils.cpp:960
 #, c-format
 msgid "%d week"
-msgstr "%d settimane"
+msgstr ""
 
 #: src/utils/stringutils.cpp:960
 #, c-format
@@ -11329,7 +11403,7 @@ msgstr "%d settimane"
 #: src/utils/stringutils.cpp:971
 #, c-format
 msgid "%d day"
-msgstr "%d giorni"
+msgstr "%d giorno"
 
 #: src/utils/stringutils.cpp:971
 #, c-format
@@ -11340,7 +11414,7 @@ msgstr "%d giorni"
 #: src/utils/stringutils.cpp:981
 #, c-format
 msgid "%d hour"
-msgstr "%d ore"
+msgstr "%d ora"
 
 #: src/utils/stringutils.cpp:981
 #, c-format
@@ -11351,7 +11425,7 @@ msgstr "%d ore"
 #: src/utils/stringutils.cpp:991
 #, c-format
 msgid "%d minute"
-msgstr "%d minuti"
+msgstr "%d minuto"
 
 #: src/utils/stringutils.cpp:991
 #, c-format
@@ -11362,18 +11436,9 @@ msgstr "%d minuti"
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d second"
-msgstr "%d secondi"
+msgstr ""
 
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondi"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Risorsa immagine orfana:"
-
-#~ msgid "Uploaded config into:"
-#~ msgstr "Carica configurazione in:"
-
-#~ msgid "Uploaded server config into:"
-#~ msgstr "Carica configurazione server in:"
diff --git a/po/ja.po b/po/ja.po
index f360b718d..0bb7d2e75 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
 "ja/)\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "マップに表示させる"
 
@@ -45,12 +45,12 @@ msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "I"
 
@@ -62,53 +62,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "存在しないアイテムは拾えません."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "アイテムが重過ぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "アイテムが遠すぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "インベントリーが満杯です."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "量が多すぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "これは他のプレイヤーのアイテムです."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "不明なエラーの為拾えません."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -116,58 +116,58 @@ msgstr[0] "%d [@@%d|%s@@]を手に入れました."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "ジョブ"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "フォローを止める"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "真似をやめる"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -406,15 +406,13 @@ msgstr "ネットワークエラー"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:831
-#, fuzzy
 msgid "Auto disable Show beings transparency"
-msgstr "透過を表示する"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "パーティクル効果"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
@@ -806,32 +804,35 @@ msgstr "アウェイ"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "OK"
 
@@ -862,14 +863,14 @@ msgstr "(F) フリーカメラモード"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "閉じる"
 
@@ -915,7 +916,7 @@ msgstr "インベントリーが体重の半分以下になった為、体力は
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "デフォルト"
 
@@ -1365,9 +1366,9 @@ msgstr "ギルド: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "コメント: %s"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1563,9 +1564,9 @@ msgstr "話す"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1583,7 +1584,7 @@ msgstr "買う"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1653,8 +1654,8 @@ msgstr ""
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "名前を変更する"
 
@@ -1678,7 +1679,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1712,6 +1713,7 @@ msgstr "名前をチャットへ追加する"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1744,10 +1746,11 @@ msgstr "名前をチャットへ追加する"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "キャンセル"
@@ -1803,7 +1806,7 @@ msgstr "削除"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr "ワープ"
 
@@ -1825,7 +1828,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "服装"
@@ -1857,8 +1860,10 @@ msgstr "呪文を編集する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "クリア"
 
@@ -2029,9 +2034,9 @@ msgstr "トレードウィンドウに全て追加する"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "保管"
 
@@ -2068,8 +2073,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "取出す"
 
@@ -2108,10 +2113,10 @@ msgstr "全部取出す"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "使用"
@@ -2264,7 +2269,7 @@ msgstr ""
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "標準に戻す"
 
@@ -2300,7 +2305,7 @@ msgstr "無視する"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "無視"
 
@@ -2406,8 +2411,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "落とす..."
 
@@ -2422,7 +2427,7 @@ msgstr "全て落とす"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "落とす"
 
@@ -2481,7 +2486,7 @@ msgstr "倉庫"
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr "カート"
@@ -2699,10 +2704,10 @@ msgstr ""
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "情報"
 
@@ -2894,7 +2899,7 @@ msgstr "チャット"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3207,7 +3212,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "最大"
@@ -3219,9 +3224,9 @@ msgstr "最大"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3235,7 +3240,7 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3262,9 +3267,9 @@ msgstr "URLを開く"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "追加"
@@ -3276,10 +3281,10 @@ msgstr "追加"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "終了"
 
@@ -3288,24 +3293,24 @@ msgstr "終了"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "価格:%s /合計:%s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "編集"
 
@@ -3390,9 +3395,8 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "名前を点灯させる"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
@@ -3401,42 +3405,41 @@ msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "名前"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "音楽:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "マップ:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "ミニマップ:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "カーソル:"
 
@@ -3447,224 +3450,232 @@ msgstr "パーティクル数:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "マップアクターの数:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "マップアクターの数:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "プレイヤーの位置:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr ""
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (ソフトウェア)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr "テクスチャー数:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "パーティクル数:%d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "ターゲット:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "ターゲットID:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr "ターゲットレベル:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr "ターゲット種別:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr "ターゲットパーティ:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr "ターゲットギルド:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "攻撃遅延:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr "最低ヒット:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr "最高ヒット:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr "クリティカルヒット:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "ターゲットレベル:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "ターゲットパーティ:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "ターゲットギルド:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr "ピング: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "入力: %dバイト/秒"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "出力: %d バイト/秒"
@@ -3772,46 +3783,58 @@ msgstr "ささやきメッセージ音"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
 #, fuzzy
-msgid "Guild / party / clan message sound"
-msgstr "ギルド/パーティメッセージ音"
+msgid "Guild message sound"
+msgstr "グローバルメッセージ音"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "エラーメッセージ音"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+#, fuzzy
+msgid "Clan message sound"
+msgstr "グローバルメッセージ音"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
 msgid "Highlight message sound"
 msgstr "メッセージ音をハイライト"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Global message sound"
 msgstr "グローバルメッセージ音"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Error message sound"
 msgstr "エラーメッセージ音"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr "トレードリクエスト音"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr "窓の音を有効"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr "窓の音を無効"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Mumble Voice Chatを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "音楽をダウンロードする"
 
@@ -4336,27 +4359,27 @@ msgid "Assign"
 msgstr "割り当てる"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "割り当て解除"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr "全てのキーをリセット"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr "入力"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "ショートカットキーが重複しています."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4367,50 +4390,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr "不明"
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "ボタンを押してカリブレーションを開始"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "カリブレーション"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "ジョイスティックを使用可能にする"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr "クライアントが無効の場合ジョイスティックを使用"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "ジョイスティック"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "停止"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr "ボタンは押さないでスティックを回転する"
 
@@ -4730,7 +4753,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "店"
 
@@ -4939,14 +4962,14 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "いいえ"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr ""
 
@@ -5278,19 +5301,19 @@ msgstr "全てのささやきを受け取る"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "削除"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr "関係"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "完全無視の際には:"
 
@@ -5362,8 +5385,8 @@ msgstr "i"
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "テーマ"
 
@@ -5390,8 +5413,8 @@ msgstr "テーマを変更しました"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "設定変更の為アプリケーションを再起動してください."
 
@@ -5483,9 +5506,9 @@ msgstr "FPSリミット:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Alt FPS リミット: "
 
@@ -5495,98 +5518,98 @@ msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr "カーソルを表示"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "カスタムカーソル"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr "リサイズを有効にする"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr "フレームなし"
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "ビデオ"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "なし"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "ウインドウモード、また前モードの復元にも失敗しました!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "フルスクリーンモード、また前モードの復元にも失敗しました!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "フルスクリーンに変更"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "設定変更の為、再起動をしてください."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "OpenGLに変更"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGLの設定を変更するため、再起動をしてください."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "カスタム解像度 (例: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "解像度を入力して下さい:              "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "スクリーンの解像度を変更しました"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "解像度の変更に合わせ、いくつかのウィンドウが移動する可能性があります."
 
@@ -5922,7 +5945,7 @@ msgstr "ヘルプ"
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "ヘルプ"
 
@@ -5977,7 +6000,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "装着品"
 
@@ -6122,20 +6145,20 @@ msgstr "SET"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "鍵: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -6146,7 +6169,7 @@ msgid "Withdraw"
 msgstr ""
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr ""
 
@@ -6156,20 +6179,20 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr "量:"
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "作成"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr "フィルタ:"
 
@@ -6224,15 +6247,15 @@ msgstr "メールアドレスが一致しません."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "エラー"
 
@@ -6247,7 +6270,7 @@ msgstr "パスワードの変更"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "パスワード:"
 
@@ -6288,8 +6311,8 @@ msgstr "新しいキャラクター"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "名前:"
 
@@ -6304,16 +6327,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "%d ポイントを振り分けてください"
@@ -6322,71 +6345,71 @@ msgstr "%d ポイントを振り分けてください"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "髪色:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "ヘアスタイル:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr "人種:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr "友達"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "名前は４文字以上必要です."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "能力ポイント配分量は問題ありません"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "%dポイントを取り除いてください"
@@ -6413,36 +6436,37 @@ msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "プレイ"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "ログインの変更"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr ""
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6453,27 +6477,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "パスワードが違います"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "キャラクターを削除するにはパスワードを入力して下さい"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "パスワードを入力して下さい:"
 
@@ -6515,7 +6539,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "はい"
 
@@ -6556,42 +6580,42 @@ msgid "Connect"
 msgstr "接続"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr "アドレス:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "ポート:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "サーバータイプ:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr "詳細:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr "サーバーアドレスとポートを入力して下さい."
 
@@ -6626,7 +6650,7 @@ msgstr ""
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr ""
@@ -6661,7 +6685,7 @@ msgstr "挿入"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6672,93 +6696,93 @@ msgid "Equip"
 msgstr "装着"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "全て"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "トレードするアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "落とすアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "保管するアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "取出すアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "分割するアイテムの量を選択してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "購入リストに追加."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "販売リストに追加."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "不明."
 
@@ -6768,91 +6792,91 @@ msgid "Reset stats"
 msgstr "統計をリセット"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "タイマーをリセット"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "キル: %s, 合計exp: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "平均 Exp: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "次のレベルまでに必要なモブ数　約: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "キル/分: %s, Exp/分: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Expスピード %d 分ごと: %s"
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "次のレベルアップ %d 分ごと: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr "最後のExp:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "レベル: %d と %f%%"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  次のレベル達成までの時間: %s"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "ログイン"
 
@@ -6875,29 +6899,29 @@ msgstr "サーバー変更"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "登録"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "カスタムアップデートホスト"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "サーバー:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr ""
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr ""
 
@@ -6918,14 +6942,14 @@ msgstr "宛先:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr ""
 
@@ -6936,7 +6960,7 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr ""
 
@@ -6960,22 +6984,22 @@ msgid "Get attach"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr ""
 
@@ -6985,24 +7009,29 @@ msgid "Refresh"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr ""
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7144,62 +7173,62 @@ msgid "Switch character"
 msgstr "キャラクターを変更する"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "確認:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "男性"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "女性"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "Eメール:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "パスワードが一致しません."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr "メールアドレスが違います."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr ""
 
@@ -7209,48 +7238,53 @@ msgid "Choose Your Server"
 msgstr "サーバーを選択してください"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "読込み"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "サーバーを選んで下さい  *** セーフモード ***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "サーバーを選んで下さい  *** セーフモード ***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 msgid "Use same ip for game sub servers"
 msgstr "同じIPをゲームサブサーバーでも使用する"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "サーバーリストをダウンロード中...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "サーバーからの応答を待っています..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "ダウンロード準備中"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "サーバーリストの読み込みに失敗!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "アップデートが必要です"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "v%sが必要"
@@ -7308,72 +7342,72 @@ msgid "Reset Windows"
 msgstr "ウィンドウをリセットする"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "最大 (15)"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "アナウンス"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "アナウンスにリンクを表示する"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "トレードをリクエスト"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -7390,46 +7424,46 @@ msgid "Skill points available: %d"
 msgstr "スキルポイント: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr "スキルセット %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "スキル %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr ""
 
@@ -7639,35 +7673,35 @@ msgid "Trade: You"
 msgstr "トレード: 自分"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "%sを手に入れた"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "変更"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "トレードするアイテム:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "GP不足です."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "アイテムの追加に失敗しました。アイテム一種類を一つのウインドウ上で重複して追"
 "加することは出来ません."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -7742,7 +7776,7 @@ msgid "Change Login"
 msgstr "ログインの変更"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "世界の選択"
 
@@ -8917,9 +8951,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "チャットウィンドウ"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9132,33 +9165,33 @@ msgstr "サーバーへの接続が切断されました. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "キャラクター削除に失敗しました."
 
@@ -9188,13 +9221,13 @@ msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -9211,7 +9244,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "サーバーから切断されました!"
 
@@ -9467,108 +9500,108 @@ msgid "You were killed by unknown source."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "あなたはまだ十分なlvlに達していません!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "メモがありません!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "今この行動はできません!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "GPが足りません... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "このスキルはこの武器と一緒に使えません!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Red Gemが必要です!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Blue Gemが必要です!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "アイテムを持ちすぎています!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr ""
 
@@ -9676,8 +9709,53 @@ msgstr "何も盗めませんでした..."
 msgid "Poison had no effect..."
 msgstr "毒の影響はなかった..."
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "パスワードを入力して下さい:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+msgid "New pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+msgid "Enter new pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "マップビューモード変更"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr ""
 
@@ -9697,7 +9775,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr ""
 
@@ -9724,9 +9802,8 @@ msgstr "リソースイメージ:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "リソースイメージ:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9749,24 +9826,24 @@ msgid "Log uploaded to:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
 msgstr ""
 
@@ -10019,57 +10096,57 @@ msgid "Accepting incoming trade requests"
 msgstr "トレードリクエストを有効にしました"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "サーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "ログインしています"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "パスワード変更"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました!"
 
@@ -11297,7 +11374,7 @@ msgstr ""
 #: src/utils/stringutils.cpp:960
 #, c-format
 msgid "%d week"
-msgstr "%d週"
+msgstr ""
 
 #: src/utils/stringutils.cpp:960
 #, c-format
@@ -11308,7 +11385,7 @@ msgstr "%d週"
 #: src/utils/stringutils.cpp:971
 #, c-format
 msgid "%d day"
-msgstr "%d日"
+msgstr ""
 
 #: src/utils/stringutils.cpp:971
 #, c-format
@@ -11319,7 +11396,7 @@ msgstr "%d日"
 #: src/utils/stringutils.cpp:981
 #, c-format
 msgid "%d hour"
-msgstr "%d時"
+msgstr ""
 
 #: src/utils/stringutils.cpp:981
 #, c-format
@@ -11330,7 +11407,7 @@ msgstr "%d時"
 #: src/utils/stringutils.cpp:991
 #, c-format
 msgid "%d minute"
-msgstr "%d分"
+msgstr ""
 
 #: src/utils/stringutils.cpp:991
 #, c-format
@@ -11341,12 +11418,9 @@ msgstr "%d分"
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d second"
-msgstr "%d秒"
+msgstr ""
 
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d seconds"
 msgstr "%d秒"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "リソース孤児イメージ:"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 049c49c17..40d698a2b 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: 2018-02-19 05:18+0300\n"
+"POT-Creation-Date: 2018-05-19 23:51+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,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr ""
 
@@ -38,12 +38,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr ""
 
@@ -55,53 +55,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -110,58 +110,58 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -795,32 +795,35 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr ""
 
@@ -851,14 +854,14 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr ""
 
@@ -904,7 +907,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr ""
 
@@ -1552,9 +1555,9 @@ msgstr ""
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1572,7 +1575,7 @@ msgstr ""
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1642,8 +1645,8 @@ msgstr ""
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr ""
 
@@ -1667,7 +1670,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1701,6 +1704,7 @@ msgstr ""
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1733,10 +1737,11 @@ msgstr ""
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr ""
@@ -1792,7 +1797,7 @@ msgstr ""
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr ""
 
@@ -1814,7 +1819,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr ""
@@ -1846,8 +1851,10 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr ""
 
@@ -2018,9 +2025,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr ""
 
@@ -2057,8 +2064,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr ""
 
@@ -2097,10 +2104,10 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
@@ -2253,7 +2260,7 @@ msgstr ""
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr ""
 
@@ -2289,7 +2296,7 @@ msgstr ""
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr ""
 
@@ -2395,8 +2402,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr ""
 
@@ -2411,7 +2418,7 @@ msgstr ""
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr ""
 
@@ -2470,7 +2477,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr ""
@@ -2688,10 +2695,10 @@ msgstr ""
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr ""
 
@@ -2883,7 +2890,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3196,7 +3203,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr ""
@@ -3208,9 +3215,9 @@ msgstr ""
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr ""
 
@@ -3224,7 +3231,7 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3251,9 +3258,9 @@ msgstr ""
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr ""
@@ -3265,10 +3272,10 @@ msgstr ""
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr ""
 
@@ -3277,24 +3284,24 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr ""
 
@@ -3394,36 +3401,36 @@ msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr ""
 
@@ -3434,224 +3441,231 @@ msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+msgid "Map atlas count:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr ""
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -3758,46 +3772,56 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-msgid "Guild / party / clan message sound"
+msgid "Guild message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-msgid "Highlight message sound"
+msgid "Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-msgid "Global message sound"
+msgid "Clan message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
-msgid "Error message sound"
+msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:163
-msgid "Trade request sound"
+msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:168
-msgid "Show window sound"
+msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:173
-msgid "Hide window sound"
+msgid "Trade request sound"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:178
+msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:183
+msgid "Hide window sound"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr ""
 
@@ -4322,27 +4346,27 @@ msgid "Assign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4351,50 +4375,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -4714,7 +4738,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr ""
 
@@ -4923,14 +4947,14 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr ""
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr ""
 
@@ -5262,19 +5286,19 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr ""
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr ""
 
@@ -5346,8 +5370,8 @@ msgstr ""
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr ""
 
@@ -5374,8 +5398,8 @@ msgstr ""
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -5467,9 +5491,9 @@ msgstr ""
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr ""
 
@@ -5479,98 +5503,98 @@ msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -5906,7 +5930,7 @@ msgstr ""
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr ""
 
@@ -5961,7 +5985,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr ""
 
@@ -6106,20 +6130,20 @@ msgstr ""
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -6130,7 +6154,7 @@ msgid "Withdraw"
 msgstr ""
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr ""
 
@@ -6140,20 +6164,20 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr ""
 
@@ -6208,15 +6232,15 @@ msgstr ""
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr ""
 
@@ -6231,7 +6255,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr ""
 
@@ -6272,8 +6296,8 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr ""
 
@@ -6288,16 +6312,16 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
@@ -6306,71 +6330,71 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -6397,36 +6421,36 @@ msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr ""
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+msgid "Change pin"
+msgstr ""
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr ""
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6437,27 +6461,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr ""
 
@@ -6499,7 +6523,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr ""
 
@@ -6540,42 +6564,42 @@ msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -6610,7 +6634,7 @@ msgstr ""
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr ""
@@ -6645,7 +6669,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6656,93 +6680,93 @@ msgid "Equip"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr ""
 
@@ -6752,52 +6776,52 @@ msgid "Reset stats"
 msgstr ""
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -6805,40 +6829,40 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr ""
 
@@ -6861,29 +6885,29 @@ msgstr ""
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr ""
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr ""
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr ""
 
@@ -6904,14 +6928,14 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr ""
 
@@ -6922,7 +6946,7 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr ""
 
@@ -6946,22 +6970,22 @@ msgid "Get attach"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr ""
 
@@ -6971,24 +6995,29 @@ msgid "Refresh"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr ""
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7130,62 +7159,62 @@ msgid "Switch character"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr ""
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr ""
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr ""
 
@@ -7195,48 +7224,52 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
+#: src/gui/windows/serverdialog.cpp:139
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr ""
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -7294,72 +7327,72 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -7376,46 +7409,46 @@ msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr ""
 
@@ -7625,33 +7658,33 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -7726,7 +7759,7 @@ msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr ""
 
@@ -9111,33 +9144,33 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr ""
 
@@ -9167,13 +9200,13 @@ msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -9190,7 +9223,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr ""
 
@@ -9446,108 +9479,108 @@ msgid "You were killed by unknown source."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr ""
 
@@ -9655,8 +9688,51 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+msgid "Enter pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+msgid "New pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+msgid "Enter new pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+msgid "Change pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr ""
 
@@ -9676,7 +9752,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr ""
 
@@ -9727,24 +9803,24 @@ msgid "Log uploaded to:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
 msgstr ""
 
@@ -9997,57 +10073,57 @@ msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 0c5be5f1b..8868f12d4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
 "language/nl_BE/)\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
@@ -42,12 +42,12 @@ msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "I"
 
@@ -59,53 +59,53 @@ msgid "You were killed by %s."
 msgstr "U bent gedood door %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "Inventaris is vol."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "Uw opstapeling is de groot."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr "U kan deze hoeveelheid aan items niet oprapen."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr "U zit aan het maximum van uw opslagruimte."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "Onbekend probleem bij het oprapen van voorwerp."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -114,58 +114,58 @@ msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "ep"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "job"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr "Volg %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imiteer %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr "You see %s"
@@ -406,9 +406,8 @@ msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Deeltjes effecten"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
@@ -800,32 +799,35 @@ msgstr "Weg"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "Oké"
 
@@ -856,14 +858,14 @@ msgstr "(F) vrije camera modus"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Sluiten"
 
@@ -911,7 +913,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "standaard"
 
@@ -1559,9 +1561,9 @@ msgstr "Spreken"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1579,7 +1581,7 @@ msgstr "Kopen"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1649,8 +1651,8 @@ msgstr ""
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "Hernoem"
 
@@ -1674,7 +1676,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1708,6 +1710,7 @@ msgstr "Naam aan het gesprek toevoegen"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1740,10 +1743,11 @@ msgstr "Naam aan het gesprek toevoegen"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "Annuleren"
@@ -1799,7 +1803,7 @@ msgstr "Verwijder"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr ""
 
@@ -1821,7 +1825,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Kleren"
@@ -1853,8 +1857,10 @@ msgstr "Wijzig spreuk"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "Wissen"
 
@@ -2025,9 +2031,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "Opslaan"
 
@@ -2064,8 +2070,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "Afhalen"
 
@@ -2104,10 +2110,10 @@ msgstr "Haal alles op"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Gebruiken"
@@ -2260,7 +2266,7 @@ msgstr ""
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "Standaard"
 
@@ -2296,7 +2302,7 @@ msgstr "Geen rekening mee houden"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Negeer"
 
@@ -2402,8 +2408,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "Neerleggen..."
 
@@ -2418,7 +2424,7 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Neerleggen"
 
@@ -2477,7 +2483,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr "Winkelkar"
@@ -2695,10 +2701,10 @@ msgstr ""
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "Info"
 
@@ -2890,7 +2896,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3203,7 +3209,7 @@ msgstr "Wegpunt"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "Maximum"
@@ -3215,9 +3221,9 @@ msgstr "Maximum"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3231,7 +3237,7 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3258,9 +3264,9 @@ msgstr ""
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "Toevoegen"
@@ -3272,10 +3278,10 @@ msgstr "Toevoegen"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -3284,24 +3290,24 @@ msgstr "Afsluiten"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prijs: %s / Totaal: %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Wijzig"
 
@@ -3386,54 +3392,51 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "Blink naam"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
-#, fuzzy
 msgid "Master name"
-msgstr "GM namen"
+msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "GM namen"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Muziek:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Kaart:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Minikaart:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "Muispunt:"
 
@@ -3444,224 +3447,232 @@ msgstr "Deeltjesaantal:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Aantal kaart-acteurs:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Aantal kaart-acteurs:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Speler positie:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr ""
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d beelden/sec"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d beelden/sec (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr "%d beelden/sec (normale OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr "%d beelden/sec (veilige OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr "%d beelden/sec (SDL2 standaard)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr "Textuuraantal:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Deeltjes-aantal: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Doel:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "Doel identificatie:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "Aanvalsvertraging:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr "Normale slag:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr "Maximum slag:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr "Critieke slag:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Doel niveau:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Doel Party:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Doel Gilde:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Invoer: %d bytes/sec"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Uitvoer: %d bytes/sec"
@@ -3768,46 +3779,58 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-msgid "Guild / party / clan message sound"
-msgstr ""
+#, fuzzy
+msgid "Guild message sound"
+msgstr "Guild leden"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "Groep leden"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+msgid "Clan message sound"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Zet mumble voice chat aan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Download muziek"
 
@@ -4332,27 +4355,27 @@ msgid "Assign"
 msgstr "Toewijzen"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "Maak toewijzing ongedaan"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4361,50 +4384,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "Druk op de knop om het kalibreren te starten"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Kalibreren"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Joystick activeren"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "Stoppen"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -4724,7 +4747,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "Winkel"
 
@@ -4933,14 +4956,14 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "Nee"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr "Performantie"
 
@@ -5272,19 +5295,19 @@ msgstr "Fluisteren toestaan"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Verwijderen"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr "Relaties"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Tijdens negeren:"
 
@@ -5356,8 +5379,8 @@ msgstr "i"
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Thema"
 
@@ -5384,8 +5407,8 @@ msgstr "Thema is gewijzigd"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
@@ -5477,9 +5500,9 @@ msgstr "FPS limiet:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Alt FPS limiet: "
 
@@ -5489,50 +5512,50 @@ msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "Geen"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5540,7 +5563,7 @@ msgstr ""
 "faalde ook!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5548,43 +5571,43 @@ msgstr ""
 "modus faalde ook!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "Verwisselen naar Volledig Scherm"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "Verwisselen naar OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Manuele resolutie (voorbeeld: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "Geef een nieuwe resolutie:           "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "Scherm Resolutie is gewijzigd"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
@@ -5922,7 +5945,7 @@ msgstr "HLP"
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Help"
 
@@ -5977,7 +6000,7 @@ msgstr "UITR"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Uitrusting"
 
@@ -6122,20 +6145,20 @@ msgstr "CONF"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "Toets: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -6146,7 +6169,7 @@ msgid "Withdraw"
 msgstr ""
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr ""
 
@@ -6156,20 +6179,20 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "Aanmaken"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr "Filter:"
 
@@ -6224,15 +6247,15 @@ msgstr "De email adres ingaven zijn niet gelijk."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Fout"
 
@@ -6247,7 +6270,7 @@ msgstr "Wijzig wachtwoord"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "Wachtwoord:"
 
@@ -6288,8 +6311,8 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "Naam:"
 
@@ -6304,16 +6327,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
@@ -6322,71 +6345,71 @@ msgstr "Nog %d punten te verdelen"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "Haarkleur:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "Haarstijl:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr "Ras:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
@@ -6413,36 +6436,37 @@ msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "Spelen"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Wijzig Login"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr ""
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6453,27 +6477,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "Ongeldig paswoord"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "Geef uw wachtwoord om uw personage te verwijderen"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
@@ -6515,7 +6539,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Ja"
 
@@ -6556,42 +6580,42 @@ msgid "Connect"
 msgstr "Verbinden"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Poort:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Server type:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -6626,7 +6650,7 @@ msgstr ""
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr "Onbekend"
@@ -6661,7 +6685,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6672,93 +6696,93 @@ msgid "Equip"
 msgstr "Uitrusten"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal voorwerpen om te verhandelen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal voorwerpen om neer te leggen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "Selecteer hoeveelheid voorwerpen terug te nemen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "Selecteer hoeveelheid voorwerpen om te splitsen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "Toevoegen om te kopen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "Toevoegen om te verkopen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "Onbekend."
 
@@ -6768,52 +6792,52 @@ msgid "Reset stats"
 msgstr "Herzet statistieken"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "Herzet timer"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -6821,40 +6845,40 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Tijd tot volgend niveau: %s"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "Inloggen"
 
@@ -6877,29 +6901,29 @@ msgstr "Wijzig Server"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "Aanmelden"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "Manuele update server"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr ""
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr ""
 
@@ -6920,14 +6944,14 @@ msgstr "Aan:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr ""
 
@@ -6938,7 +6962,7 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr ""
 
@@ -6962,22 +6986,22 @@ msgid "Get attach"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr ""
 
@@ -6987,24 +7011,29 @@ msgid "Refresh"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr ""
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7146,62 +7175,62 @@ msgid "Switch character"
 msgstr "Van personage wisselen"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Bevestigen:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "Mannelijk"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "Vrouwelijk"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "E-mail:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr ""
 
@@ -7211,48 +7240,53 @@ msgid "Choose Your Server"
 msgstr "Kies Uw Server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Laden"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Kies Uw Server  *** VEILIGE MODUS ***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "Kies Uw Server  *** VEILIGE MODUS ***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 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:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloaden van server lijst...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "Wachten op server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "Download voorbereiden"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "Fout tijdens ophalen server lijst!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "vereist een nieuwere versie"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "vereist v%s"
@@ -7310,72 +7344,72 @@ msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "Persoonlijke winkel"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "Aankondigingen"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "Toon links in aankondigingen"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -7392,46 +7426,46 @@ msgid "Skill points available: %d"
 msgstr "Vaardigheidspunten vrijgegeven: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr "Vaardigheid Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "Vaardigheid %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niv: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr ""
 
@@ -7641,35 +7675,35 @@ msgid "Trade: You"
 msgstr "Handel: Jij"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "U krijgt %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "Veranderen"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "Je geeft:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
 "het venster."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -7744,7 +7778,7 @@ msgid "Change Login"
 msgstr "Wijzig Login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Kies Wereld"
 
@@ -8919,9 +8953,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "Gespreksvenster"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9134,33 +9167,33 @@ msgstr "Verbinding met server beëindigd. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "Kon personage niet verwijderen."
 
@@ -9190,13 +9223,13 @@ msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -9213,7 +9246,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
@@ -9469,108 +9502,108 @@ msgid "You were killed by unknown source."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Je hebt nog geen hoog genoeg level bereikt!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Onvoldoende leven!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Onvoldoende Vaardigheidspunten!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Je hebt geen memo's!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Je kan dat nu niet doen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Je hebt een andere rode edelsteen nodig!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Je hebt een andere blauwe edelsteen nodig!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Je draagt teveel bij je om dit te doen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr ""
 
@@ -9678,8 +9711,53 @@ msgstr "Kon niets stelen..."
 msgid "Poison had no effect..."
 msgstr "Gif had geen effect..."
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "Geef wachtwoord:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+msgid "New pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+msgid "Enter new pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Wijzig Map Tonen Modus"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr "Over"
 
@@ -9699,7 +9777,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr "Bestand is opgeladen"
 
@@ -9707,9 +9785,8 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: clear fonts cache message
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
 msgid "Cache cleared"
-msgstr "Cache gewist"
+msgstr ""
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9727,9 +9804,8 @@ msgstr "Bron afbeeldingen:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "Bron afbeeldingen:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9738,9 +9814,8 @@ msgstr "Omgevingsvariabelen gedumpt"
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1638
-#, fuzzy
 msgid "Config uploaded to:"
-msgstr "Bestand is opgeladen"
+msgstr ""
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1648
@@ -9749,29 +9824,28 @@ msgstr ""
 
 #. TRANSLATORS: upload log chat message
 #: src/progs/manaplus/actions/actions.cpp:1658
-#, fuzzy
 msgid "Log uploaded to:"
-msgstr "Log opgeladen in:"
+msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
 msgstr ""
 
@@ -10024,57 +10098,57 @@ msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "Inloggen"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
@@ -11302,7 +11376,7 @@ msgstr ""
 #: src/utils/stringutils.cpp:960
 #, c-format
 msgid "%d week"
-msgstr "%d weken"
+msgstr ""
 
 #: src/utils/stringutils.cpp:960
 #, c-format
@@ -11313,7 +11387,7 @@ msgstr "%d weken"
 #: src/utils/stringutils.cpp:971
 #, c-format
 msgid "%d day"
-msgstr "%d dagen"
+msgstr ""
 
 #: src/utils/stringutils.cpp:971
 #, c-format
@@ -11324,7 +11398,7 @@ msgstr "%d dagen"
 #: src/utils/stringutils.cpp:981
 #, c-format
 msgid "%d hour"
-msgstr "%d uren"
+msgstr ""
 
 #: src/utils/stringutils.cpp:981
 #, c-format
@@ -11335,7 +11409,7 @@ msgstr "%d uren"
 #: src/utils/stringutils.cpp:991
 #, c-format
 msgid "%d minute"
-msgstr "%d minuten"
+msgstr ""
 
 #: src/utils/stringutils.cpp:991
 #, c-format
@@ -11346,15 +11420,9 @@ msgstr "%d minuten"
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d second"
-msgstr "%d seconden"
+msgstr ""
 
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Bron verweesde afbeeldingen:"
-
-#~ msgid "Uploaded config into:"
-#~ msgstr "Configuratie opgeladen in:"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 0c5be5f1b..8868f12d4 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
 "language/nl_BE/)\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
@@ -42,12 +42,12 @@ msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "I"
 
@@ -59,53 +59,53 @@ msgid "You were killed by %s."
 msgstr "U bent gedood door %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "Inventaris is vol."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "Uw opstapeling is de groot."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr "U kan deze hoeveelheid aan items niet oprapen."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr "U zit aan het maximum van uw opslagruimte."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "Onbekend probleem bij het oprapen van voorwerp."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -114,58 +114,58 @@ msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "ep"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "job"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr "Volg %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imiteer %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr "You see %s"
@@ -406,9 +406,8 @@ msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Deeltjes effecten"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
@@ -800,32 +799,35 @@ msgstr "Weg"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "Oké"
 
@@ -856,14 +858,14 @@ msgstr "(F) vrije camera modus"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Sluiten"
 
@@ -911,7 +913,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "standaard"
 
@@ -1559,9 +1561,9 @@ msgstr "Spreken"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1579,7 +1581,7 @@ msgstr "Kopen"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1649,8 +1651,8 @@ msgstr ""
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "Hernoem"
 
@@ -1674,7 +1676,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1708,6 +1710,7 @@ msgstr "Naam aan het gesprek toevoegen"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1740,10 +1743,11 @@ msgstr "Naam aan het gesprek toevoegen"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "Annuleren"
@@ -1799,7 +1803,7 @@ msgstr "Verwijder"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr ""
 
@@ -1821,7 +1825,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Kleren"
@@ -1853,8 +1857,10 @@ msgstr "Wijzig spreuk"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "Wissen"
 
@@ -2025,9 +2031,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "Opslaan"
 
@@ -2064,8 +2070,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "Afhalen"
 
@@ -2104,10 +2110,10 @@ msgstr "Haal alles op"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Gebruiken"
@@ -2260,7 +2266,7 @@ msgstr ""
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "Standaard"
 
@@ -2296,7 +2302,7 @@ msgstr "Geen rekening mee houden"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Negeer"
 
@@ -2402,8 +2408,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "Neerleggen..."
 
@@ -2418,7 +2424,7 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Neerleggen"
 
@@ -2477,7 +2483,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr "Winkelkar"
@@ -2695,10 +2701,10 @@ msgstr ""
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "Info"
 
@@ -2890,7 +2896,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3203,7 +3209,7 @@ msgstr "Wegpunt"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "Maximum"
@@ -3215,9 +3221,9 @@ msgstr "Maximum"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3231,7 +3237,7 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3258,9 +3264,9 @@ msgstr ""
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "Toevoegen"
@@ -3272,10 +3278,10 @@ msgstr "Toevoegen"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -3284,24 +3290,24 @@ msgstr "Afsluiten"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prijs: %s / Totaal: %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Wijzig"
 
@@ -3386,54 +3392,51 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "Blink naam"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
-#, fuzzy
 msgid "Master name"
-msgstr "GM namen"
+msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "GM namen"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Muziek:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Kaart:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Minikaart:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "Muispunt:"
 
@@ -3444,224 +3447,232 @@ msgstr "Deeltjesaantal:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Aantal kaart-acteurs:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Aantal kaart-acteurs:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Speler positie:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr ""
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d beelden/sec"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d beelden/sec (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr "%d beelden/sec (normale OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr "%d beelden/sec (veilige OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr "%d beelden/sec (SDL2 standaard)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr "Textuuraantal:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Deeltjes-aantal: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Doel:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "Doel identificatie:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "Aanvalsvertraging:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr "Normale slag:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr "Maximum slag:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr "Critieke slag:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Doel niveau:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Doel Party:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Doel Gilde:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Invoer: %d bytes/sec"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Uitvoer: %d bytes/sec"
@@ -3768,46 +3779,58 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-msgid "Guild / party / clan message sound"
-msgstr ""
+#, fuzzy
+msgid "Guild message sound"
+msgstr "Guild leden"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "Groep leden"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+msgid "Clan message sound"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Zet mumble voice chat aan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Download muziek"
 
@@ -4332,27 +4355,27 @@ msgid "Assign"
 msgstr "Toewijzen"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "Maak toewijzing ongedaan"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4361,50 +4384,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "Druk op de knop om het kalibreren te starten"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Kalibreren"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Joystick activeren"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "Stoppen"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -4724,7 +4747,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "Winkel"
 
@@ -4933,14 +4956,14 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "Nee"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr "Performantie"
 
@@ -5272,19 +5295,19 @@ msgstr "Fluisteren toestaan"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Verwijderen"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr "Relaties"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Tijdens negeren:"
 
@@ -5356,8 +5379,8 @@ msgstr "i"
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Thema"
 
@@ -5384,8 +5407,8 @@ msgstr "Thema is gewijzigd"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
@@ -5477,9 +5500,9 @@ msgstr "FPS limiet:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Alt FPS limiet: "
 
@@ -5489,50 +5512,50 @@ msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "Geen"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5540,7 +5563,7 @@ msgstr ""
 "faalde ook!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5548,43 +5571,43 @@ msgstr ""
 "modus faalde ook!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "Verwisselen naar Volledig Scherm"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "Verwisselen naar OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Manuele resolutie (voorbeeld: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "Geef een nieuwe resolutie:           "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "Scherm Resolutie is gewijzigd"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
@@ -5922,7 +5945,7 @@ msgstr "HLP"
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Help"
 
@@ -5977,7 +6000,7 @@ msgstr "UITR"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Uitrusting"
 
@@ -6122,20 +6145,20 @@ msgstr "CONF"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "Toets: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -6146,7 +6169,7 @@ msgid "Withdraw"
 msgstr ""
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr ""
 
@@ -6156,20 +6179,20 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "Aanmaken"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr "Filter:"
 
@@ -6224,15 +6247,15 @@ msgstr "De email adres ingaven zijn niet gelijk."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Fout"
 
@@ -6247,7 +6270,7 @@ msgstr "Wijzig wachtwoord"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "Wachtwoord:"
 
@@ -6288,8 +6311,8 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "Naam:"
 
@@ -6304,16 +6327,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
@@ -6322,71 +6345,71 @@ msgstr "Nog %d punten te verdelen"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "Haarkleur:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "Haarstijl:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr "Ras:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
@@ -6413,36 +6436,37 @@ msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "Spelen"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Wijzig Login"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr ""
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6453,27 +6477,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "Ongeldig paswoord"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "Geef uw wachtwoord om uw personage te verwijderen"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
@@ -6515,7 +6539,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Ja"
 
@@ -6556,42 +6580,42 @@ msgid "Connect"
 msgstr "Verbinden"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Poort:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Server type:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -6626,7 +6650,7 @@ msgstr ""
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr "Onbekend"
@@ -6661,7 +6685,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6672,93 +6696,93 @@ msgid "Equip"
 msgstr "Uitrusten"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal voorwerpen om te verhandelen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal voorwerpen om neer te leggen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "Selecteer hoeveelheid voorwerpen terug te nemen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "Selecteer hoeveelheid voorwerpen om te splitsen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "Toevoegen om te kopen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "Toevoegen om te verkopen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "Onbekend."
 
@@ -6768,52 +6792,52 @@ msgid "Reset stats"
 msgstr "Herzet statistieken"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "Herzet timer"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -6821,40 +6845,40 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Tijd tot volgend niveau: %s"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "Inloggen"
 
@@ -6877,29 +6901,29 @@ msgstr "Wijzig Server"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "Aanmelden"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "Manuele update server"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr ""
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr ""
 
@@ -6920,14 +6944,14 @@ msgstr "Aan:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr ""
 
@@ -6938,7 +6962,7 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr ""
 
@@ -6962,22 +6986,22 @@ msgid "Get attach"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr ""
 
@@ -6987,24 +7011,29 @@ msgid "Refresh"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr ""
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7146,62 +7175,62 @@ msgid "Switch character"
 msgstr "Van personage wisselen"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Bevestigen:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "Mannelijk"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "Vrouwelijk"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "E-mail:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr ""
 
@@ -7211,48 +7240,53 @@ msgid "Choose Your Server"
 msgstr "Kies Uw Server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Laden"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Kies Uw Server  *** VEILIGE MODUS ***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "Kies Uw Server  *** VEILIGE MODUS ***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 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:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloaden van server lijst...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "Wachten op server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "Download voorbereiden"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "Fout tijdens ophalen server lijst!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "vereist een nieuwere versie"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "vereist v%s"
@@ -7310,72 +7344,72 @@ msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "Persoonlijke winkel"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "Aankondigingen"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "Toon links in aankondigingen"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -7392,46 +7426,46 @@ msgid "Skill points available: %d"
 msgstr "Vaardigheidspunten vrijgegeven: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr "Vaardigheid Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "Vaardigheid %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niv: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr ""
 
@@ -7641,35 +7675,35 @@ msgid "Trade: You"
 msgstr "Handel: Jij"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "U krijgt %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "Veranderen"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "Je geeft:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
 "het venster."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -7744,7 +7778,7 @@ msgid "Change Login"
 msgstr "Wijzig Login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Kies Wereld"
 
@@ -8919,9 +8953,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "Gespreksvenster"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9134,33 +9167,33 @@ msgstr "Verbinding met server beëindigd. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "Kon personage niet verwijderen."
 
@@ -9190,13 +9223,13 @@ msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -9213,7 +9246,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
@@ -9469,108 +9502,108 @@ msgid "You were killed by unknown source."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Je hebt nog geen hoog genoeg level bereikt!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Onvoldoende leven!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Onvoldoende Vaardigheidspunten!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Je hebt geen memo's!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Je kan dat nu niet doen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Je hebt een andere rode edelsteen nodig!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Je hebt een andere blauwe edelsteen nodig!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Je draagt teveel bij je om dit te doen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr ""
 
@@ -9678,8 +9711,53 @@ msgstr "Kon niets stelen..."
 msgid "Poison had no effect..."
 msgstr "Gif had geen effect..."
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "Geef wachtwoord:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+msgid "New pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+msgid "Enter new pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Wijzig Map Tonen Modus"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr "Over"
 
@@ -9699,7 +9777,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr "Bestand is opgeladen"
 
@@ -9707,9 +9785,8 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: clear fonts cache message
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
 msgid "Cache cleared"
-msgstr "Cache gewist"
+msgstr ""
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9727,9 +9804,8 @@ msgstr "Bron afbeeldingen:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "Bron afbeeldingen:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9738,9 +9814,8 @@ msgstr "Omgevingsvariabelen gedumpt"
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1638
-#, fuzzy
 msgid "Config uploaded to:"
-msgstr "Bestand is opgeladen"
+msgstr ""
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1648
@@ -9749,29 +9824,28 @@ msgstr ""
 
 #. TRANSLATORS: upload log chat message
 #: src/progs/manaplus/actions/actions.cpp:1658
-#, fuzzy
 msgid "Log uploaded to:"
-msgstr "Log opgeladen in:"
+msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
 msgstr ""
 
@@ -10024,57 +10098,57 @@ msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "Inloggen"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
@@ -11302,7 +11376,7 @@ msgstr ""
 #: src/utils/stringutils.cpp:960
 #, c-format
 msgid "%d week"
-msgstr "%d weken"
+msgstr ""
 
 #: src/utils/stringutils.cpp:960
 #, c-format
@@ -11313,7 +11387,7 @@ msgstr "%d weken"
 #: src/utils/stringutils.cpp:971
 #, c-format
 msgid "%d day"
-msgstr "%d dagen"
+msgstr ""
 
 #: src/utils/stringutils.cpp:971
 #, c-format
@@ -11324,7 +11398,7 @@ msgstr "%d dagen"
 #: src/utils/stringutils.cpp:981
 #, c-format
 msgid "%d hour"
-msgstr "%d uren"
+msgstr ""
 
 #: src/utils/stringutils.cpp:981
 #, c-format
@@ -11335,7 +11409,7 @@ msgstr "%d uren"
 #: src/utils/stringutils.cpp:991
 #, c-format
 msgid "%d minute"
-msgstr "%d minuten"
+msgstr ""
 
 #: src/utils/stringutils.cpp:991
 #, c-format
@@ -11346,15 +11420,9 @@ msgstr "%d minuten"
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d second"
-msgstr "%d seconden"
+msgstr ""
 
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Bron verweesde afbeeldingen:"
-
-#~ msgid "Uploaded config into:"
-#~ msgstr "Configuratie opgeladen in:"
diff --git a/po/pl.po b/po/pl.po
index 99fdc6639..f23d22d23 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
 "pl/)\n"
@@ -28,7 +28,7 @@ msgstr ""
 "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "Widoczne na mapie"
 
@@ -47,12 +47,12 @@ msgid "miss"
 msgstr "Pudło!"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "I"
 
@@ -64,53 +64,53 @@ msgid "You were killed by %s."
 msgstr "Zostałeś zabity przez %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "Próbowano podnieść nieistniejący przedmiot."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "Przedmiot zbyt ciężki."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "Przedmiot za daleko."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "Inwentarz jest pełny."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "Za duży stos."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "Przedmiot należy do kogoś innego."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr "Nie możesz podnieść tej ilości przedmiotów."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr "Twoja sterta przedmiotu osiągnęła maksymalną ilość."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "Nieznany problem podczas próby podniesienia przedmiotu."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -121,58 +121,58 @@ msgstr[3] "Podniosłeś/aś %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "skill"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr "Homun"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr "pż"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr "mana"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr "Podążanie: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "Podążanie anulowane."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitowanie: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "Imitacja anulowana"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr "Widzisz %s"
@@ -408,15 +408,13 @@ msgstr "Błąd sieci"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:831
-#, fuzzy
 msgid "Auto disable Show beings transparency"
-msgstr "Pokaż przezroczystość istot"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Efekty cząsteczkowe"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
@@ -808,32 +806,35 @@ msgstr "AFK"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "Ok"
 
@@ -864,14 +865,14 @@ msgstr "(F) wolny tryb kamery"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Zamknij"
 
@@ -920,7 +921,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "domyślnie"
 
@@ -1370,9 +1371,9 @@ msgstr "Gildia: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "Komentarz: %s"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1568,9 +1569,9 @@ msgstr "Rozmowa"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1588,7 +1589,7 @@ msgstr "Kup"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1658,8 +1659,8 @@ msgstr "Nakarm"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "Zmień nazwę"
 
@@ -1683,7 +1684,7 @@ msgstr "Upuść łup"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1717,6 +1718,7 @@ msgstr "Wpisz do czatu"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1749,10 +1751,11 @@ msgstr "Wpisz do czatu"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "Anuluj"
@@ -1808,7 +1811,7 @@ msgstr "Usuń"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr "Teleport"
 
@@ -1830,7 +1833,7 @@ msgstr "Przywróć kamerę"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Stroje"
@@ -1862,8 +1865,10 @@ msgstr "Edytuj zaklęcie"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "Wyczyść"
 
@@ -2034,9 +2039,9 @@ msgstr "Dodaj wszystko do handlu"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "Podaj"
 
@@ -2073,8 +2078,8 @@ msgstr "Idź do rzemiosła..."
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "Pobierz"
 
@@ -2113,10 +2118,10 @@ msgstr "Pobierz wszystko"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Użyj"
@@ -2269,7 +2274,7 @@ msgstr "Wybierz typ umiejętności rzucania"
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "Domyślne"
 
@@ -2305,7 +2310,7 @@ msgstr "Lekceważ"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Ignoruj"
 
@@ -2411,8 +2416,8 @@ msgstr "Chroń przedmiot"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "Upuść..."
 
@@ -2427,7 +2432,7 @@ msgstr "Upuść wszystko"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Upuść"
 
@@ -2486,7 +2491,7 @@ msgstr "Magazyn"
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr "Wózek"
@@ -2704,10 +2709,10 @@ msgstr "Stwórz niewolnika"
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "Info"
 
@@ -2899,7 +2904,7 @@ msgstr "Czat"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3212,7 +3217,7 @@ msgstr "Drogowskaz"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "Maks."
@@ -3224,9 +3229,9 @@ msgstr "Maks."
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3240,7 +3245,7 @@ msgstr "Poziom: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3267,9 +3272,9 @@ msgstr "Otwórz adres url"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "Dodaj"
@@ -3281,10 +3286,10 @@ msgstr "Dodaj"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Wyjdź"
 
@@ -3293,24 +3298,24 @@ msgstr "Wyjdź"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cena: %s/ Razem: %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Edycja"
 
@@ -3395,54 +3400,51 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "Mruganie nicka"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
-#, fuzzy
 msgid "Master name"
-msgstr "Imiona usuniętych"
+msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "Imiona GM"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Muzyka:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Mapa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Mini-mapa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "Kursor:"
 
@@ -3453,224 +3455,232 @@ msgstr "Licznik cząsteczek:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Licznik aktorów na mapie:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Licznik aktorów na mapie:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Pozycja gracza:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr "Wywołania rysowania:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr "Połączenia z teksturami:"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr "%d FPS (normalny OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr "%d FPS (bezpieczny OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr "%d FPS (nowoczesny OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr "%d FPS (SDL2 domyślne)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr "Licznik tekstur:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Licznik cząsteczek: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Cel:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "ID celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr "Rodzaj celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr "Poziom celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr "Rasa celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr "Drużyna celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr "Gildia celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "Opóźnienie ataku:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr "Najsłabsze uderzenie:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr "Najmocniejsze uderzenie:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr "Uderzenie krytyczne:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Poziom celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Grupa celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Gildia celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Wejście: %d bajtów"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Wyjście: %d bajtów"
@@ -3778,46 +3788,58 @@ msgstr "Dźwięk szeptów"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
 #, fuzzy
-msgid "Guild / party / clan message sound"
-msgstr "Dźwięk wiadomości z gildii/ drużyny"
+msgid "Guild message sound"
+msgstr "Dźwięk globalnej wiadomości"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "Dźwięk wiadomosci o błędzie"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+#, fuzzy
+msgid "Clan message sound"
+msgstr "Dźwięk globalnej wiadomości"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
 msgid "Highlight message sound"
 msgstr "Dźwięk podświetlanej wiadomości"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Global message sound"
 msgstr "Dźwięk globalnej wiadomości"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Error message sound"
 msgstr "Dźwięk wiadomosci o błędzie"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr "Dźwięk powiadomienia o handlu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr "Pokaż okno dźwięku"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr "Ukryj okno dźwięku"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Włącz integrację z Mumble"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Ściągnij muzykę"
 
@@ -4342,27 +4364,27 @@ msgid "Assign"
 msgstr "Przypisz"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "Odznacz"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr "Zresetuj wszystkie klawisze"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr "Wejście"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "Wykryto konflikt klawiszy."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4373,50 +4395,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr "nieznane"
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "Naciśnij przycisk aby rozpocząć kalibrację"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Kalibruj"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr "Wykryj dżojstiki"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Włącz joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr "Używaj joysticka jeśli okno klienta nieaktywne"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "Zatrzymaj"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr "Obracaj drążkiem i nie naciskaj przycisków"
 
@@ -4736,7 +4758,7 @@ msgstr "Aktywuj powiadomienia dotyczące wagi."
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "Sklep"
 
@@ -4945,14 +4967,14 @@ msgstr "Brak modów"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "Nie"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr "Wydajność"
 
@@ -5286,19 +5308,19 @@ msgstr "Zezwól na szepty"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Usuń"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr "Relacje"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Gdy ignorowany:"
 
@@ -5370,8 +5392,8 @@ msgstr "i"
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Skórka"
 
@@ -5398,8 +5420,8 @@ msgstr "Skórka zmieniona"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Uruchom ponownie program, aby mogły zajść zmiany."
 
@@ -5491,9 +5513,9 @@ msgstr "Limit FPS:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Alternatywny limit FPS: "
 
@@ -5503,57 +5525,57 @@ msgid "Detect best mode"
 msgstr "Wykryj najlepszy tryb"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr "Pokaż kursor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Własny kursor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr "Włącz zmianę rozmiaru"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr "Bez ramki"
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Ekran"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "Brak"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Nie udało się zmienić na tryb w oknie, ani przywrócić do poprzedniego stanu!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5561,43 +5583,43 @@ msgstr ""
 "stanu!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "Zmiana na tryb pełnoekranowy"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "Wymagane ponowne uruchomienie aby zastosować zmiany."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "Zmiana na OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "Zastosowanie zmiany na OpenGL wymaga ponownego uruchomienia."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Własna rozdzielczość (np. 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "Wpisz nową rozdzielczość:            "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "Rozdzielczość zmieniona"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Niektóre okna mogą być przesunięte aby dopasować się do niższej "
@@ -5935,7 +5957,7 @@ msgstr "PMC"
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Pomoc"
 
@@ -5990,7 +6012,7 @@ msgstr "EKW"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Ekwipunek"
 
@@ -6135,20 +6157,20 @@ msgstr "SET"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Konfiguracja"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "Klawisz: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -6159,7 +6181,7 @@ msgid "Withdraw"
 msgstr ""
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr ""
 
@@ -6169,20 +6191,20 @@ msgid "Create items"
 msgstr "Utwórz przedmioty"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr "Ilość:"
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "Utwórz"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr "Filtr:"
 
@@ -6237,15 +6259,15 @@ msgstr "Pola adresu e-mail się nie zgadzają."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Błąd"
 
@@ -6260,7 +6282,7 @@ msgstr "Zmień hasło"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "Hasło:"
 
@@ -6301,8 +6323,8 @@ msgstr "Nowa postać"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "Nazwa:"
 
@@ -6317,16 +6339,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Proszę wykorzystać %d punktów"
@@ -6335,71 +6357,71 @@ msgstr "Proszę wykorzystać %d punktów"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "Kolor włosów:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "Fryzura:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr "Rasa:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr "Wygląd:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "Twoje imię musi mieć co najmniej 4 znaki."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "Statystyki postaci w porządku."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "Proszę usunąć %d punktów"
@@ -6426,36 +6448,37 @@ msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "Graj"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Przeloguj się"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr "Konto: %s"
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr ""
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6466,27 +6489,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "Nieprawidłowe hasło"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "Wprowadź hasło aby usunąć postać"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "Wprowadź hasło:"
 
@@ -6528,7 +6551,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Tak"
 
@@ -6569,42 +6592,42 @@ msgid "Connect"
 msgstr "Połącz"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr "Użyj tego samego IP."
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr "Adres:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Typ serwera:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr "Opis:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr "Adres strony z graczami online:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr "Wymagany zarówno adres jak i port serwera."
 
@@ -6639,7 +6662,7 @@ msgstr ""
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr "nieznane"
@@ -6674,7 +6697,7 @@ msgstr "Insert"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6685,93 +6708,93 @@ msgid "Equip"
 msgstr "Załóż"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "wszystkie"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "Wybierz ilość przedmiotów do handlu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "Wybierz ilość przedmiotów do upuszczenia."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "Podaj ilość rzeczy do przechowania."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "Wybierz ilość przedmiotów do pobrania."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "Wybierz ilość przedmiotów do podziału."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "Dodaj to sklepu (sprzedaj)."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "Dodaj do sklepu (kupuj)."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "Nieznany obiekt."
 
@@ -6781,44 +6804,44 @@ msgid "Reset stats"
 msgstr "Zresetuj statystyki"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "Zresetuj zegar"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Moby: %s, całk. exp: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Śr. Exp: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Przeciętna il mobów do nast.: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Mob/Min: %s, Exp/Min: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
@@ -6827,8 +6850,8 @@ msgstr[1] "Szybkość exp na %d min: %s"
 msgstr[2] "Szybkość exp na %d min: %s"
 msgstr[3] "Szybkość exp na %d min: %s"
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -6838,40 +6861,40 @@ msgstr[2] "Czas do nast. poziomu z %d min: %s"
 msgstr[3] "Czas do nast. poziomu z %d min: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr "Ostatni exp:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Poziom: %d w %f%%"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Czas do nast. poziomu: %s"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "Zaloguj się"
 
@@ -6894,29 +6917,29 @@ msgstr "Zmień serwer"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "Rejestruj"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "Zaawansowane ustawienia aktualizacji"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "Serwer:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr "Otwórz stronę z rejestracją"
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr ""
 
@@ -6937,14 +6960,14 @@ msgstr "Do:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr ""
 
@@ -6955,7 +6978,7 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr ""
 
@@ -6979,22 +7002,22 @@ msgid "Get attach"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr ""
 
@@ -7004,24 +7027,29 @@ msgid "Refresh"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr ""
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7163,62 +7191,62 @@ msgid "Switch character"
 msgstr "Zmień postać"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Potwierdź:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "Mężczyzna"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "Kobieta"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "E-mail:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Nazwa użytkownika musi mieć conajmniej %u znaków."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Nazwa użytkownika musi być krótsza niż %u znaków."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "Hasło musi mieć conajmniej %u znaków."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Hasło musi mieć mniej znaków niż %u."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr "Nieprawidłowy adres e-mail."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr ""
 
@@ -7228,48 +7256,53 @@ msgid "Choose Your Server"
 msgstr "Wybierz serwer"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Załaduj"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Wybierz serwer  ***TRYB BEZPIECZEŃSTWA***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "Wybierz serwer  ***TRYB BEZPIECZEŃSTWA***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 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:427
+#: src/gui/windows/serverdialog.cpp:435
 #, 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:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "Czekanie na serwer..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "Przygotowanie ściągania"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "Błąd przy uzyskiwaniu listy serwerów!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "wymaga nowszej wersji"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "wymaga v%s"
@@ -7327,72 +7360,72 @@ msgid "Reset Windows"
 msgstr "Zresetuj okna"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "Własny sklep"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "Ogłoś"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "Pokazuj linki w ogłoszeniach"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "Prośba o handel"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -7409,46 +7442,46 @@ msgid "Skill points available: %d"
 msgstr "Dostępne punkty umiejętności: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr "Zestaw umiejętności %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "Umiejętność %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Poziom: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr ""
 
@@ -7658,35 +7691,35 @@ msgid "Trade: You"
 msgstr "Handel: Ty"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "Otrzymujesz %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "Zmień"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "Dajesz:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "Nie masz wystarczającej ilości pieniędzy."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 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 "
 "rodzaj przedmiotu w okienku."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -7761,7 +7794,7 @@ msgid "Change Login"
 msgstr "Przeloguj się"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Wybierz świat"
 
@@ -8936,9 +8969,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "Okno Czatu"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9149,33 +9181,33 @@ msgstr "Połączenie z serwerem przerwane. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "Nie udało się skasować postaci."
 
@@ -9205,13 +9237,13 @@ msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -9228,7 +9260,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "Rozłączono z serwerem!"
 
@@ -9484,108 +9516,108 @@ msgid "You were killed by unknown source."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Nie masz jeszcze wymaganego poziomu!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Zbyt niskie HP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Zbyt niska mana!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Nie masz notek!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Nie możesz tego teraz zrobić!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Chyba brak Ci kasy... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Nie możesz użyć tej umiejętności przy tym rodzaju broni!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Potrzebujesz innego czerwonego klejnotu!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Potrzebujesz innego niebieskiego klejnotu!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Niesiesz za duży ciężar by to zrobić!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr ""
 
@@ -9693,8 +9725,53 @@ msgstr "Nie udało się niczego ukraść..."
 msgid "Poison had no effect..."
 msgstr "Trucizna nie zadziałała..."
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "Wprowadź hasło:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+msgid "New pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+msgid "Enter new pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Zmień ogłoszenie"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr "O..."
 
@@ -9714,7 +9791,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr "Plik wysłano"
 
@@ -9722,9 +9799,8 @@ msgstr "Plik wysłano"
 #. TRANSLATORS: clear fonts cache message
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
 msgid "Cache cleared"
-msgstr "Cache opróżnione"
+msgstr ""
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9742,9 +9818,8 @@ msgstr "Obrazy źródłowe:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "Obrazy źródłowe:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9753,46 +9828,40 @@ msgstr "Zmienne środowiskowe zostały zrzucone"
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1638
-#, fuzzy
 msgid "Config uploaded to:"
-msgstr "Plik wysłano"
+msgstr ""
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1648
-#, fuzzy
 msgid "Server config Uploaded to:"
-msgstr "Wartość konfiguracji serwera: %s"
+msgstr ""
 
 #. TRANSLATORS: upload log chat message
 #: src/progs/manaplus/actions/actions.cpp:1658
-#, fuzzy
 msgid "Log uploaded to:"
-msgstr "Załaduj log do:"
+msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
-msgstr "Ostatnio widziany wyłączony. Aktywuj gracza / zbierz gracza id i log."
+msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
-msgstr "Nie widziałeś tego nicku."
+msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr "Ostatnio widziany przez %s: %s"
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
-msgstr "Nie widziałeś tego nicku."
+msgstr ""
 
 #. TRANSLATORS: whisper send
 #: src/progs/manaplus/actions/chat.cpp:279
@@ -10046,57 +10115,57 @@ msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "Logowanie"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "Wchodzenie do świata gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "Sprawdzanie postaci"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "Łączenie się z serwerem gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "Zmiana serwera"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "Sprawdzanie szczegółów rejestracji"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Zmiana hasła"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "Hasło zmienione z powodzeniem!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "Zmiana adresu e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "Adres e-mail zmieniony z powodzeniem!"
 
@@ -11326,7 +11395,7 @@ msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 #: src/utils/stringutils.cpp:960
 #, c-format
 msgid "%d week"
-msgstr "%d tygodni/e"
+msgstr ""
 
 #: src/utils/stringutils.cpp:960
 #, c-format
@@ -11337,7 +11406,7 @@ msgstr "%d tygodni/e"
 #: src/utils/stringutils.cpp:971
 #, c-format
 msgid "%d day"
-msgstr "%d dni"
+msgstr ""
 
 #: src/utils/stringutils.cpp:971
 #, c-format
@@ -11348,7 +11417,7 @@ msgstr "%d dni"
 #: src/utils/stringutils.cpp:981
 #, c-format
 msgid "%d hour"
-msgstr "%d godzin/y"
+msgstr ""
 
 #: src/utils/stringutils.cpp:981
 #, c-format
@@ -11359,7 +11428,7 @@ msgstr "%d godzin/y"
 #: src/utils/stringutils.cpp:991
 #, c-format
 msgid "%d minute"
-msgstr "%d minut/y"
+msgstr ""
 
 #: src/utils/stringutils.cpp:991
 #, c-format
@@ -11370,18 +11439,9 @@ msgstr "%d minut/y"
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d second"
-msgstr "%d sekund/y"
+msgstr ""
 
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund/y"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Osierocone obrazy źródłowe:"
-
-#~ msgid "Uploaded config into:"
-#~ msgstr "Załaduj ustawienia do:"
-
-#~ msgid "Uploaded server config into:"
-#~ msgstr "Załaduj ustawienia serwera do:"
diff --git a/po/pt.po b/po/pt.po
index ddaacc67c..a4fef3509 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"Last-Translator: João Pereira <joaocrpereira@hotmail.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
 "pt/)\n"
 "Language: pt\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
@@ -44,12 +44,12 @@ msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "l"
 
@@ -61,53 +61,53 @@ msgid "You were killed by %s."
 msgstr "Foste morto(a) por %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "Item está muito longe."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -116,58 +116,58 @@ msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "exp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "Profissão"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguir: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitando: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr "Você vê %s"
@@ -408,15 +408,13 @@ msgstr "Erro de conexão"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:831
-#, fuzzy
 msgid "Auto disable Show beings transparency"
-msgstr "Mostrar transparencia"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Efeitos de partícula"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
@@ -808,32 +806,35 @@ msgstr "Indisponivel"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "OK"
 
@@ -864,14 +865,14 @@ msgstr "(F) Modo de jogo câmera livre"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Fechar"
 
@@ -921,7 +922,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "padrão"
 
@@ -1371,9 +1372,9 @@ msgstr "Guilda: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "Comentário: %s"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1569,9 +1570,9 @@ msgstr "Falar"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1589,7 +1590,7 @@ msgstr "Comprar"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1659,8 +1660,8 @@ msgstr ""
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "Renomear"
 
@@ -1684,7 +1685,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1718,6 +1719,7 @@ msgstr "Adicionar nome ao chat"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1750,10 +1752,11 @@ msgstr "Adicionar nome ao chat"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "Cancelar"
@@ -1809,7 +1812,7 @@ msgstr "A Remover"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr "Urdidura"
 
@@ -1831,7 +1834,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Roupas"
@@ -1863,8 +1866,10 @@ msgstr "Editar Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "Limpar"
 
@@ -2035,9 +2040,9 @@ msgstr "Add. todos na negociação"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "Armazenar"
 
@@ -2074,8 +2079,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "Retirar"
 
@@ -2114,10 +2119,10 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Usar"
@@ -2270,7 +2275,7 @@ msgstr ""
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "Padrão"
 
@@ -2306,7 +2311,7 @@ msgstr "Ser inimigo(a)"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -2412,8 +2417,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "Descartar..."
 
@@ -2428,7 +2433,7 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Descartar"
 
@@ -2487,7 +2492,7 @@ msgstr "Armazém"
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr "Carrinho"
@@ -2705,10 +2710,10 @@ msgstr ""
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "Informações"
 
@@ -2900,7 +2905,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3213,7 +3218,7 @@ msgstr "Ponto de estrada"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "Máximo"
@@ -3225,9 +3230,9 @@ msgstr "Máximo"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3241,7 +3246,7 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3268,9 +3273,9 @@ msgstr "Abrir URL"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "Adicionar"
@@ -3282,10 +3287,10 @@ msgstr "Adicionar"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Sair"
 
@@ -3294,24 +3299,24 @@ msgstr "Sair"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preço: %s / Total: %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Editar"
 
@@ -3396,54 +3401,51 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "Piscar nome"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
-#, fuzzy
 msgid "Master name"
-msgstr "Nome de Apagados"
+msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "Nomes dos GMs"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Música:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Mapa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Minimapa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "Cursor:"
 
@@ -3454,224 +3456,232 @@ msgstr "Contador de Particulas:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Jogadores no mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Jogadores no mapa:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Sua posição:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr "Marcar caminho:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr "Conjunto de texturas:"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr "Contador de Texturas:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Contagem de partículas: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "ID do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr "Tipo de alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr "Level do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr "Corrida do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr "Grupo do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr "Guilda de alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "Atraso de Ataque:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr "Dano Minimo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr "Dano Máximo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr "Dano Crítico:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Nível do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Grupo do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Guilda do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Entrada: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Saída: %d bytes/s"
@@ -3779,46 +3789,58 @@ msgstr "Som de mensagens de susurros"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
 #, fuzzy
-msgid "Guild / party / clan message sound"
-msgstr "Som de mensagem de Guilda / Grupo"
+msgid "Guild message sound"
+msgstr "Som de mensagens globais"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "Som de mensagens de erro"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+#, fuzzy
+msgid "Clan message sound"
+msgstr "Som de mensagens globais"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
 msgid "Highlight message sound"
 msgstr "Destacar som de mensagens"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Global message sound"
 msgstr "Som de mensagens globais"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Error message sound"
 msgstr "Som de mensagens de erro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr "Som de pedidos de troca"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr "Mostrar som de janela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr "Ocultar som de janela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Habilitar o chat de voz mumble \"requer aplicativo mumble\""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Baixar músicas"
 
@@ -4343,27 +4365,27 @@ msgid "Assign"
 msgstr "Atribuir"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "Retirar"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr "Resetar todas teclas"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr "Entrada"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4374,50 +4396,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr "desconhecido"
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "Aperte o botão para começar a calibrar"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Calibrar"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr "Detectar joysticks"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Habilitar joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr "Usar joystick se a janela do jogo estiver inativa"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "Parar"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr "Gire o bastão sem precionar botões"
 
@@ -4737,7 +4759,7 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "Loja"
 
@@ -4946,14 +4968,14 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "Não"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr ""
 
@@ -5285,19 +5307,19 @@ msgstr "Permitir mensagens particulares"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Excluir"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr "Relações"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
@@ -5369,8 +5391,8 @@ msgstr "i"
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Tema"
 
@@ -5397,8 +5419,8 @@ msgstr "Tema alterado"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -5490,9 +5512,9 @@ msgstr "Limite de FPS:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Limite de FPS alternativo: "
 
@@ -5502,57 +5524,57 @@ msgid "Detect best mode"
 msgstr "Detectar melhor modo"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr "Mostrar cursor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr "Habilitar redirecionamento de janela"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr "Sem moldura de janela"
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "Nenhum"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5560,43 +5582,43 @@ msgstr ""
 "anterior!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
@@ -5933,7 +5955,7 @@ msgstr "AJD"
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Ajuda"
 
@@ -5988,7 +6010,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Equipamento"
 
@@ -6133,20 +6155,20 @@ msgstr "CON"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -6157,7 +6179,7 @@ msgid "Withdraw"
 msgstr ""
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr ""
 
@@ -6167,20 +6189,20 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr "Quantidade:"
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "Criar"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr "Filtro:"
 
@@ -6235,15 +6257,15 @@ msgstr "Os emails informados não são iguais."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Erro"
 
@@ -6258,7 +6280,7 @@ msgstr "Alterar senha"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "Senha:"
 
@@ -6299,8 +6321,8 @@ msgstr "Novo Pesonagem"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "Nome:"
 
@@ -6315,16 +6337,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
@@ -6333,71 +6355,71 @@ msgstr "Por favor distribua %d pontos"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "Cor do Cabelo:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr "Corrida:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr "A"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -6424,36 +6446,37 @@ msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "Jogar"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Trocar Login"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr "Conta %s"
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr ""
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6464,27 +6487,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "Senha Incorreta"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "Entre com a Senha para Deletar o usuario"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "Entre com a senha:"
 
@@ -6526,7 +6549,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Sim"
 
@@ -6567,42 +6590,42 @@ msgid "Connect"
 msgstr "Conectar"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr "Endereço:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Porta:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr "Descrição:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr "URL de lista onlines:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr "Por favor coloque ao menos uma porta de servidor."
 
@@ -6637,7 +6660,7 @@ msgstr ""
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr ""
@@ -6672,7 +6695,7 @@ msgstr "Inserir"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6683,93 +6706,93 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "Tudo"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "Selecionar quantidade de itens para negociar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "Selecionar quantidade de itens para descartar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "Escolha a quantidade de itens para armazenar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "Escolha a quantidade de itens para retirar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "Selecionar quantidade de itens para dividir."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "Adicionar na loja de compra."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "Adicionar na loja de venda."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "Desconhecido."
 
@@ -6779,52 +6802,52 @@ msgid "Reset stats"
 msgstr "Resetar Status"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "Resetar tempo"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Mortes: %s, total exp: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Média Exp: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Nu. de mob para próximo level: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Mortes/Min: %s Exp/Min: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Velocidade de exp por %d min: %s"
 msgstr[1] "Velocidade de exp por %d mins: %s"
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -6832,40 +6855,40 @@ msgstr[0] "Tempo para próximo nível por %d min: %s"
 msgstr[1] "Tempo para próximo nível por %d mins: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr "Exp de última morte:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Nível: %d em %f%%"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Tempo para próximo nível: %s"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "Login"
 
@@ -6888,29 +6911,29 @@ msgstr "Trocar servidor"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "Registrar"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "Atualizações customizadas"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "Servidor:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr "Abrir URL de cadastro"
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr ""
 
@@ -6931,14 +6954,14 @@ msgstr "Para:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr ""
 
@@ -6949,7 +6972,7 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr ""
 
@@ -6973,22 +6996,22 @@ msgid "Get attach"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr ""
 
@@ -6998,24 +7021,29 @@ msgid "Refresh"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr ""
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7157,62 +7185,62 @@ msgid "Switch character"
 msgstr "Trocar de Personagem"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Confirmar:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "Homem"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "Mulher"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "O Usuários deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "O Usuário  precisa ser menor que %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "A nova senha deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "A nova senha  precisa ser menor que %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr "Email incorreto."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr ""
 
@@ -7222,48 +7250,53 @@ msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Carregar"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "Escolha seu servidor    *** MODO SEGURO ***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 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:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "Preparando download"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -7321,72 +7354,72 @@ msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "Loja pessoal"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "Anúncio"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "Mostrar links em anúncio"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -7403,46 +7436,46 @@ msgid "Skill points available: %d"
 msgstr "Pontos de habilidade disponíveis: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr ""
 
@@ -7652,34 +7685,34 @@ msgid "Trade: You"
 msgstr "Negócio: você"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "Você pegou %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "Mudar"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "Você dá:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 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."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -7754,7 +7787,7 @@ msgid "Change Login"
 msgstr "Trocar Login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Escolher Mundo"
 
@@ -8929,9 +8962,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "Janela de chat"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9144,33 +9176,33 @@ msgstr "Conexão com o servidor interrompida. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
@@ -9200,13 +9232,13 @@ msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -9223,7 +9255,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado(a) do servidor!"
 
@@ -9479,108 +9511,108 @@ msgid "You were killed by unknown source."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Você ainda não tem o nivel necessário!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Você não tem nenhuma nota armazenada!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Você não pode fazer isso agora!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que você precisa de mais dinheiro... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Você precisa de outra gema vermelha!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Você precisa de outra jóia azul!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Você está com muita carga para fazer isso!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr ""
 
@@ -9688,8 +9720,53 @@ msgstr "Não foi possível roubar nada..."
 msgid "Poison had no effect..."
 msgstr "Veneno não surtiu efeito..."
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "Entre com a senha:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+msgid "New pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+msgid "Enter new pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Mudar o modo de visualização de mapas"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr ""
 
@@ -9709,7 +9786,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr ""
 
@@ -9717,9 +9794,8 @@ msgstr ""
 #. TRANSLATORS: clear fonts cache message
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
 msgid "Cache cleared"
-msgstr "Cache limpo"
+msgstr ""
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9737,9 +9813,8 @@ msgstr "Recursos de imagens:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "Recursos de imagens:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9762,24 +9837,24 @@ msgid "Log uploaded to:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
 msgstr ""
 
@@ -10032,57 +10107,57 @@ msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "Efetuando login"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
@@ -11310,7 +11385,7 @@ msgstr ""
 #: src/utils/stringutils.cpp:960
 #, c-format
 msgid "%d week"
-msgstr "%d semanas"
+msgstr ""
 
 #: src/utils/stringutils.cpp:960
 #, c-format
@@ -11321,7 +11396,7 @@ msgstr "%d semanas"
 #: src/utils/stringutils.cpp:971
 #, c-format
 msgid "%d day"
-msgstr "%d dias"
+msgstr "%d dia"
 
 #: src/utils/stringutils.cpp:971
 #, c-format
@@ -11332,7 +11407,7 @@ msgstr "%d dias"
 #: src/utils/stringutils.cpp:981
 #, c-format
 msgid "%d hour"
-msgstr "%d horas"
+msgstr "%d hora"
 
 #: src/utils/stringutils.cpp:981
 #, c-format
@@ -11343,7 +11418,7 @@ msgstr "%d horas"
 #: src/utils/stringutils.cpp:991
 #, c-format
 msgid "%d minute"
-msgstr "%d minutos"
+msgstr "%d minuto"
 
 #: src/utils/stringutils.cpp:991
 #, c-format
@@ -11354,12 +11429,9 @@ msgstr "%d minutos"
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d second"
-msgstr "%d segundos"
+msgstr ""
 
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Recursos de imagens orfãos:"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 10bed23ff..1457f89a0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@
 # alastrim <alasmirt@gmail.com>, 2011,2013
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Bruno Nunes <bruno@dukkha.com.br>, 2013
-# Diogo RBG <diogorbg@gmail.com>, 2016
+# Diogo RBG <diogorbg@gmail.com>, 2016,2018
 # Fernanda Monteiro <crie.fernanda@gmail.com>, 2014-2015
 # freya <freya.df@gmail.com>, 2013
 # freya <freya.df@gmail.com>, 2011-2012
@@ -27,9 +27,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-06 00:15+0000\n"
+"Last-Translator: Diogo RBG <diogorbg@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
 "language/pt_BR/)\n"
 "Language: pt_BR\n"
@@ -39,7 +39,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "Mapa visivel"
 
@@ -58,12 +58,12 @@ msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "I"
 
@@ -75,53 +75,53 @@ msgid "You were killed by %s."
 msgstr "Você foi morto(a) por %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "Item está muito longe."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr "Você não pode pegar essa quantia de itens."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr "Sua pilha de itens possui a quantidade máxima."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -130,58 +130,58 @@ msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "exp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "profissão"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr "Homúnculo"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr "hp"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr "mana"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguindo: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitando: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr "Você vê %s"
@@ -421,21 +421,18 @@ msgstr "Erro de conexão"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:831
-#, fuzzy
 msgid "Auto disable Show beings transparency"
-msgstr "Mostrar transparencia"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Efeitos de partícula"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
-#, fuzzy
 msgid "Auto enable opacity cache"
-msgstr "Ativar a opacidade do gui"
+msgstr ""
 
 #. TRANSLATORS: move type in status bar
 #: src/gamemodifiers.cpp:149
@@ -822,32 +819,35 @@ msgstr "Indisponivel"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "OK"
 
@@ -878,14 +878,14 @@ msgstr "(F) Modo de jogo câmera livre"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Fechar"
 
@@ -935,7 +935,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "padrão"
 
@@ -1385,9 +1385,9 @@ msgstr "Guilda: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "Comentário: %s"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1470,7 +1470,7 @@ msgstr "Cartões: "
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:413
 msgid "Options: "
-msgstr ""
+msgstr "Opções:"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
@@ -1583,9 +1583,9 @@ msgstr "Falar"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1603,7 +1603,7 @@ msgstr "Comprar"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1673,8 +1673,8 @@ msgstr "Alimentar"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "Renomear"
 
@@ -1698,7 +1698,7 @@ msgstr "Descartar saque"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1732,6 +1732,7 @@ msgstr "Adicionar nome ao chat"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1764,10 +1765,11 @@ msgstr "Adicionar nome ao chat"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "Cancelar"
@@ -1823,7 +1825,7 @@ msgstr "Remover"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr "Urdidura"
 
@@ -1845,7 +1847,7 @@ msgstr "Restaurar câmera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Roupas"
@@ -1877,8 +1879,10 @@ msgstr "Editar feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "Limpar"
 
@@ -2049,9 +2053,9 @@ msgstr "Adicionar todos na negociação"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "Armazenar"
 
@@ -2088,8 +2092,8 @@ msgstr "Mover para ofício..."
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "Retirar"
 
@@ -2128,10 +2132,10 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Usar"
@@ -2284,7 +2288,7 @@ msgstr "Selecione tipo de invocação de habilidade"
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "Padrão"
 
@@ -2320,7 +2324,7 @@ msgstr "Ser inimigo(a)"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -2426,8 +2430,8 @@ msgstr "Proteger item"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "Descartar..."
 
@@ -2442,7 +2446,7 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Descartar"
 
@@ -2501,7 +2505,7 @@ msgstr "Armazém"
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr "Carrinho"
@@ -2719,10 +2723,10 @@ msgstr "Gerar escravo"
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "Informações"
 
@@ -2914,7 +2918,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3227,7 +3231,7 @@ msgstr "Ponto de estrada"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "Máximo"
@@ -3239,9 +3243,9 @@ msgstr "Máximo"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3255,7 +3259,7 @@ msgstr "Nível: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3282,9 +3286,9 @@ msgstr "Abrir URL"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "Adicionar"
@@ -3296,10 +3300,10 @@ msgstr "Adicionar"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Sair"
 
@@ -3308,24 +3312,24 @@ msgstr "Sair"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preço: %s / Total: %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Editar"
 
@@ -3410,54 +3414,51 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "Piscar nome"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
-#, fuzzy
 msgid "Master name"
-msgstr "Nome do mapa:"
+msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "Nome do mapa:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Música:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Mapa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr "Nome do mapa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Minimapa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "Cursor:"
 
@@ -3468,224 +3469,232 @@ msgstr "Contador de particulas:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Jogadores no mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Jogadores no mapa:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Sua posição:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr "Chamadas de desenho:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr "União de Texturas:"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr "%d FPS (OpenGL normal)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr "%d FPS (OpenGL seguro)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr "%d FPS (OpenGL ES móvel)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr "%d FPS (OpenGL ES 2 móvel)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr "%d FPS (OpenGL Moderno)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr "%d FPS (SDL2 padrão)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr "Contador de texturas:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Contagem de partículas: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "ID do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr "Tipo de alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr "Level do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr "Raça do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr "Grupo do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr "Guilda do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "Atarso de ataque:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr "Hit minimo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr "Hit máximo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr "Acerto crítico:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr "Carma:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr "Etiqueta:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr "Efeitos:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Nível do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Grupo do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Guilda do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Entrada: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Saída: %d bytes/s"
@@ -3793,46 +3802,58 @@ msgstr "Som de mensagem de susurros"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
 #, fuzzy
-msgid "Guild / party / clan message sound"
-msgstr "Som de mensagem Guilda / Grupo"
+msgid "Guild message sound"
+msgstr "Som de anuncios globais"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "Som de mensagem de erro"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+#, fuzzy
+msgid "Clan message sound"
+msgstr "Som de anuncios globais"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
 msgid "Highlight message sound"
 msgstr "Destacar som de mensagem"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Global message sound"
 msgstr "Som de anuncios globais"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Error message sound"
 msgstr "Som de mensagem de erro"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr "Som de convites de negociação"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr "Mostrar som de janela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr "Ocultar som de janela"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Habilitar o chat de voz mumble (requer aplicativo mumble)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Baixar músicas"
 
@@ -4489,27 +4510,27 @@ msgid "Assign"
 msgstr "Atribuir"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "Retirar"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr "Resetar todas teclas"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr "Entrada"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4520,50 +4541,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr "desconhecido"
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "Aperte o botão para começar a calibrar"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Calibrar"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr "Detectar joysticks"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Habilitar joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr "Usar joystick se a janela do jogo estiver inativa"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "Parar"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr "Girar o bastão e não pressionar os botões"
 
@@ -4883,7 +4904,7 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "Loja"
 
@@ -5092,14 +5113,14 @@ msgstr "Sem mods disponíveis"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "Não"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr "Desempenho"
 
@@ -5435,19 +5456,19 @@ msgstr "Permitir mensagens particulares"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Excluir"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr "Relações"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
@@ -5519,8 +5540,8 @@ msgstr "i"
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Tema"
 
@@ -5547,8 +5568,8 @@ msgstr "Tema alterado"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -5640,9 +5661,9 @@ msgstr "Limite de FPS:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Limite de FPS alternativo: "
 
@@ -5652,57 +5673,57 @@ msgid "Detect best mode"
 msgstr "Detectar melhor modo"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr "Mostrar Ponteiro"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr "Habilitar redimensionamento"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr "Sem moldura de janela"
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "Nenhum"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5710,43 +5731,43 @@ msgstr ""
 "anterior!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução             "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
@@ -6083,7 +6104,7 @@ msgstr "AJU"
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Ajuda"
 
@@ -6138,7 +6159,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Equipamento"
 
@@ -6250,9 +6271,8 @@ msgstr "Correio"
 
 #. TRANSLATORS: short button name for clan window.
 #: src/gui/windowmenu.cpp:190
-#, fuzzy
 msgid "CL"
-msgstr "C"
+msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
 #: src/gui/windowmenu.cpp:195
@@ -6284,20 +6304,20 @@ msgstr "CON"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr "Dinheiro no banco: %s"
@@ -6308,7 +6328,7 @@ msgid "Withdraw"
 msgstr "Sacar"
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr "Depositar"
 
@@ -6318,20 +6338,20 @@ msgid "Create items"
 msgstr "Criar itens"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr "Quantidade:"
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "Criar"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr "Filtro:"
 
@@ -6386,15 +6406,15 @@ msgstr "Os emails informados não são iguais."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Erro"
 
@@ -6409,7 +6429,7 @@ msgstr "Alterar senha"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "Senha:"
 
@@ -6450,8 +6470,8 @@ msgstr "Novo Personagem"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "Nome:"
 
@@ -6466,16 +6486,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
@@ -6484,71 +6504,71 @@ msgstr "Por favor distribua %d pontos"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "Cor do Cabelo:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr "Corrida:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr "Aparência:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr "A"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr "M"
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr "U"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -6575,36 +6595,37 @@ msgid "Switch"
 msgstr "Trocar"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr "Senha"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "Jogar"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Trocar Login"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr "Conta %s"
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr "Por favor insira novo pincode"
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr "Por favor insira o novo nome"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6615,27 +6636,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "Senha incorreta"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr "Insira seu e-mail para deletar personagem"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr "Insira e-mail:"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "Entre com a senha para apagar o personagem"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "Entre com a senha:"
 
@@ -6677,7 +6698,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Sim"
 
@@ -6718,42 +6739,42 @@ msgid "Connect"
 msgstr "Conectar"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr "Usar mesmo IP"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr "Endereço:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Porta:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr "Descrição:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr "URL de lista online:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr "Versão do pacote:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr "Por favor, pelo menos um dos dois tipos de portas de servidor."
 
@@ -6788,7 +6809,7 @@ msgstr ""
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr "Desconhecido"
@@ -6823,7 +6844,7 @@ msgstr "Inserir"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6834,93 +6855,93 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr "Insira o cartão requisitado"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "insira %s em %s?"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "Tudo"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "Selecionar quantidade de itens para negociar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "Selecionar quantidade de itens para descartar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "Escolha a quantidade de itens para armazenar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr "Selecione quantidade de itens para enviar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr "Selecionar quantidade de itens para criar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr "Selecione quantidade de itens para adicionar ao carrinho."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "Escolha a quantidade de itens para retirar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr "Selecione quantidade de itens para retornar do carrinho."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "Selecionar quantidade de itens para dividir."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "Adicionar na loja de compra."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "Adicionar na loja de venda."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "Desconhecido."
 
@@ -6930,52 +6951,52 @@ msgid "Reset stats"
 msgstr "Resetar status"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "Resetar tempo"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Mortes: %s Total exp: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Média Exp: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Média de mob para próximo level: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Mortes/Min: %s Exp/Min: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Velocidade de exp por %d min: %s"
 msgstr[1] "Velocidade de exp por %d mins: %s"
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -6983,40 +7004,40 @@ msgstr[0] "Tempo para o próximo nível %d min: %s"
 msgstr[1] "Tempo para o próximo nível %d mins: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr "Ultima exp por morte:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Nível: %d em %f%%"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Tempo para próximo nível: %s"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "Login"
 
@@ -7039,29 +7060,29 @@ msgstr "Trocar servidor"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "Registrar"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "Atualizações customizadas"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "Servidor:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr "Abrir endereço de registro"
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr "atualizações padrão"
 
@@ -7082,14 +7103,14 @@ msgstr "Para:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr "Assunto:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr "Dinheiro:"
 
@@ -7100,7 +7121,7 @@ msgstr "Item:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr "Mensagem:"
 
@@ -7124,22 +7145,22 @@ msgid "Get attach"
 msgstr "Se apegue"
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr "Responder"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr "Hora:"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr "De:"
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr ""
 
@@ -7149,24 +7170,29 @@ msgid "Refresh"
 msgstr "Atualizar"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr "Novo"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr ""
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr "Retornar"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr "Abrir"
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7308,62 +7334,62 @@ msgid "Switch character"
 msgstr "Trocar de Personagem"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Confirmar:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "Homem"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "Mulher"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "O nome do usuário precisa ter pelo menos %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "O nome do usuário deve ser menor que %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "A senha deve ter pelo menos %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "A senha deve ser menor que %u caracteres."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr "Email incorreto."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr "E-mail muito longo."
 
@@ -7373,48 +7399,53 @@ msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Carregar"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "Escolha seu servidor    *** MODO SEGURO ***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 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:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "Preparando download"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -7472,72 +7503,72 @@ msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "Loja pessoal"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr "Publicar"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "Anúncio"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "Mostrar links em anúncio"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr "Por favor digite o nome da nova loja"
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr "Despublicar"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr "erro: jogador ocupado"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr "erro: Não se pode vender este item"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr "erro: Não se pode comprar este item"
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr "%s deseja comprar %s você aceita?"
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr "%s deseja vender %s você aceita?"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Loja Pessoal - %s"
@@ -7554,46 +7585,46 @@ msgid "Skill points available: %d"
 msgstr "Pontos de habilidade disponíveis: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr "habilidade %u"
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Habilidade falhou: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Adicione um texto a habilidade %s"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr "Texto: "
 
@@ -7803,34 +7834,34 @@ msgid "Trade: You"
 msgstr "Negociação: você"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "Você pegou %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "Trocar"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "Você dá:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 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."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr "Falha ao adicionar item. Você não negociar itens equipados."
 
@@ -7905,7 +7936,7 @@ msgid "Change Login"
 msgstr "Trocar Login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Escolher Mundo"
 
@@ -9080,9 +9111,8 @@ msgstr "Janela de configurações rápidas"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "Janela Carrinho"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9298,33 +9328,33 @@ msgstr "Conexão com o servidor interrompida. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr "Erro ao renomear personagem."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr "Personagem renomeado."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr "Não é permitido renomear."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr "Novo nome não definido."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr "Personagem não encontrado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
@@ -9354,13 +9384,13 @@ msgid "Work in progress."
 msgstr "Trabalho em andamento."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "Mensagem não pode ser enviada, canal %s não existe."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "Não pode abrir canal. Canal %s não existe."
@@ -9377,7 +9407,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr "Você aceita %s e %s como pais?"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado(a) do servidor!"
 
@@ -9633,108 +9663,108 @@ msgid "You were killed by unknown source."
 msgstr "Você foi morto(a) por uma fonte desconhecida."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Erro desconhecido de habilidade: %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr "Erro desconhecido de habilidade: %d."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Você ainda não tem o nivel necessário!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Você não tem nenhuma nota armazenada!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Você não pode fazer isso agora!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que você precisa de mais dinheiro... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Você precisa de outra gema vermelha!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Você precisa de outra jóia azul!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Você está com muita carga para fazer isso!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr "Falha ao sumonar."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr "Precisa de espíritos."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr "Precisa de equipamentos %s."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr "Precisa de equipamentos %s e da quantidade %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr "Precisa do item %s."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr "Precisa do item %s e da quantidade %d"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr "Habilidade falhou!"
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr "Selecione o alvo do warp"
 
@@ -9842,8 +9872,55 @@ msgstr "Não foi possível roubar nada..."
 msgid "Poison had no effect..."
 msgstr "Veneno não surtiu efeito..."
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "Entre com a senha:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+#, fuzzy
+msgid "New pincode"
+msgstr "Por favor insira novo pincode"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+#, fuzzy
+msgid "Enter new pincode"
+msgstr "Por favor insira novo pincode"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Mudar o modo de visualização de mapas"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr "Sobre"
 
@@ -9863,7 +9940,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr "Arquivo enviado"
 
@@ -9871,9 +9948,8 @@ msgstr "Arquivo enviado"
 #. TRANSLATORS: clear fonts cache message
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
 msgid "Cache cleared"
-msgstr "Cache limpo"
+msgstr ""
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9891,9 +9967,8 @@ msgstr "Recursos de imagem:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "Recursos de imagem:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9902,48 +9977,40 @@ msgstr "Variáveis de ambiente despejada"
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1638
-#, fuzzy
 msgid "Config uploaded to:"
-msgstr "Arquivo enviado"
+msgstr ""
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1648
-#, fuzzy
 msgid "Server config Uploaded to:"
-msgstr "Server config value: %s"
+msgstr ""
 
 #. TRANSLATORS: upload log chat message
 #: src/progs/manaplus/actions/actions.cpp:1658
-#, fuzzy
 msgid "Log uploaded to:"
-msgstr "Registro enviado em:"
+msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
-"Visto pela última vez desativado. Ativar em jogadores / recolher id de "
-"jogadores e log visto."
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
-msgstr "Você não viu esse apelido."
+msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr "Visto pela última vez por %s: %s"
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
-msgstr "Você não viu esse apelido."
+msgstr ""
 
 #. TRANSLATORS: whisper send
 #: src/progs/manaplus/actions/chat.cpp:279
@@ -10196,57 +10263,57 @@ msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "Conectando-se ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "Fazendo login"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "Entrando no mundo do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "Requerindo personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "Mudando de servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
@@ -11481,7 +11548,7 @@ msgstr ""
 #: src/utils/stringutils.cpp:960
 #, c-format
 msgid "%d week"
-msgstr "%d semanas"
+msgstr ""
 
 #: src/utils/stringutils.cpp:960
 #, c-format
@@ -11492,7 +11559,7 @@ msgstr "%d Semanas"
 #: src/utils/stringutils.cpp:971
 #, c-format
 msgid "%d day"
-msgstr "%d dias"
+msgstr "%d dia"
 
 #: src/utils/stringutils.cpp:971
 #, c-format
@@ -11503,7 +11570,7 @@ msgstr "%d Dias"
 #: src/utils/stringutils.cpp:981
 #, c-format
 msgid "%d hour"
-msgstr "%d horas"
+msgstr "%d hora"
 
 #: src/utils/stringutils.cpp:981
 #, c-format
@@ -11514,7 +11581,7 @@ msgstr "%d Horas"
 #: src/utils/stringutils.cpp:991
 #, c-format
 msgid "%d minute"
-msgstr "%d minutos"
+msgstr ""
 
 #: src/utils/stringutils.cpp:991
 #, c-format
@@ -11525,18 +11592,9 @@ msgstr "%d Minutos"
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d second"
-msgstr "%d segundos"
+msgstr ""
 
 #: src/utils/stringutils.cpp:1001 src/utils/stringutils.cpp:1007
 #, c-format
 msgid "%d seconds"
 msgstr "%d Segundos"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Recurso de imagem orfão:"
-
-#~ msgid "Uploaded config into:"
-#~ msgstr "A|rquivos de configuração enviados para:"
-
-#~ msgid "Uploaded server config into:"
-#~ msgstr "Configuração de servidor enviada para:"
diff --git a/po/ru.po b/po/ru.po
index bcd43d3a0..b81bc7f57 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"Last-Translator: Alexsl <alexlsh@mail.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
 "ru/)\n"
 "Language: ru\n"
@@ -35,7 +35,7 @@ msgstr ""
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
@@ -54,12 +54,12 @@ msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "Б"
 
@@ -71,53 +71,53 @@ msgid "You were killed by %s."
 msgstr "Вы были убиты %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "Предмет слишком далеко."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr "Вы не можете поднять такое количество."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr "Слишком много предметов в стэке."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -128,58 +128,58 @@ msgstr[3] "Вы подняли %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "опыт"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "работа"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr "Гомун"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr "здоровье"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr "мана"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr "Следовать за: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr "Имитация: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr "Вы видите %s"
@@ -417,21 +417,18 @@ msgstr "Ошибка сети"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:831
-#, fuzzy
 msgid "Auto disable Show beings transparency"
-msgstr "Отображать прозрачность на персонажах и монстрах"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Выводить эффекты частиц"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
-#, fuzzy
 msgid "Auto enable opacity cache"
-msgstr "Включить прозрачность интерфейса"
+msgstr ""
 
 #. TRANSLATORS: move type in status bar
 #: src/gamemodifiers.cpp:149
@@ -818,32 +815,35 @@ msgstr "Отошел"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "ОК"
 
@@ -874,14 +874,14 @@ msgstr "(F) свободная камера"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Закрыть"
 
@@ -931,7 +931,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "По умолчанию"
 
@@ -1381,9 +1381,9 @@ msgstr "Гильдия: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "Комментарий: %s"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1579,9 +1579,9 @@ msgstr "Разговор"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1599,7 +1599,7 @@ msgstr "Купить"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1669,8 +1669,8 @@ msgstr "Накормить"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "Переименовать"
 
@@ -1694,7 +1694,7 @@ msgstr "Бросить лут"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1728,6 +1728,7 @@ msgstr "Добавить имя в чат"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1760,10 +1761,11 @@ msgstr "Добавить имя в чат"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "Отмена"
@@ -1819,7 +1821,7 @@ msgstr "Удалить"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr "Прыгнуть"
 
@@ -1841,7 +1843,7 @@ msgstr "Восстановить камеру"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Наряды"
@@ -1873,8 +1875,10 @@ msgstr "Изменить заклинание"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "Очистить"
 
@@ -2045,9 +2049,9 @@ msgstr "Добавить к торговле все"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "Сохранить"
 
@@ -2084,8 +2088,8 @@ msgstr "Поместить в крафт..."
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "Получить"
 
@@ -2124,10 +2128,10 @@ msgstr "Получить все"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Использовать"
@@ -2280,7 +2284,7 @@ msgstr "Выбор типа применения умения"
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -2316,7 +2320,7 @@ msgstr "Пренебречь"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Игнорировать"
 
@@ -2422,8 +2426,8 @@ msgstr "Поставить защиту"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "Бросить..."
 
@@ -2438,7 +2442,7 @@ msgstr "Бросить все"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Бросить"
 
@@ -2497,7 +2501,7 @@ msgstr "Хранилище"
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr "Телега"
@@ -2715,10 +2719,10 @@ msgstr "Создать подчиненного"
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "Сведения"
 
@@ -2910,7 +2914,7 @@ msgstr "Чат"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3223,7 +3227,7 @@ msgstr "Точка дороги"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "Макс"
@@ -3235,9 +3239,9 @@ msgstr "Макс"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3251,7 +3255,7 @@ msgstr "Уровень: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3278,9 +3282,9 @@ msgstr "Открыть ссылку"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "Добавить"
@@ -3292,10 +3296,10 @@ msgstr "Добавить"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Выход"
 
@@ -3304,24 +3308,24 @@ msgstr "Выход"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Цена: %s / Всего: %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Изменить"
 
@@ -3406,54 +3410,51 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "Мигать именем"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
-#, fuzzy
 msgid "Master name"
-msgstr "Название карты:"
+msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "Название карты:"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Музыка:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Карта:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr "Название карты:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Миникарта:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "Курсор:"
 
@@ -3464,224 +3465,232 @@ msgstr "Количество эффектов:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Кол-во. объектов:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Кол-во. объектов:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Позиция игрока:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr "Вызовов рис.:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr "Биндингов текстур:"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr "%d Лог./сек."
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Программно)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr "%d FPS (нормальный OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr "%d FPS (безопасный OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr "%d FPS (мобильный OpenGL ES)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr "%d FPS (мобильный OpenGL ES 2)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr "%d FPS (новый OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr "%d FPS (SDL2 по_умолчанию)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr "Количество текстур:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Количество частиц: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Цель:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "Id цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr "Тип цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr "Уровень цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr "Раса цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr "Группа цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr "Гильдия цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "Задержка атаки:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr "Минимальный удар:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr "Максимальный удар:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr "Критический удар:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr "Карма:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr "Манеры:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr "Эффекты:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Уровень цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Группа цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Гильдия цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Пинг: %s мс."
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Вх.: %d байт/сек."
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Исх.: %d байт/сек."
@@ -3789,46 +3798,58 @@ msgstr "Звук приватного сообщения"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
 #, fuzzy
-msgid "Guild / party / clan message sound"
-msgstr "Звук сообщения в гильдии или группе"
+msgid "Guild message sound"
+msgstr "Звук глобального сообщения"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "Звук ошибки"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+#, fuzzy
+msgid "Clan message sound"
+msgstr "Звук глобального сообщения"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
 msgid "Highlight message sound"
 msgstr "Звук подсветки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Global message sound"
 msgstr "Звук глобального сообщения"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Error message sound"
 msgstr "Звук ошибки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr "Звук обмена"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr "Звук открытия окна"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr "Звук закрытия окна"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Включить голосовой чат mumble"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Скачать музыку"
 
@@ -4385,27 +4406,27 @@ msgid "Assign"
 msgstr "Назначить"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "Снять назначение"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr "Сбросить все кнопки"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr "Ввод"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "Обнаружен(ы) конфликт(ы) клавиш."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4416,50 +4437,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr "неизвестно"
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "Нажмите кнопку, чтобы начать калибровку"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Калибровать"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr "Определение джойстика"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Использовать джойстик"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr "Использовать джойстик если игра свернута"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "Джойстик"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "Стоп"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr "Вращайте стик и не нажимайте другие кнопки"
 
@@ -4779,7 +4800,7 @@ msgstr "Включить напоминание о весе"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "Магазин"
 
@@ -4988,14 +5009,14 @@ msgstr "Для данного сервера моды не существуют"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "Нет"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr "Производительность"
 
@@ -5334,19 +5355,19 @@ msgstr "Разрешить шептание"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Удалить"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr "Связи"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Когда игнорируется:"
 
@@ -5418,8 +5439,8 @@ msgstr "i"
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Тема"
 
@@ -5446,8 +5467,8 @@ msgstr "Тема изменена"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Перезагрузите игру дабы изменения вступили в силу."
 
@@ -5539,9 +5560,9 @@ msgstr "Ограничить кадр/с:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Альтер. ограничить кадр/с: "
 
@@ -5551,50 +5572,50 @@ msgid "Detect best mode"
 msgstr "Найти лучший режим"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr "Высокий DPI"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr "Показывать курсор"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Игровой курсор"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr "Разрешить менять размер окна"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr "Без рамки"
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Видео"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "Нет"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5602,7 +5623,7 @@ msgstr ""
 "удалось!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5610,43 +5631,43 @@ msgstr ""
 "также не удалось!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "Переключение в полноэкранный режим"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "Переключение на OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "Для изменения режима OpenGL необходима перезагрузки игры."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Свое разрешение (например: 1024х768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "Введите новое разрешение:            "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "Разрешение экрана изменено"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем "
@@ -5984,7 +6005,7 @@ msgstr "СПР"
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Помощь"
 
@@ -6039,7 +6060,7 @@ msgstr "СН"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Снаряжение"
 
@@ -6151,9 +6172,8 @@ msgstr "Почта"
 
 #. TRANSLATORS: short button name for clan window.
 #: src/gui/windowmenu.cpp:190
-#, fuzzy
 msgid "CL"
-msgstr "П"
+msgstr ""
 
 #. TRANSLATORS: short button name for server info window.
 #: src/gui/windowmenu.cpp:195
@@ -6185,20 +6205,20 @@ msgstr "ОПЦ"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Настройка"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "Клавиша: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr "Денег в банке: %s"
@@ -6209,7 +6229,7 @@ msgid "Withdraw"
 msgstr "Забрать"
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr "Положить"
 
@@ -6219,20 +6239,20 @@ msgid "Create items"
 msgstr "Создание предметов"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr "Количество:"
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "Создать"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr "Фильтр:"
 
@@ -6287,15 +6307,15 @@ msgstr "Адрес E-mail не совпадает."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Ошибка"
 
@@ -6310,7 +6330,7 @@ msgstr "Изменить пароль"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "Пароль:"
 
@@ -6351,8 +6371,8 @@ msgstr "Новый персонаж"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "Имя:"
 
@@ -6367,16 +6387,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Распределите очки (%d)"
@@ -6385,71 +6405,71 @@ msgstr "Распределите очки (%d)"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "Цвет волос:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "Стрижка:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr "Раса:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr "Внешность:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr "Д"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr "М"
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr "Н"
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr "?"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "Имя должно содержать не менее четырех символов."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "Данные персонажа в порядке"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "Снимите очки (%d)"
@@ -6476,36 +6496,37 @@ msgid "Switch"
 msgstr "Сменить"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr "Пароль"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "Играть"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Сменить логин"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr "Аккаунт %s"
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr "Пожалуйста, установите новый пин код"
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr "Пожалуйста, введите новое имя"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6516,27 +6537,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "Неправильный пароль"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr "Введите ваш email для удаления персонажа"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr "Введите email:"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "Введите пароль для удаления персонажа"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "Введите пароль:"
 
@@ -6578,7 +6599,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Да"
 
@@ -6619,42 +6640,42 @@ msgid "Connect"
 msgstr "Соединиться"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr "Использовать один ip"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr "Адрес:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Порт:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Тип сервера:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr "Описание:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr "URL онлайн списка:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr "Версия пакетов:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr "Пожалуйста введите хотя бы адрес и порт сервера."
 
@@ -6689,7 +6710,7 @@ msgstr "Т"
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr "Неизвестный"
@@ -6724,7 +6745,7 @@ msgstr "Вставка"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6735,93 +6756,93 @@ msgid "Equip"
 msgstr "Надеть"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr "П"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr "М"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr "С"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr "Вопрос о вставке карты"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "Вставить %s в %s?"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "Всё"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "Сколько предметов продать."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "Сколько предметов сбросить."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "Укажите количество вещей для хранения."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr "Укажите количество для отправки."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr "Выберите количество для крафта."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr "Укажите количество вещей для хранения в прицепе."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "Укажите количество вещей для изъятия."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr "Укажите количество вещей для изъятия из прицепа."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "Сколько предметов разделить."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "Добавить в список покупки."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "Добавить в список продажи."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "Неизвестно."
 
@@ -6831,44 +6852,44 @@ msgid "Reset stats"
 msgstr "Сбросить стат."
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "Сбросить таймер"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Убийств: %s, всего опыта: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Средний опыт: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Средн. кол-во монстров до след. уров.: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Убийств в минуту: %s, Опыта в минуту: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
@@ -6877,8 +6898,8 @@ msgstr[1] "Опыт за %d мин.: %s"
 msgstr[2] "Опыт за %d мин.: %s"
 msgstr[3] "Опыт за %d мин.: %s"
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -6888,40 +6909,40 @@ msgstr[2] "Время до следующего уровня в мин. %d: %s"
 msgstr[3] "Время до следующего уровня в мин. %d: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr "Опыт за последнее убийство:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Уровень: %d на %f%%"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Время до следующего уровня: %s"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "Вход"
 
@@ -6944,29 +6965,29 @@ msgstr "Сменить сервер"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "Регистрация"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "Польз. сайт обновлений"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "Сервер:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr "Открыть ссылку регистрации"
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr "нормальные обновления"
 
@@ -6987,14 +7008,14 @@ msgstr "Для:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr "Заголовок:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr "Деньги:"
 
@@ -7005,7 +7026,7 @@ msgstr "Премет:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr "Сообщение:"
 
@@ -7029,22 +7050,22 @@ msgid "Get attach"
 msgstr "Получить вложение"
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr "Ответить"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr "Время:"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr "От:"
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr "Получить деньги"
 
@@ -7054,24 +7075,29 @@ msgid "Refresh"
 msgstr "Обновить"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr "Новое"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr "Получить золото"
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr "Вернуть"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr "Открыть"
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7213,62 +7239,62 @@ msgid "Switch character"
 msgstr "Сменить персонажа"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Подтвердите:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "Мужчина"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "Женщина"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "Email:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Имя пользователя должно содержать не менее %u символов."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Имя пользователя должно содержать менее %u символов."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "Пароль должен содержать не менее %u символов."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Пароль должен содержать не более %u символов."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr "Неправильный email."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr "Email слишком длинный."
 
@@ -7278,48 +7304,53 @@ msgid "Choose Your Server"
 msgstr "Выберите сервер"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Загрузить"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Выбор сервера  *** БЕЗОПАСНЫЙ РЕЖИМ ***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "Выбор сервера  *** БЕЗОПАСНЫЙ РЕЖИМ ***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 msgid "Use same ip for game sub servers"
 msgstr "Использовать одинаковый IP для игровых суб-серверов"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Получение списка серверов...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "Ожидание ответа от сервера..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "Подготовка к загрузке"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "Не удалось получить список серверов!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "требуется более новая версия"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "требуется v%s"
@@ -7377,72 +7408,72 @@ msgid "Reset Windows"
 msgstr "Сбросить расположение окон"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "Свой магазин"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr "Опубликовать"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "Анонс"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "Показывать ссылки"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr "Пожалуйста, введите имя вашего магазина"
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr "Убрать"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr "ошибка: игрок занят"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr "ошибка: нельзя продать предмет"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr "ошибка: нельзя купить предмет"
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr "%s хочет купить %s. Вы разрешаете?"
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr "%s хочет продать %s. Вы разрешаете?"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "Запрос на Торговлю"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Персональный магазин - %s"
@@ -7459,46 +7490,46 @@ msgid "Skill points available: %d"
 msgstr "Очков навыков осталось: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr "Навык %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "Навык %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr "Навык %u"
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Уровень: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Неудача навыка: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Добавить текст к скилу %s"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr "Текст: "
 
@@ -7708,35 +7739,35 @@ msgid "Trade: You"
 msgstr "Торговля: Вы"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "Вы получаете %s."
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "Сменить"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "Вы отдаете:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "У вас недостаточно денег."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
 "объектов более одного раза."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr "Ошибка добавления предмета. Вы не можете обменивать одетые предметы."
 
@@ -7811,7 +7842,7 @@ msgid "Change Login"
 msgstr "Сменить логин"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Выберите сервер"
 
@@ -8986,9 +9017,8 @@ msgstr "Окно быстрых настроек"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "Прицеп"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9202,33 +9232,33 @@ msgstr "Подключение к серверу прервано. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr "Ошибка изменения имени персонажа."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr "Персонаж переименован."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr "Изменение имени запрещено."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr "Новое имя не указано."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr "Персонаж не найден."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "Невозможно удалить персонажа."
 
@@ -9258,13 +9288,13 @@ msgid "Work in progress."
 msgstr "Идет работа."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "Сообщение не может быть отправлено, т.к. канал %s не существует."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "Не возможно открыть канал. Канал %s не существует."
@@ -9281,7 +9311,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr "Вы принимаете %s и %s как своих родителей?"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "Отключено от сервера!"
 
@@ -9537,108 +9567,108 @@ msgid "You were killed by unknown source."
 msgstr "Вы были убиты неизвестным."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Неизвестная ошибка навыков: %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr "Неисвестная ошибка умений: %d."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "У Вас недостаточный уровень!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Недостаточно ОЖ!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Недостаточно Маны!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "У Вас нет записей!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Вы не можете сделать это сейчас!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Похоже, Вам нужно больше денег... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Вы не можете использовать этот навык с данным видом оружия!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Вам нужен другой красный камень!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Вам нужен другой синий камень!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Вы несёте слишком много, чтобы сделать это!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr "Ошибка вызова монстра."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr "Необходима сущьность."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr "Необходимо снаряжение %s."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr "Нужно снаряжение %s в количестве %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr "Нужен предмет %s."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr "Нужен предмет %s в количестве %d."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr "Ошибка умения!"
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr "Выберите точку назначения"
 
@@ -9746,8 +9776,55 @@ msgstr "Не удалось ничего украсть..."
 msgid "Poison had no effect..."
 msgstr "Яд не подействовал..."
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "Введите пароль:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+#, fuzzy
+msgid "New pincode"
+msgstr "Пожалуйста, установите новый пин код"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+#, fuzzy
+msgid "Enter new pincode"
+msgstr "Пожалуйста, установите новый пин код"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Сменить сообщение"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr "О Программе"
 
@@ -9767,7 +9844,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файл_строка_цвета файл_назначения"
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr "Файл выгружен"
 
@@ -9775,9 +9852,8 @@ msgstr "Файл выгружен"
 #. TRANSLATORS: clear fonts cache message
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
 msgid "Cache cleared"
-msgstr "Кеш очищен"
+msgstr ""
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9795,9 +9871,8 @@ msgstr "Изображений:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "Изображений:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9806,48 +9881,40 @@ msgstr "Переменные среды сохранены"
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1638
-#, fuzzy
 msgid "Config uploaded to:"
-msgstr "Файл выгружен"
+msgstr ""
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1648
-#, fuzzy
 msgid "Server config Uploaded to:"
-msgstr "Значение настройки для этого сервера: %s"
+msgstr ""
 
 #. TRANSLATORS: upload log chat message
 #: src/progs/manaplus/actions/actions.cpp:1658
-#, fuzzy
 msgid "Log uploaded to:"
-msgstr "Информация о выгруженном логе:"
+msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
-"Сбор информации о пользователя отключен. Включите его в игроки / собирать ид "
-"игроков и лог встреч."
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
-msgstr "Вам не встречался этот ник."
+msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr "Последняя встреча с %s: %s"
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
-msgstr "Вам не встречался этот ник."
+msgstr ""
 
 #. TRANSLATORS: whisper send
 #: src/progs/manaplus/actions/chat.cpp:279
@@ -10098,57 +10165,57 @@ msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "Авторизация"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "Сменить Email"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
@@ -11433,12 +11500,3 @@ msgstr "%d секунда"
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Удаленных изображений:"
-
-#~ msgid "Uploaded config into:"
-#~ msgstr "Информация о выгруженном конфиге:"
-
-#~ msgid "Uploaded server config into:"
-#~ msgstr "Информация о выгруженном конфиге сервера:"
diff --git a/po/sr.po b/po/sr.po
index 3e6c77240..cfeeeebee 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/"
 "sr/)\n"
@@ -22,7 +22,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr ""
 
@@ -41,12 +41,12 @@ msgid "miss"
 msgstr "promašaj"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr ""
 
@@ -58,53 +58,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -114,58 +114,58 @@ msgstr[2] "Pokupio %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -406,9 +406,8 @@ msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Efekti sa česticama"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
@@ -800,32 +799,35 @@ msgstr "Nedostupan"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "U redu"
 
@@ -856,14 +858,14 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Zatvori"
 
@@ -909,7 +911,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "standardno"
 
@@ -1557,9 +1559,9 @@ msgstr ""
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1577,7 +1579,7 @@ msgstr ""
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1647,8 +1649,8 @@ msgstr ""
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr ""
 
@@ -1672,7 +1674,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1706,6 +1708,7 @@ msgstr ""
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1738,10 +1741,11 @@ msgstr ""
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr ""
@@ -1797,7 +1801,7 @@ msgstr ""
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr ""
 
@@ -1819,7 +1823,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr ""
@@ -1851,8 +1855,10 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr ""
 
@@ -2023,9 +2029,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr ""
 
@@ -2062,8 +2068,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr ""
 
@@ -2102,10 +2108,10 @@ msgstr "Uzmi sve"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
@@ -2258,7 +2264,7 @@ msgstr ""
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr ""
 
@@ -2294,7 +2300,7 @@ msgstr ""
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Ignoriši"
 
@@ -2400,8 +2406,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr ""
 
@@ -2416,7 +2422,7 @@ msgstr ""
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr ""
 
@@ -2475,7 +2481,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr ""
@@ -2693,10 +2699,10 @@ msgstr ""
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr ""
 
@@ -2888,7 +2894,7 @@ msgstr "Ćaskanje"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3201,7 +3207,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr ""
@@ -3213,9 +3219,9 @@ msgstr ""
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr ""
 
@@ -3229,7 +3235,7 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3256,9 +3262,9 @@ msgstr ""
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr ""
@@ -3270,10 +3276,10 @@ msgstr ""
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr ""
 
@@ -3282,24 +3288,24 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Izmeni"
 
@@ -3399,36 +3405,36 @@ msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Muzika:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Mapa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Mala mapa:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "Kursor:"
 
@@ -3439,224 +3445,232 @@ msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Broj aktera na mapi:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Broj aktera na mapi:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Pozicija igrača:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr ""
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Programski)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Broj čestica: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Ciljani igrač:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "Id ciljanog igrača:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Nivo ciljanog igrača:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Partija ciljanog igrača:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Udruženje ciljanog igrača:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Ulaz: %d bajtova u sekundi"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Izlaz: %d bajtova u sekundi"
@@ -3763,46 +3777,56 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-msgid "Guild / party / clan message sound"
+msgid "Guild message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-msgid "Highlight message sound"
+msgid "Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-msgid "Global message sound"
+msgid "Clan message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
-msgid "Error message sound"
+msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:163
-msgid "Trade request sound"
+msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:168
-msgid "Show window sound"
+msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:173
-msgid "Hide window sound"
+msgid "Trade request sound"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:178
+msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:183
+msgid "Hide window sound"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Uključi \"mumble\" ćaskanje"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Preuzmi muziku"
 
@@ -4327,27 +4351,27 @@ msgid "Assign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4358,50 +4382,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -4721,7 +4745,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr ""
 
@@ -4930,14 +4954,14 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "Ne"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr ""
 
@@ -5269,19 +5293,19 @@ msgstr "Dozvoli šaputanje"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Obriši"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Kada se ignoriše:"
 
@@ -5353,8 +5377,8 @@ msgstr ""
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Stil"
 
@@ -5381,8 +5405,8 @@ msgstr "Stil promenjen"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Zatvori i onda ponovo otvori svoj klijent da bi izmene proradile."
 
@@ -5474,9 +5498,9 @@ msgstr "Ograničen FPS:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Alternativno FPS ograničenje: "
 
@@ -5486,98 +5510,98 @@ msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Poseban kursor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "Ništa"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -5913,7 +5937,7 @@ msgstr ""
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Pomoć"
 
@@ -5968,7 +5992,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Oprema"
 
@@ -6113,20 +6137,20 @@ msgstr ""
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Podešavanje"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -6137,7 +6161,7 @@ msgid "Withdraw"
 msgstr ""
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr ""
 
@@ -6147,20 +6171,20 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr ""
 
@@ -6215,15 +6239,15 @@ msgstr ""
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Greška"
 
@@ -6238,7 +6262,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr ""
 
@@ -6279,8 +6303,8 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr ""
 
@@ -6295,16 +6319,16 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
@@ -6313,71 +6337,71 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -6404,36 +6428,37 @@ msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr ""
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Promeni tip kretanja"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr ""
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6444,27 +6469,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr ""
 
@@ -6506,7 +6531,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Da"
 
@@ -6547,42 +6572,42 @@ msgid "Connect"
 msgstr "Koncija"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Tip servera:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -6617,7 +6642,7 @@ msgstr ""
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr ""
@@ -6652,7 +6677,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6663,93 +6688,93 @@ msgid "Equip"
 msgstr "Obuci"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr ""
 
@@ -6759,44 +6784,44 @@ msgid "Reset stats"
 msgstr ""
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
@@ -6804,8 +6829,8 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -6814,40 +6839,40 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr ""
 
@@ -6870,29 +6895,29 @@ msgstr ""
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr ""
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr ""
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr ""
 
@@ -6913,14 +6938,14 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr ""
 
@@ -6931,7 +6956,7 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr ""
 
@@ -6955,22 +6980,22 @@ msgid "Get attach"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr ""
 
@@ -6980,24 +7005,29 @@ msgid "Refresh"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr ""
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7139,62 +7169,62 @@ msgid "Switch character"
 msgstr "Promeni karaktera"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Potvrdi:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr ""
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr ""
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "E-mail adresa:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Lozinke se ne poklapaju."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr ""
 
@@ -7204,48 +7234,52 @@ msgid "Choose Your Server"
 msgstr "Izaberi svoj server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Učitavanje"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
+#: src/gui/windows/serverdialog.cpp:139
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr ""
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 msgid "Use same ip for game sub servers"
 msgstr "Koristi istu ip za podservere za igre"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Preuzimam listu servera...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "Čekan na server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "Pripremam preuzimanje"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "Greška prilikom preuzimanja liste servera!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "zahteva noviju verziju"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "zahteva v%s"
@@ -7303,72 +7337,72 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -7385,46 +7419,46 @@ msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr ""
 
@@ -7634,33 +7668,33 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -7735,7 +7769,7 @@ msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr ""
 
@@ -9120,33 +9154,33 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr ""
 
@@ -9176,13 +9210,13 @@ msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -9199,7 +9233,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr ""
 
@@ -9455,108 +9489,108 @@ msgid "You were killed by unknown source."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr ""
 
@@ -9664,8 +9698,52 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+msgid "Enter pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+msgid "New pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+msgid "Enter new pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Promeni režim imitacije"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr "O programu"
 
@@ -9685,7 +9763,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr ""
 
@@ -9736,24 +9814,24 @@ msgid "Log uploaded to:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
 msgstr ""
 
@@ -10006,57 +10084,57 @@ msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "Povezivanje sa serverom"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "Prijavljivanje"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "Ulaz u svet"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "Tražim karaktere"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "Poverzujem se sa serverom za igru"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "Menjam server igre"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "Zahtevam detalje registracije"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Promena lozinke"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "Lozinka je uspešno promenjena!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "Izmena e-mail adrese"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "E-mail adresa je uspešno promenjena!"
 
diff --git a/po/sv.po b/po/sv.po
index 0a173a754..58401a238 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"Last-Translator: Kristoffer Frisell <kristoffer@frisell.it>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
 "language/sv_SE/)\n"
 "Language: sv_SE\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "Synlig på karta"
 
@@ -39,12 +39,12 @@ msgid "miss"
 msgstr "missa"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "I"
 
@@ -56,53 +56,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "Försökte plocka upp icke existerande item."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "Item är för tung."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "Item:en är för långt bort."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "Inventory är fullt."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "Stack är för stor."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "Item:et tillhör någon annan."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "Okänt fel vid upplockning av item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -111,58 +111,58 @@ msgstr[1] "You picked up %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "jobb"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr "Follow: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "Follow avbruten"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitation: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "Imitation avbruten"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr "Du ser %s"
@@ -401,15 +401,13 @@ msgstr "Nätverksfel"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:831
-#, fuzzy
 msgid "Auto disable Show beings transparency"
-msgstr "Visa genomskinliga varelser"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Partickeleffekter"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
@@ -801,32 +799,35 @@ msgstr "Iväg"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "OK"
 
@@ -857,14 +858,14 @@ msgstr "(F) fritt kamera-läge"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Stäng"
 
@@ -910,7 +911,7 @@ msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "standard"
 
@@ -1360,9 +1361,9 @@ msgstr "Guild: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "Kommentar: %s"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1558,9 +1559,9 @@ msgstr "Prata med"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1578,7 +1579,7 @@ msgstr "Köp"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1648,8 +1649,8 @@ msgstr ""
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "Ändra namn"
 
@@ -1673,7 +1674,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1707,6 +1708,7 @@ msgstr "Lägg till namnet i chat"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1739,10 +1741,11 @@ msgstr "Lägg till namnet i chat"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "Avbryt"
@@ -1798,7 +1801,7 @@ msgstr "Ta bort"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr "Warpa"
 
@@ -1820,7 +1823,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Utstyrsel"
@@ -1852,8 +1855,10 @@ msgstr "Ändra spell"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "Clear"
 
@@ -2024,9 +2029,9 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "Lagra"
 
@@ -2063,8 +2068,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "Ta emot"
 
@@ -2103,10 +2108,10 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Använd"
@@ -2259,7 +2264,7 @@ msgstr ""
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "Default"
 
@@ -2295,7 +2300,7 @@ msgstr "Ignorera"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Ignorera"
 
@@ -2401,8 +2406,8 @@ msgstr "Skydda item"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "Släng..."
 
@@ -2417,7 +2422,7 @@ msgstr "Släng allt"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Släng"
 
@@ -2476,7 +2481,7 @@ msgstr "Storage"
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr "Cart"
@@ -2694,10 +2699,10 @@ msgstr ""
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "Info"
 
@@ -2889,7 +2894,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3202,7 +3207,7 @@ msgstr "Väg-märke"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "Max"
@@ -3214,9 +3219,9 @@ msgstr "Max"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3230,7 +3235,7 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3257,9 +3262,9 @@ msgstr "Öppna url"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "Lägg till"
@@ -3271,10 +3276,10 @@ msgstr "Lägg till"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -3283,24 +3288,24 @@ msgstr "Avsluta"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Ändra"
 
@@ -3385,54 +3390,51 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "Blink-namn"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
-#, fuzzy
 msgid "Master name"
-msgstr "Borttagna namn"
+msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "GM-namn"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Musik:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Karta:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Minikarta:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "Muspekare:"
 
@@ -3443,224 +3445,232 @@ msgstr "Partikelantal:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Kartmarkörsantal:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Kartmarkörsantal:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Spelarposition:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr "Rita ut samtal:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr "Textur-bindning:"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr "Antal texturer:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Partikelantal: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "Target Id:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr "Target-typ:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr "Target level:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr "Target race:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr "Target party:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr "Target guild:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "Attack-fördröjning:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr "Minimal träff:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr "Maximal träff:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr "Critical hit:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Target Level:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Target Party:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Target Guild:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "In: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Ut: %d bytes/s"
@@ -3768,46 +3778,58 @@ msgstr "Viskningsmeddelande-ljud"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
 #, fuzzy
-msgid "Guild / party / clan message sound"
-msgstr "Guild / Party-meddelande-ljud"
+msgid "Guild message sound"
+msgstr "Globalmeddelande-ljud"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "Felmeddelande-ljud"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+#, fuzzy
+msgid "Clan message sound"
+msgstr "Globalmeddelande-ljud"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
 msgid "Highlight message sound"
 msgstr "Highlight-meddelande-ljud"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Global message sound"
 msgstr "Globalmeddelande-ljud"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Error message sound"
 msgstr "Felmeddelande-ljud"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr "Trade-förfrågnings-ljud"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr "Ljud för visa fönster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr "Ljud för dölj fönster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Aktivera mumble röst chat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Ladda hem musik"
 
@@ -4332,27 +4354,27 @@ msgid "Assign"
 msgstr "Tilldela"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "Ta bort tilldelning"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr "Återställ alla tangenter"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr "Putta in"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "Tangent-konflikt(er) uppmärksammade."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4363,50 +4385,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr "okänd"
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "Tryck på knappen för att starta kalibreringen"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Kalibrera"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr "Upptäck joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Aktivera joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr "Använd glödjesticka om klientfönstret är inaktivt"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "Stopp"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr "Rotera stickan men rör inga knappar"
 
@@ -4726,7 +4748,7 @@ msgstr "Aktivera vikt-notationer"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "Shop"
 
@@ -4936,14 +4958,14 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "Nej"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr ""
 
@@ -5275,19 +5297,19 @@ msgstr "Tillåt viskningar"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Radera"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr "Relationer"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Vid ignorering:"
 
@@ -5359,8 +5381,8 @@ msgstr "i"
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Tema"
 
@@ -5387,8 +5409,8 @@ msgstr "Tema ändrat"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Starta om din klient för att ändringarna ska utföras."
 
@@ -5480,9 +5502,9 @@ msgstr "FPS-begränsning:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Alternativ FPS-begränsning: "
 
@@ -5492,50 +5514,50 @@ msgid "Detect best mode"
 msgstr "Upptäck bästa läget"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr "Visa muspekare"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Anpassad muspekare"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr "Aktivera storlekändring"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr "Ingen ram"
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "Ingen"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5543,7 +5565,7 @@ msgstr ""
 "läget misslyckades också!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5551,43 +5573,43 @@ msgstr ""
 "läget misslyckades också!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "Ändrar till Fullskärm"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "Omstart behövs för att ändringar ska genomföras."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "Ändrar till OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "Tillämpar ändringar till OpenGL, behöver omstart."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Anpassad upplösning (exempel: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "Skriv in ny upplösning:              "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "Skärmupplösning ändrad"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Vissa fönster kan flyttas på för att passa i lägre upplösning."
 
@@ -5923,7 +5945,7 @@ msgstr "HLP"
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Hjälp"
 
@@ -5978,7 +6000,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Equipment"
 
@@ -6123,20 +6145,20 @@ msgstr "SET"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "Nyckel: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -6147,7 +6169,7 @@ msgid "Withdraw"
 msgstr ""
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr ""
 
@@ -6157,20 +6179,20 @@ msgid "Create items"
 msgstr "Skapa items"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr "Antal:"
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "Skapa"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr ""
 
@@ -6225,15 +6247,15 @@ msgstr "E-postadressen matchar inte."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Error"
 
@@ -6248,7 +6270,7 @@ msgstr "Ändra Lösenord"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "Lösenord:"
 
@@ -6289,8 +6311,8 @@ msgstr "Ny karaktär"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "Namn:"
 
@@ -6305,16 +6327,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Vänligen distribuera %d poäng"
@@ -6323,71 +6345,71 @@ msgstr "Vänligen distribuera %d poäng"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "Hårfärg:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "Hårstil:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr "Race:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr "Utseende:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ditt namn måste vara minst 4 tecken långt."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "Karaktär-stats OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "Vänligen ta bort %d poäng"
@@ -6414,36 +6436,37 @@ msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "Spela"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Ändra login"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr "Konto %s"
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr ""
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6454,27 +6477,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "Felaktigt lösenord"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "Skriv in lösenordet för att radera karaktär"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "Skriv lösenord:"
 
@@ -6516,7 +6539,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Ja"
 
@@ -6557,42 +6580,42 @@ msgid "Connect"
 msgstr "Anslut"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr "Adress:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Server-typ:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr "Notering:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr "Online-lista url:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 "Snälla, kan du inte bara vara vänlig och skriva in både adress och port till "
@@ -6629,7 +6652,7 @@ msgstr ""
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr ""
@@ -6664,7 +6687,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6675,93 +6698,93 @@ msgid "Equip"
 msgstr "Equip"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "Alla"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "Välj antal items att byta."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "Välj antal items att slänga."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "Välj antal items att lagra."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "Välj antal items att apportera."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "Välj antal items att dela."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "Lägg till i buy shop."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "Lägg till i sell shop."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "Okänd."
 
@@ -6771,52 +6794,52 @@ msgid "Reset stats"
 msgstr "Återställ statistik"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "Återställ timer"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Kills: %s, total exp: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Medel-Exp: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Medelantal mobs till nästa level: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Kills/Min: %s, Exp/Min: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Exp speed per %d min: %s"
 msgstr[1] "Exp speed per %d min: %s"
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -6824,40 +6847,40 @@ msgstr[0] "Tid för nästa level per %d min: %s"
 msgstr[1] "Tid för nästa level per %d min: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr "Last kill exp:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Level: %d vid %f%%"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Tid tills nästa level: %s"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "Login"
 
@@ -6880,29 +6903,29 @@ msgstr "Ändra Server"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "Registrera"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "Anpassad uppdatering-host"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr "Öppna register-url"
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr ""
 
@@ -6923,14 +6946,14 @@ msgstr "Till:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr ""
 
@@ -6941,7 +6964,7 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr ""
 
@@ -6965,22 +6988,22 @@ msgid "Get attach"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr ""
 
@@ -6990,24 +7013,29 @@ msgid "Refresh"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr ""
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7149,62 +7177,62 @@ msgid "Switch character"
 msgstr "Byt karaktär"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Godkänn:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "Man"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "Kvinna"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "E-post:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Användarnamnet måste vara minst %u tecken långt."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Användarnamnet måste vara mindre än %u tecken långt."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "Lösenordet måste vara minst %u tecken långt."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Lösenordet måste vara mindre än %u tecken långt."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Lösenordet överensstämmer inte."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr "Felaktig epost."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr ""
 
@@ -7214,48 +7242,53 @@ msgid "Choose Your Server"
 msgstr "Välj server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Ladda"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Välj din server *** FELSÄKERT LÄGE ***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "Välj din server *** FELSÄKERT LÄGE ***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 msgid "Use same ip for game sub servers"
 msgstr "Använd samma ip för spelunderservrar"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Laddar hem server-lista...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "Väntar på server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "Förbereder hemladdning"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "Fel uppstod när serverlistan hämtades!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "Nyare version behövs"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "v%s behövs"
@@ -7313,72 +7346,72 @@ msgid "Reset Windows"
 msgstr "Återställ fönster"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "Personlig Shop"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "Annonsera"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "Visa länkar i annonseringen"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "Efterfråga Trade"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -7395,46 +7428,46 @@ msgid "Skill points available: %d"
 msgstr "Skill points tillgängliga: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr "Skill Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr ""
 
@@ -7644,35 +7677,35 @@ msgid "Trade: You"
 msgstr "Trade: Dig"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "Du får %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "Byt"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "Du ger:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "Du har inte tillräckligt med pengar."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i "
 "fönstret."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -7747,7 +7780,7 @@ msgid "Change Login"
 msgstr "Ändra login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Välj värld"
 
@@ -8922,9 +8955,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "Chatfönster"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9138,33 +9170,33 @@ msgstr "Anslutningen till servern avslutad. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "Misslyckades att radera karaktär."
 
@@ -9194,13 +9226,13 @@ msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -9217,7 +9249,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "Du blev frånkopplad från servern!"
 
@@ -9473,108 +9505,108 @@ msgid "You were killed by unknown source."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du har ännu inte nått required lvl!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Otillräckligt HP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Otillräckligt SP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Du har inga memos!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Du kan inte göra det just nu!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Verkar som att du behöver mer money... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kan inte använda denna skill med det vapnet!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Du behöver en till röd gem!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Du behöver en till blå gem!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Du bär för mycket för att kunna göra detta!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr ""
 
@@ -9682,8 +9714,53 @@ msgstr "Kan inte stjäla något..."
 msgid "Poison had no effect..."
 msgstr "Poison hade ingen effekt..."
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "Skriv lösenord:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+msgid "New pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+msgid "Enter new pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Ändra Kartvy-läge"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr ""
 
@@ -9703,7 +9780,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr ""
 
@@ -9711,9 +9788,8 @@ msgstr ""
 #. TRANSLATORS: clear fonts cache message
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
 msgid "Cache cleared"
-msgstr "Cache rensad"
+msgstr ""
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9731,9 +9807,8 @@ msgstr "Resurs-bilder:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "Resurs-bilder:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9756,24 +9831,24 @@ msgid "Log uploaded to:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
 msgstr ""
 
@@ -10026,57 +10101,57 @@ msgid "Accepting incoming trade requests"
 msgstr "Acceptera inkommande bytes-förfrågningar"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "Ansluter till server"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "Loggar in"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "Går in i spelvärld"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "Begär karaktärer"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "Ansluter till spelservern"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "Begär registreringsuppgifter"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Lösenordsändring"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "Lösenordsändring har lyckats!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "Byte av E-post"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "E-posten har ändrats!"
 
@@ -11354,6 +11429,3 @@ msgstr "%d sekund"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Föräldralösa resurs-bilder:"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 0a173a754..58401a238 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"Last-Translator: Kristoffer Frisell <kristoffer@frisell.it>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
 "language/sv_SE/)\n"
 "Language: sv_SE\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "Synlig på karta"
 
@@ -39,12 +39,12 @@ msgid "miss"
 msgstr "missa"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "I"
 
@@ -56,53 +56,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "Försökte plocka upp icke existerande item."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "Item är för tung."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "Item:en är för långt bort."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "Inventory är fullt."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "Stack är för stor."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "Item:et tillhör någon annan."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "Okänt fel vid upplockning av item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -111,58 +111,58 @@ msgstr[1] "You picked up %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "jobb"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr "Follow: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "Follow avbruten"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitation: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "Imitation avbruten"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr "Du ser %s"
@@ -401,15 +401,13 @@ msgstr "Nätverksfel"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:831
-#, fuzzy
 msgid "Auto disable Show beings transparency"
-msgstr "Visa genomskinliga varelser"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Partickeleffekter"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
@@ -801,32 +799,35 @@ msgstr "Iväg"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "OK"
 
@@ -857,14 +858,14 @@ msgstr "(F) fritt kamera-läge"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Stäng"
 
@@ -910,7 +911,7 @@ msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "standard"
 
@@ -1360,9 +1361,9 @@ msgstr "Guild: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "Kommentar: %s"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1558,9 +1559,9 @@ msgstr "Prata med"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1578,7 +1579,7 @@ msgstr "Köp"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1648,8 +1649,8 @@ msgstr ""
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "Ändra namn"
 
@@ -1673,7 +1674,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1707,6 +1708,7 @@ msgstr "Lägg till namnet i chat"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1739,10 +1741,11 @@ msgstr "Lägg till namnet i chat"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "Avbryt"
@@ -1798,7 +1801,7 @@ msgstr "Ta bort"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr "Warpa"
 
@@ -1820,7 +1823,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Utstyrsel"
@@ -1852,8 +1855,10 @@ msgstr "Ändra spell"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "Clear"
 
@@ -2024,9 +2029,9 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "Lagra"
 
@@ -2063,8 +2068,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "Ta emot"
 
@@ -2103,10 +2108,10 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Använd"
@@ -2259,7 +2264,7 @@ msgstr ""
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "Default"
 
@@ -2295,7 +2300,7 @@ msgstr "Ignorera"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Ignorera"
 
@@ -2401,8 +2406,8 @@ msgstr "Skydda item"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "Släng..."
 
@@ -2417,7 +2422,7 @@ msgstr "Släng allt"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Släng"
 
@@ -2476,7 +2481,7 @@ msgstr "Storage"
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr "Cart"
@@ -2694,10 +2699,10 @@ msgstr ""
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "Info"
 
@@ -2889,7 +2894,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3202,7 +3207,7 @@ msgstr "Väg-märke"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "Max"
@@ -3214,9 +3219,9 @@ msgstr "Max"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3230,7 +3235,7 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3257,9 +3262,9 @@ msgstr "Öppna url"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "Lägg till"
@@ -3271,10 +3276,10 @@ msgstr "Lägg till"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -3283,24 +3288,24 @@ msgstr "Avsluta"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Ändra"
 
@@ -3385,54 +3390,51 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "Blink-namn"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
-#, fuzzy
 msgid "Master name"
-msgstr "Borttagna namn"
+msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "GM-namn"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Musik:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Karta:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Minikarta:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "Muspekare:"
 
@@ -3443,224 +3445,232 @@ msgstr "Partikelantal:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Kartmarkörsantal:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Kartmarkörsantal:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Spelarposition:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr "Rita ut samtal:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr "Textur-bindning:"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr "Antal texturer:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Partikelantal: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "Target Id:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr "Target-typ:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr "Target level:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr "Target race:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr "Target party:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr "Target guild:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "Attack-fördröjning:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr "Minimal träff:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr "Maximal träff:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr "Critical hit:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Target Level:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Target Party:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Target Guild:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "In: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Ut: %d bytes/s"
@@ -3768,46 +3778,58 @@ msgstr "Viskningsmeddelande-ljud"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
 #, fuzzy
-msgid "Guild / party / clan message sound"
-msgstr "Guild / Party-meddelande-ljud"
+msgid "Guild message sound"
+msgstr "Globalmeddelande-ljud"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "Felmeddelande-ljud"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+#, fuzzy
+msgid "Clan message sound"
+msgstr "Globalmeddelande-ljud"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
 msgid "Highlight message sound"
 msgstr "Highlight-meddelande-ljud"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Global message sound"
 msgstr "Globalmeddelande-ljud"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Error message sound"
 msgstr "Felmeddelande-ljud"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr "Trade-förfrågnings-ljud"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr "Ljud för visa fönster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr "Ljud för dölj fönster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Aktivera mumble röst chat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Ladda hem musik"
 
@@ -4332,27 +4354,27 @@ msgid "Assign"
 msgstr "Tilldela"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "Ta bort tilldelning"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr "Återställ alla tangenter"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr "Putta in"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "Tangent-konflikt(er) uppmärksammade."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4363,50 +4385,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr "okänd"
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "Tryck på knappen för att starta kalibreringen"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Kalibrera"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr "Upptäck joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Aktivera joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr "Använd glödjesticka om klientfönstret är inaktivt"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "Joystick"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "Stopp"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr "Rotera stickan men rör inga knappar"
 
@@ -4726,7 +4748,7 @@ msgstr "Aktivera vikt-notationer"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "Shop"
 
@@ -4936,14 +4958,14 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "Nej"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr ""
 
@@ -5275,19 +5297,19 @@ msgstr "Tillåt viskningar"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Radera"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr "Relationer"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Vid ignorering:"
 
@@ -5359,8 +5381,8 @@ msgstr "i"
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Tema"
 
@@ -5387,8 +5409,8 @@ msgstr "Tema ändrat"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Starta om din klient för att ändringarna ska utföras."
 
@@ -5480,9 +5502,9 @@ msgstr "FPS-begränsning:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Alternativ FPS-begränsning: "
 
@@ -5492,50 +5514,50 @@ msgid "Detect best mode"
 msgstr "Upptäck bästa läget"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr "Visa muspekare"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Anpassad muspekare"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr "Aktivera storlekändring"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr "Ingen ram"
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "Ingen"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5543,7 +5565,7 @@ msgstr ""
 "läget misslyckades också!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5551,43 +5573,43 @@ msgstr ""
 "läget misslyckades också!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "Ändrar till Fullskärm"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "Omstart behövs för att ändringar ska genomföras."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "Ändrar till OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "Tillämpar ändringar till OpenGL, behöver omstart."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Anpassad upplösning (exempel: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "Skriv in ny upplösning:              "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "Skärmupplösning ändrad"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Vissa fönster kan flyttas på för att passa i lägre upplösning."
 
@@ -5923,7 +5945,7 @@ msgstr "HLP"
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Hjälp"
 
@@ -5978,7 +6000,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Equipment"
 
@@ -6123,20 +6145,20 @@ msgstr "SET"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "Nyckel: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -6147,7 +6169,7 @@ msgid "Withdraw"
 msgstr ""
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr ""
 
@@ -6157,20 +6179,20 @@ msgid "Create items"
 msgstr "Skapa items"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr "Antal:"
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "Skapa"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr ""
 
@@ -6225,15 +6247,15 @@ msgstr "E-postadressen matchar inte."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Error"
 
@@ -6248,7 +6270,7 @@ msgstr "Ändra Lösenord"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "Lösenord:"
 
@@ -6289,8 +6311,8 @@ msgstr "Ny karaktär"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "Namn:"
 
@@ -6305,16 +6327,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Vänligen distribuera %d poäng"
@@ -6323,71 +6345,71 @@ msgstr "Vänligen distribuera %d poäng"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "Hårfärg:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "Hårstil:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr "Race:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr "Utseende:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ditt namn måste vara minst 4 tecken långt."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "Karaktär-stats OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "Vänligen ta bort %d poäng"
@@ -6414,36 +6436,37 @@ msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "Spela"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Ändra login"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr "Konto %s"
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr ""
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6454,27 +6477,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "Felaktigt lösenord"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "Skriv in lösenordet för att radera karaktär"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "Skriv lösenord:"
 
@@ -6516,7 +6539,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Ja"
 
@@ -6557,42 +6580,42 @@ msgid "Connect"
 msgstr "Anslut"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr "Adress:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Port:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Server-typ:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr "Notering:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr "Online-lista url:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 "Snälla, kan du inte bara vara vänlig och skriva in både adress och port till "
@@ -6629,7 +6652,7 @@ msgstr ""
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr ""
@@ -6664,7 +6687,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6675,93 +6698,93 @@ msgid "Equip"
 msgstr "Equip"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "Alla"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "Välj antal items att byta."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "Välj antal items att slänga."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "Välj antal items att lagra."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "Välj antal items att apportera."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "Välj antal items att dela."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "Lägg till i buy shop."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "Lägg till i sell shop."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "Okänd."
 
@@ -6771,52 +6794,52 @@ msgid "Reset stats"
 msgstr "Återställ statistik"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "Återställ timer"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Kills: %s, total exp: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Medel-Exp: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Medelantal mobs till nästa level: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Kills/Min: %s, Exp/Min: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Exp speed per %d min: %s"
 msgstr[1] "Exp speed per %d min: %s"
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -6824,40 +6847,40 @@ msgstr[0] "Tid för nästa level per %d min: %s"
 msgstr[1] "Tid för nästa level per %d min: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr "Last kill exp:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Level: %d vid %f%%"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Tid tills nästa level: %s"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "Login"
 
@@ -6880,29 +6903,29 @@ msgstr "Ändra Server"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "Registrera"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "Anpassad uppdatering-host"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr "Öppna register-url"
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr ""
 
@@ -6923,14 +6946,14 @@ msgstr "Till:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr ""
 
@@ -6941,7 +6964,7 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr ""
 
@@ -6965,22 +6988,22 @@ msgid "Get attach"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr ""
 
@@ -6990,24 +7013,29 @@ msgid "Refresh"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr ""
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7149,62 +7177,62 @@ msgid "Switch character"
 msgstr "Byt karaktär"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Godkänn:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "Man"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "Kvinna"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "E-post:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Användarnamnet måste vara minst %u tecken långt."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Användarnamnet måste vara mindre än %u tecken långt."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "Lösenordet måste vara minst %u tecken långt."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Lösenordet måste vara mindre än %u tecken långt."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Lösenordet överensstämmer inte."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr "Felaktig epost."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr ""
 
@@ -7214,48 +7242,53 @@ msgid "Choose Your Server"
 msgstr "Välj server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Ladda"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Välj din server *** FELSÄKERT LÄGE ***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "Välj din server *** FELSÄKERT LÄGE ***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 msgid "Use same ip for game sub servers"
 msgstr "Använd samma ip för spelunderservrar"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Laddar hem server-lista...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "Väntar på server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "Förbereder hemladdning"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "Fel uppstod när serverlistan hämtades!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "Nyare version behövs"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "v%s behövs"
@@ -7313,72 +7346,72 @@ msgid "Reset Windows"
 msgstr "Återställ fönster"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "Personlig Shop"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "Annonsera"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "Visa länkar i annonseringen"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "Efterfråga Trade"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -7395,46 +7428,46 @@ msgid "Skill points available: %d"
 msgstr "Skill points tillgängliga: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr "Skill Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr ""
 
@@ -7644,35 +7677,35 @@ msgid "Trade: You"
 msgstr "Trade: Dig"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "Du får %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "Byt"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "Du ger:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "Du har inte tillräckligt med pengar."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i "
 "fönstret."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -7747,7 +7780,7 @@ msgid "Change Login"
 msgstr "Ändra login"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Välj värld"
 
@@ -8922,9 +8955,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "Chatfönster"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9138,33 +9170,33 @@ msgstr "Anslutningen till servern avslutad. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "Misslyckades att radera karaktär."
 
@@ -9194,13 +9226,13 @@ msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -9217,7 +9249,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "Du blev frånkopplad från servern!"
 
@@ -9473,108 +9505,108 @@ msgid "You were killed by unknown source."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du har ännu inte nått required lvl!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Otillräckligt HP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Otillräckligt SP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Du har inga memos!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Du kan inte göra det just nu!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Verkar som att du behöver mer money... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kan inte använda denna skill med det vapnet!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Du behöver en till röd gem!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Du behöver en till blå gem!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Du bär för mycket för att kunna göra detta!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr ""
 
@@ -9682,8 +9714,53 @@ msgstr "Kan inte stjäla något..."
 msgid "Poison had no effect..."
 msgstr "Poison hade ingen effekt..."
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "Skriv lösenord:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+msgid "New pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+msgid "Enter new pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Ändra Kartvy-läge"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr ""
 
@@ -9703,7 +9780,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr ""
 
@@ -9711,9 +9788,8 @@ msgstr ""
 #. TRANSLATORS: clear fonts cache message
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
 msgid "Cache cleared"
-msgstr "Cache rensad"
+msgstr ""
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9731,9 +9807,8 @@ msgstr "Resurs-bilder:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "Resurs-bilder:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9756,24 +9831,24 @@ msgid "Log uploaded to:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
 msgstr ""
 
@@ -10026,57 +10101,57 @@ msgid "Accepting incoming trade requests"
 msgstr "Acceptera inkommande bytes-förfrågningar"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "Ansluter till server"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "Loggar in"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "Går in i spelvärld"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "Begär karaktärer"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "Ansluter till spelservern"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "Begär registreringsuppgifter"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Lösenordsändring"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "Lösenordsändring har lyckats!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "Byte av E-post"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "E-posten har ändrats!"
 
@@ -11354,6 +11429,3 @@ msgstr "%d sekund"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Föräldralösa resurs-bilder:"
diff --git a/po/tr.po b/po/tr.po
index c07210768..c1871c23a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"Last-Translator: Oben Devin Çetiner <hiironohige@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
 "tr/)\n"
 "Language: tr\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "Haritada görünür"
 
@@ -41,12 +41,12 @@ msgid "miss"
 msgstr "kaçırıldı"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "İ"
 
@@ -58,53 +58,53 @@ msgid "You were killed by %s."
 msgstr "%s tarafından öldürüldün."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "Var olmayan item toplanmaya çalışıldı."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "İtem çok ağır."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "İtem çok uzakta."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "Envanter dolu."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "Küme çok büyük."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "İtem başkasına ait."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr "Bu miktardaki itemi alamazsınız."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr "İtem kümesi maksimum miktarda."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "İtem toplamada bilinmeyen hata."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -113,58 +113,58 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "iş"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr "Takip et: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "Takip iptal edildi."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr "Taklit: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "Taklit iptal edildi"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr "%s görüyorsun"
@@ -405,9 +405,8 @@ msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Partikül efektleri"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
@@ -799,32 +798,35 @@ msgstr "Uzakta"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "TAMAM"
 
@@ -855,14 +857,14 @@ msgstr "(F) serbest kamera modu"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Kapat"
 
@@ -912,7 +914,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "varsayılan"
 
@@ -1151,7 +1153,7 @@ msgstr "Portuguese"
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:77
 msgid "Portuguese (Brazilian)"
-msgstr "Portuguese (Brazilian)"
+msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:79
@@ -1362,9 +1364,9 @@ msgstr "Guild: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "Yorum: %s"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1560,9 +1562,9 @@ msgstr "Konuş"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1580,7 +1582,7 @@ msgstr "Satın Al"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1650,8 +1652,8 @@ msgstr "Besle"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "Yeniden adlandır"
 
@@ -1675,7 +1677,7 @@ msgstr "Ganimet bırak"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1709,6 +1711,7 @@ msgstr "Sohbete isim ekle"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1741,10 +1744,11 @@ msgstr "Sohbete isim ekle"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "İptal"
@@ -1800,7 +1804,7 @@ msgstr "Kaldır"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr "Dönüştür"
 
@@ -1822,7 +1826,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Kıyafetler"
@@ -1854,8 +1858,10 @@ msgstr "Büyü düzenle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "Temizle"
 
@@ -2026,9 +2032,9 @@ msgstr "Tamamını takasa ekle"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "Sakla"
 
@@ -2065,8 +2071,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "Geri al"
 
@@ -2105,10 +2111,10 @@ msgstr "Tamamını geri al"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Kullan"
@@ -2261,7 +2267,7 @@ msgstr ""
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "Varsayılan"
 
@@ -2297,7 +2303,7 @@ msgstr "İhmal et"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Görmezden gel"
 
@@ -2403,8 +2409,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "Bırak..."
 
@@ -2419,7 +2425,7 @@ msgstr ""
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Bırak"
 
@@ -2478,7 +2484,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr ""
@@ -2696,10 +2702,10 @@ msgstr ""
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "Bilgi"
 
@@ -2891,7 +2897,7 @@ msgstr "Sohbet"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3204,7 +3210,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "En Fazla"
@@ -3216,9 +3222,9 @@ msgstr "En Fazla"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3232,7 +3238,7 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3259,9 +3265,9 @@ msgstr ""
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "Ekle"
@@ -3273,10 +3279,10 @@ msgstr "Ekle"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Çıkış"
 
@@ -3285,24 +3291,24 @@ msgstr "Çıkış"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Fiyat: %s / Toplam: %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Dünzenle"
 
@@ -3387,9 +3393,8 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "Göz kırp isim"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
@@ -3398,42 +3403,41 @@ msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "isme göre"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Müzik:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Harita:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Harita:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "İşaretçi:"
 
@@ -3444,224 +3448,232 @@ msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Haritadaki oyuncu sayısı:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Haritadaki oyuncu sayısı:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Oyuncu Konumu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr ""
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Yazılım)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr "%d FPS (SDL2 default)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Partikül sayısı: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Hedef:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "Hedef Adı:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr "Hedef grup:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Hedef Seviyesi:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Hedef Grup:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Lonca Hedefle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Gelen: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Giden: %d bytes/s"
@@ -3769,46 +3781,56 @@ msgstr ""
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
 #, fuzzy
-msgid "Guild / party / clan message sound"
-msgstr "Lonca / Grup mesaj sesi"
+msgid "Guild message sound"
+msgstr "Lonca yaratıldı."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-msgid "Highlight message sound"
+msgid "Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-msgid "Global message sound"
+msgid "Clan message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
-msgid "Error message sound"
+msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:163
+msgid "Global message sound"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:168
+msgid "Error message sound"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr "Takas isteği sesi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "mumble sesli sohbeti etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Müziği indir"
 
@@ -4334,27 +4356,27 @@ msgid "Assign"
 msgstr "Atamak"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "Sil"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "Tuş çatışması tespit edildi."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4365,50 +4387,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "Kalibrasyona başlamak için butona tıkla"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Kalibre et"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Oyun çubuğunu etkinleştir"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "Oyun çubuğu"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "Dur"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -4728,7 +4750,7 @@ msgstr "Ağırlık bildirimlerini etkinleştir"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "Mağaza"
 
@@ -4937,14 +4959,14 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "Hayır"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr "Performans"
 
@@ -5276,19 +5298,19 @@ msgstr "Fısıltılara izin ver"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Sil"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Görmezden gelirken:"
 
@@ -5360,8 +5382,8 @@ msgstr ""
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Tema"
 
@@ -5388,8 +5410,8 @@ msgstr "Tema Değiştirildi"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Değişikliklerin etkinleşmesi için istemcinizi tekrar başlatın."
 
@@ -5481,9 +5503,9 @@ msgstr "FPS limiti:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Alternatif FPS limiti: "
 
@@ -5493,98 +5515,98 @@ msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Özel imleç"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "Hiç"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "Pencere görünümüne geçilemedi ve eski hale geri dönüş başarısız oldu!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Tam ekrana geçilemedi ve eski hale geri dönüş başarısız oldu!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "Tam Ekrana Geçiliyor"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "Değişikliklerin etkili olması için yeniden başlatma gerekli."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "OpenGL'ye Değiştiriliyor"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL değişikliklerini uygulamak için yeniden başlatma gereklidir."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Özel çözünürlük (örnek: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "Yeni çözünürlük gir:                 "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "Ekran Çözünürlüğü Değiştirildi"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Bazı pencereler düşürülmüş çözünürlüğe uyması için taşınmış olabilir."
 
@@ -5920,7 +5942,7 @@ msgstr ""
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Yardım"
 
@@ -5975,7 +5997,7 @@ msgstr "EKP"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Ekipman"
 
@@ -6120,20 +6142,20 @@ msgstr "AYR"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Ayarlar"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "Tuş: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -6144,7 +6166,7 @@ msgid "Withdraw"
 msgstr ""
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr ""
 
@@ -6154,20 +6176,20 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "Oluştur"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr ""
 
@@ -6222,15 +6244,15 @@ msgstr "E-posta adresleri uyuşmuyor."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Hata"
 
@@ -6245,7 +6267,7 @@ msgstr "Şifre Değiştir"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "Şifre:"
 
@@ -6286,8 +6308,8 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "İsim:"
 
@@ -6302,16 +6324,16 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Lütfen %d puanı dağıt"
@@ -6320,71 +6342,71 @@ msgstr "Lütfen %d puanı dağıt"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "Saç Rengi:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "Saç Stili:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "Adınızda en az 4 karakter olması gerekir."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "Karakter istatistikleri TAMAM"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "Lütfen %d puanı eksilt"
@@ -6411,36 +6433,37 @@ msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "Oyna"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Hesabı Değiştir"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr ""
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6451,27 +6474,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr ""
 
@@ -6513,7 +6536,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Evet"
 
@@ -6554,42 +6577,42 @@ msgid "Connect"
 msgstr "Bağlan"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Bağlantı Noktası:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Sunucu Türü:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -6624,7 +6647,7 @@ msgstr ""
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr ""
@@ -6659,7 +6682,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6670,93 +6693,93 @@ msgid "Equip"
 msgstr "Donatmak"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "Hepsi"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "Takas yapılacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "Bırakılacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "Saklanacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "Depodan alınacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "Bölünecek nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "Satın alma mağazasına ekle."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "Satış mağazasına ekle."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "Bilinmeyen."
 
@@ -6766,52 +6789,52 @@ msgid "Reset stats"
 msgstr "İstatistikleri sıfırla"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "Sayacı sıfırla"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Bir üst levele kadar ortalama canavar sayısı: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -6819,40 +6842,40 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "Oturum Aç"
 
@@ -6875,29 +6898,29 @@ msgstr "Sunucu Değiştir"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "Kayıt ol"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "Elle güncelleme sunucusu"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "Sunucu:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr ""
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr ""
 
@@ -6918,14 +6941,14 @@ msgstr "Alıcı:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr ""
 
@@ -6936,7 +6959,7 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr ""
 
@@ -6960,22 +6983,22 @@ msgid "Get attach"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr ""
 
@@ -6985,24 +7008,29 @@ msgid "Refresh"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr ""
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7144,62 +7172,62 @@ msgid "Switch character"
 msgstr "Karakter değiştir"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Onayla:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "Erkek"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "Kadın"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "E-Posta:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Parolalar uyuşmuyor."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr ""
 
@@ -7209,48 +7237,52 @@ msgid "Choose Your Server"
 msgstr "Sunucunu Seç"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Yükle"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
+#: src/gui/windows/serverdialog.cpp:139
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr ""
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 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:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Sunucu listesi indiriliyor...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "Sunucu bekleniyor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "İndirmeye hazırlanılıyor"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "Sunucu listesi alma hatası!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "daha yeni bir sürüm gerektirir"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "v%s gerektirir"
@@ -7308,72 +7340,72 @@ msgid "Reset Windows"
 msgstr "Pencereleri sıfırla"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "Kişisel Mağaza"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "Duyuru"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "Duyuruda linkleri göster"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "Takas isteği yolla"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -7390,46 +7422,46 @@ msgid "Skill points available: %d"
 msgstr "Mevcut yetenek puanları: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr "Yetenek Seti %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "Yetenek %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr ""
 
@@ -7639,35 +7671,35 @@ msgid "Trade: You"
 msgstr "Takas: Sen"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "%s alıyorsun"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "Değiştir"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "Verdiğin:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "Yeterli paran yok."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 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 "
 "koyamazsınız."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -7742,7 +7774,7 @@ msgid "Change Login"
 msgstr "Hesabı Değiştir"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Dünya Seç"
 
@@ -8917,9 +8949,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "Sohbet Penceresi"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9128,33 +9159,33 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr ""
 
@@ -9184,13 +9215,13 @@ msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -9207,7 +9238,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr ""
 
@@ -9463,108 +9494,108 @@ msgid "You were killed by unknown source."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr ""
 
@@ -9672,8 +9703,52 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+msgid "Enter pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+msgid "New pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+msgid "Enter new pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Harita Görüş Modunu değiştir"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr "Hakkında"
 
@@ -9693,7 +9768,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr "Dosya yüklendi"
 
@@ -9701,9 +9776,8 @@ msgstr "Dosya yüklendi"
 #. TRANSLATORS: clear fonts cache message
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
 msgid "Cache cleared"
-msgstr "Bellek temizlendi"
+msgstr ""
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9721,9 +9795,8 @@ msgstr "Kaynak resimleri:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "Kaynak resimleri:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9732,9 +9805,8 @@ msgstr "Çevre değişkenleri yığıldı"
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1638
-#, fuzzy
 msgid "Config uploaded to:"
-msgstr "Dosya yüklendi"
+msgstr ""
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1648
@@ -9743,29 +9815,28 @@ msgstr ""
 
 #. TRANSLATORS: upload log chat message
 #: src/progs/manaplus/actions/actions.cpp:1658
-#, fuzzy
 msgid "Log uploaded to:"
-msgstr "Log kayıtları şuraya yüklendi:"
+msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
 msgstr ""
 
@@ -10018,57 +10089,57 @@ msgid "Accepting incoming trade requests"
 msgstr "Gelen takas istekleri kabul ediliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "Sunucuya bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "Giriş yapılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "Oyun dünyasına giriliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "Karakterler isteniliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "Oyun sunucusuna bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "Oyun sunucusu değiştiriliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "Kayıt detayları isteniyor"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Şifre Değiştir"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "Şifreniz başarı ile değiştirildi!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "E-posta Değiştir"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "E-posta başarı ile değiştirildi!"
 
@@ -11345,12 +11416,3 @@ msgstr "%d saniye"
 #, c-format
 msgid "%d seconds"
 msgstr "%d saniyeler"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Edinilmiş kaynak resimleri:"
-
-#~ msgid "Uploaded config into:"
-#~ msgstr "Config bilgisi şuraya yüklendi:"
-
-#~ msgid "Uploaded server config into:"
-#~ msgstr "Server configi şuraya yüklendi:"
diff --git a/po/uk.po b/po/uk.po
index 932bfdd97..df508f406 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,20 +10,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"Last-Translator: William Lee <v4r@trioptimum.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
 "uk/)\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != "
+"11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % "
+"100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || "
+"(n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "Видимий на мапі"
 
@@ -42,12 +44,12 @@ msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "I"
 
@@ -59,114 +61,115 @@ msgid "You were killed by %s."
 msgstr "Вас вбив %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "Спроби підняти неіснуючий предмет."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "Предмет занадто важкий."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "Предмет задалеко щоб підняти."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "В сумці немає місця."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "Забагато предметів у купі."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "Предмет належить комусь іншому."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr "Не можливо підняти стільки предметів."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr "Кількість цих предметів досягла межі."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "Невстановлена помилка під час спроби підняти предмет."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Ви підняли %d [@@%d|%s@@]."
 msgstr[1] "Ви підняли %d [@@%d|%s@@]."
 msgstr[2] "Ви підняли %d [@@%d|%s@@]."
+msgstr[3] "Ви підняли %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "досвід"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "робота"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr "Йти слідом за: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "Слідкування відмінено"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr "Імітація: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "Імітацію відмінено"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr "Ти бачиш %s"
@@ -404,15 +407,13 @@ msgstr "Мережева помилка"
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:831
-#, fuzzy
 msgid "Auto disable Show beings transparency"
-msgstr "Обробляти прозорість для істот"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "Ефекти частинок"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
@@ -804,32 +805,35 @@ msgstr "Відсутній"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "ОК"
 
@@ -860,14 +864,14 @@ msgstr "(F) вільний режим камери"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "Закрити"
 
@@ -915,7 +919,7 @@ msgstr "Ви навантажені менш, ніж на половину. Те
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "за замовчуванням"
 
@@ -1365,9 +1369,9 @@ msgstr "Гільдія: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "Примітка: %s"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1563,9 +1567,9 @@ msgstr "Діалог"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1583,7 +1587,7 @@ msgstr "Придбати"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1653,8 +1657,8 @@ msgstr "Нагодувати"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "Перейменувати"
 
@@ -1678,7 +1682,7 @@ msgstr "Скинути дропи"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1712,6 +1716,7 @@ msgstr "Додати ім'я до чату"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1744,10 +1749,11 @@ msgstr "Додати ім'я до чату"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "Скасувати"
@@ -1803,7 +1809,7 @@ msgstr "Видалити"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr "Телепорт"
 
@@ -1825,7 +1831,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "Швидке спорядження"
@@ -1857,8 +1863,10 @@ msgstr "Редагувати заклинання"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "Скинути"
 
@@ -2029,9 +2037,9 @@ msgstr "Додати всю кількість"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "Зберегти"
 
@@ -2068,8 +2076,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "Вилучити"
 
@@ -2108,10 +2116,10 @@ msgstr "Вилучити всю кількість"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Використати"
@@ -2264,7 +2272,7 @@ msgstr ""
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "За замовчуванням"
 
@@ -2300,7 +2308,7 @@ msgstr "Зневажати"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "Ігнорувати"
 
@@ -2406,8 +2414,8 @@ msgstr "Захистити предмет"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "Кинути..."
 
@@ -2422,7 +2430,7 @@ msgstr "Кинути все"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "Кинути"
 
@@ -2481,7 +2489,7 @@ msgstr "Сховище"
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr "Візок"
@@ -2699,10 +2707,10 @@ msgstr ""
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "Відомості"
 
@@ -2894,7 +2902,7 @@ msgstr "Чат"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3207,7 +3215,7 @@ msgstr "Точка шляху"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "Все"
@@ -3219,9 +3227,9 @@ msgstr "Все"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3235,7 +3243,7 @@ msgstr "Рівень: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3262,9 +3270,9 @@ msgstr "Відвідати посилання"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "Додати"
@@ -3276,10 +3284,10 @@ msgstr "Додати"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Вийти"
 
@@ -3288,24 +3296,24 @@ msgstr "Вийти"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Ціна: %s / Загалом: %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "Редагувати"
 
@@ -3390,54 +3398,51 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "Блимаюче ім'я"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
-#, fuzzy
 msgid "Master name"
-msgstr "Стерті"
+msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "Імена ГМ'ів"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "Музика:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "Мапа:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "Мінімапа:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "Вказівник:"
 
@@ -3448,224 +3453,232 @@ msgstr "Число ефектів частинок:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "Кількість об'єктів:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Кількість об'єктів:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "Позиція гравця:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr "Викликів малюв.:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr "Зв'язаних текстур:"
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Програмно)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr "%d FPS (звичайний OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr "%d FPS (безпечний OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr "%d FPS (новітній OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr "%d FPS (з SDL2)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr "Кількість текстур:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "Кількість частинок: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "Ціль:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "ID цілі:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr "Тип цілі:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr "Рівень цілі:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr "Раса цілі:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr "Група цілі:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr "Гільдія цілі:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "Затримка атаки:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr "Найменше ушкодження:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr "Найбільше ушкодження:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr "Критичне ушкодження:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr "Карма:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr "Манери:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "Рівень цілі:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "Група цілі:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "Гільдія цілі:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Пінг: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "В: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Із: %d bytes/s"
@@ -3773,46 +3786,58 @@ msgstr "Звук приватного повідомлення"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
 #, fuzzy
-msgid "Guild / party / clan message sound"
-msgstr "Повідомлення гільдії/групи"
+msgid "Guild message sound"
+msgstr "Звук глобального оповіщення"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "Звук помилки"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+#, fuzzy
+msgid "Clan message sound"
+msgstr "Звук глобального оповіщення"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
 msgid "Highlight message sound"
 msgstr "Звук привернення уваги"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Global message sound"
 msgstr "Звук глобального оповіщення"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Error message sound"
 msgstr "Звук помилки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr "Звук пропозиції торгівлі"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr "Звук відкриття вікна"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr "Звук ховання вікна"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "Увімкнути голосовий чат Mumble"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "Завантажити музику"
 
@@ -4337,27 +4362,27 @@ msgid "Assign"
 msgstr "Призначити"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "Відмінити"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr "Скинути всі клавіші"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr "Введення"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "Деякі клавіші дублюють одна одну."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4368,50 +4393,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr "невідоме"
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "Натисніть кнопку для початку налаштування"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Налаштування"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr "Виявити джойстики"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Використовувати джойстик"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr "Використовувати джойстик якщо вікно гри неактивне"
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "Джойстик"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "Зупинити"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr "Обертайте стік та не натискайте кнопки"
 
@@ -4731,7 +4756,7 @@ msgstr "Повідомляти про вагове перенавантажен�
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "Крамниця"
 
@@ -4940,14 +4965,14 @@ msgstr "Немає доступних модів"
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "Ні"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr "Продуктивність"
 
@@ -5284,19 +5309,19 @@ msgstr "Дозволити шепіт (приватне спілкування)"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Видалити"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr "Стосунки"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "Коли ігнорується:"
 
@@ -5368,8 +5393,8 @@ msgstr "Інфо"
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "Теми"
 
@@ -5396,8 +5421,8 @@ msgstr "Дата модифікації"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "Перезавантажте клієнт, щоб застосувати зміни."
 
@@ -5489,9 +5514,9 @@ msgstr "Обмеження частоти кадрів:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr "Альтернативний FPS ліміт: "
 
@@ -5501,98 +5526,98 @@ msgid "Detect best mode"
 msgstr "Визначити кращій режим"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr "Показувати вказівник"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "Гарний вказівник"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr "Дозволити змінювати розмір клієнту"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr "Без рамки"
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "Відео"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "Ні"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "Не вдалося встановити режим і відновити попередній!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Не вдалося встановити режим і відновити попередній!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "Перемикання на повний екран"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "Потрібно перезапустити для застосування змін."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "Перемикання OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "Потрібно перезапустити для застосування змін OpenGL."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Користовацька роздільність (наприклад, 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "Введіть нову роздільність:           "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "Розподільчу здатність встановлено"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Вікна можуть змінювати позиції при зменшені розміру клієнту."
 
@@ -5928,7 +5953,7 @@ msgstr "ДОВ"
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "Довідка"
 
@@ -5983,7 +6008,7 @@ msgstr "СПР"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "Спорядження"
 
@@ -6128,20 +6153,20 @@ msgstr "НАЛ"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "Налаштування"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "Клавіша: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr "Рахунок у банку: %s"
@@ -6152,7 +6177,7 @@ msgid "Withdraw"
 msgstr "Зняти"
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr "Покласти"
 
@@ -6162,20 +6187,20 @@ msgid "Create items"
 msgstr "Створення предметів"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr "Кількість:"
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "Створити"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr ""
 
@@ -6230,15 +6255,15 @@ msgstr "Адреси скриньок не спідпадають."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "Помилка"
 
@@ -6253,7 +6278,7 @@ msgstr "Змінити пароль"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "Пароль:"
 
@@ -6294,8 +6319,8 @@ msgstr "Новий персонаж"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "Ім'я:"
 
@@ -6310,16 +6335,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Будь ласка, розподіліть %d балів"
@@ -6328,71 +6353,71 @@ msgstr "Будь ласка, розподіліть %d балів"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "Колір волосся:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "Зачіска:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr "Раса:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr "Вигляд:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr "П"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ім'я повинно містити принаймні 4 символи."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "Характеристики персонажа в нормі"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "Будь ласка, видаліть %d балів"
@@ -6419,36 +6444,37 @@ msgid "Switch"
 msgstr "Назад до логіну"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr "Пароль"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "Увійти"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Заміна"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr "Акаунт %s"
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr "Будь ласка, встановіть новий пін код"
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr "Будь ласка, вкажіть нове ім'я"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6459,27 +6485,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "Неправильний пароль!"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "Вкажіть пароль для видалення персонажу"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "Пароль:"
 
@@ -6521,7 +6547,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "Так"
 
@@ -6562,42 +6588,42 @@ msgid "Connect"
 msgstr "З'єднання"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr "Вжити той самий IP"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr "Адреса:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "Порт:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "Тип серверу:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr "Опис:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr "Посилання онлайн списку:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr "Будь ласка, надайте хоча б порт і адресу серверу."
 
@@ -6632,7 +6658,7 @@ msgstr ""
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr "Невідомий"
@@ -6667,7 +6693,7 @@ msgstr "Вставити"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6678,93 +6704,93 @@ msgid "Equip"
 msgstr "Вдягнути"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "Все"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "Вкажіть кількість предметів для торгівлі."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "Вкажіть кількість предметів, щоб кинути."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "Вкажіть кількість предметів для зберігання."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "Вкажіть кількість предметів для отримання."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "Вкажіть кількість предметів для розподілу."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "Продавати до списку купівлі."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "Додати до списку продажу."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "Невідомо."
 
@@ -6774,95 +6800,97 @@ msgid "Reset stats"
 msgstr "Скинути характеристики"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "Скинути таймер"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Вбито: %s, загальний досвід: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Середній досвід: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Скільки сер. мобів до наступного рівня: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Вбивств/хв.: %s, досвід/хв.: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Середній досвід за %d хвилину: %s"
 msgstr[1] "Середній досвід за %d хвилини: %s"
 msgstr[2] "Середній досвід за %d хвилин: %s"
+msgstr[3] "Середній досвід за %d хвилин: %s"
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Час до наступного рівня (оцінка за %d хв.): %s"
 msgstr[1] "Час до наступного рівня (оцінка за %d хв.): %s"
 msgstr[2] "Час до наступного рівня (оцінка за %d хв.): %s"
+msgstr[3] "Час до наступного рівня (оцінка за %d хв.): %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr "Досвід з останнього мобу:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Рівень: %d на %f%%"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Час до наступного рівня: %s"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "Логін"
 
@@ -6885,29 +6913,29 @@ msgstr "Змінити сервер"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "Реєстрація"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "Користувацька адреса оновлень"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "Сервер:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr "Відкрити посилання реєстрації"
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr ""
 
@@ -6928,14 +6956,14 @@ msgstr "Для:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr ""
 
@@ -6946,7 +6974,7 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr ""
 
@@ -6970,22 +6998,22 @@ msgid "Get attach"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr ""
 
@@ -6995,24 +7023,29 @@ msgid "Refresh"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr ""
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7154,62 +7187,62 @@ msgid "Switch character"
 msgstr "Змінити персонаж"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "Підтвердіть:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "Чоловік"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "Жінка"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "Пошта:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr "Ім'я користувача повинне складатись хоча б з %u символів."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr "Ім'я користувача повинне складатись не більш, як з %u символів."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr "Пароль повинен складатись мінімум з %u символів."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr "Пароль повинен складатись менш, ніж з %u символів."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "Неідентичні паролі."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr "Некоректна електронна пошта."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr ""
 
@@ -7219,48 +7252,53 @@ msgid "Choose Your Server"
 msgstr "Оберіть сервер"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "Завантажити"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Вибрати сервер  *** БЕЗПЕЧНИЙ РЕЖИМ ***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "Вибрати сервер  *** БЕЗПЕЧНИЙ РЕЖИМ ***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 msgid "Use same ip for game sub servers"
 msgstr "Вжити той самий IP для ігрових підсерверів"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Завантажую список серверів... %2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "Очікування відповіді сервера..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "Готуюсь до завантаження"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "Помилка при завантаженні списку серверів!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "потребує новішої версії клієнта"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "потребує v%s"
@@ -7318,72 +7356,72 @@ msgid "Reset Windows"
 msgstr "Скинути налаштування вікон"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "Особиста крамниця"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "Анонс"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "Посилання у анонсі"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "Запит на торгівлю"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -7400,46 +7438,46 @@ msgid "Skill points available: %d"
 msgstr "Балів вмінь: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr "Група вмінь %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "Вміння %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "Рівень: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Невдале вміння: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr ""
 
@@ -7649,33 +7687,33 @@ msgid "Trade: You"
 msgstr "Торгівля: ти"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "Ти отримуєш: %s."
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "Заміна"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "Ти віддаєш:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "У тебе недостатньо коштів."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Не вдається додати предмет. Не можна накладати предмети одного типу."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -7750,7 +7788,7 @@ msgid "Change Login"
 msgstr "Заміна"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "Оберіть світ"
 
@@ -8925,9 +8963,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "Вікно банку"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9138,33 +9175,33 @@ msgstr "З'єднання з сервером припинене. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr "Помилка переіменування персонажу."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr "Персонаж переіменовано."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr "Переіменування не дозволене."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr "Нове ім'я не вжито."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr "Персонаж не знайдено."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "Неможливо видалити персонаж."
 
@@ -9194,13 +9231,13 @@ msgid "Work in progress."
 msgstr "Чекаємо на результат."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "Неможливо відправити повідомлення, канал %s не існує."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "Неможливо відкрити канал, канал %s не існує."
@@ -9217,7 +9254,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "Відключений від серверу!"
 
@@ -9473,108 +9510,108 @@ msgid "You were killed by unknown source."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Невідома похибка вміння: %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "У вас недостатній рівень!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Недостатньо здоров'я!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Недостатньо мани!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Записи порожні!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Не можна зробити це прямо зараз!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Здається, в вас замало грошей... ;C"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Не можна вжити вміння з цим типом зброї!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Вам потрібен інший червоний самоцвіт!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Вам потрібний інший синій самоцвіт!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Ви забагато тримаєте, щоб це зробити!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr ""
 
@@ -9682,8 +9719,55 @@ msgstr "Нічого не вдалось поцупити..."
 msgid "Poison had no effect..."
 msgstr "Отрута не подіяла..."
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "Пароль:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+#, fuzzy
+msgid "New pincode"
+msgstr "Будь ласка, встановіть новий пін код"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+#, fuzzy
+msgid "Enter new pincode"
+msgstr "Будь ласка, встановіть новий пін код"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Змінити режим мапи"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr "Про програму"
 
@@ -9703,7 +9787,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файл_рядків_кольору файл_призначення"
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr "Файл завантажено"
 
@@ -9711,9 +9795,8 @@ msgstr "Файл завантажено"
 #. TRANSLATORS: clear fonts cache message
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
 msgid "Cache cleared"
-msgstr "Кеш прибрано"
+msgstr ""
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9731,9 +9814,8 @@ msgstr "Зображень:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "Зображень:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9742,9 +9824,8 @@ msgstr "Змінні середовища збережені"
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1638
-#, fuzzy
 msgid "Config uploaded to:"
-msgstr "Файл завантажено"
+msgstr ""
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1648
@@ -9753,29 +9834,28 @@ msgstr ""
 
 #. TRANSLATORS: upload log chat message
 #: src/progs/manaplus/actions/actions.cpp:1658
-#, fuzzy
 msgid "Log uploaded to:"
-msgstr "Завантажений лог:"
+msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
 msgstr ""
 
@@ -10030,57 +10110,57 @@ msgid "Accepting incoming trade requests"
 msgstr "Приймання вхідних пропозицій торгівлі"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "Очікування відповіді сервера"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "Авторизація..."
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "Поринаємо в ігровий всесвіт..."
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "Завантаження списку персонажів..."
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "Приєднання до серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "Зміна ігрового серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "Запитуємо деталі реєстрації"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "Змінити пароль"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "Пароль змінено!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "Змінити імейл"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "Імейл змінено!"
 
@@ -11358,12 +11438,3 @@ msgstr "%d секунда"
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Вилучених зображень:"
-
-#~ msgid "Uploaded config into:"
-#~ msgstr "Завантажений конфіг:"
-
-#~ msgid "Uploaded server config into:"
-#~ msgstr "Завантажена конфігурація сервера:"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 926935faf..20469cb98 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_CN/)\n"
@@ -27,7 +27,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "在地图上可见"
 
@@ -46,12 +46,12 @@ msgid "miss"
 msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "I"
 
@@ -63,53 +63,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "项目是太重了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "物品太远了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -117,58 +117,58 @@ msgstr[0] "你拾起%d[@@%d|%s @@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -409,9 +409,8 @@ msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "粒子效果"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
@@ -803,32 +802,35 @@ msgstr "距离"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "确定"
 
@@ -859,14 +861,14 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "关闭"
 
@@ -912,7 +914,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "默认"
 
@@ -1362,9 +1364,9 @@ msgstr "工会:%s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "评论: %s"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1560,9 +1562,9 @@ msgstr "说话"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1580,7 +1582,7 @@ msgstr "购买"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1650,8 +1652,8 @@ msgstr ""
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "重命名"
 
@@ -1675,7 +1677,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1709,6 +1711,7 @@ msgstr ""
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1741,10 +1744,11 @@ msgstr ""
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "取消"
@@ -1800,7 +1804,7 @@ msgstr ""
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr ""
 
@@ -1822,7 +1826,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "套装"
@@ -1854,8 +1858,10 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "清除"
 
@@ -2026,9 +2032,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "存储"
 
@@ -2065,8 +2071,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "取回"
 
@@ -2105,10 +2111,10 @@ msgstr "检索所有"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "使用"
@@ -2261,7 +2267,7 @@ msgstr ""
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "预设"
 
@@ -2297,7 +2303,7 @@ msgstr ""
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "忽略"
 
@@ -2403,8 +2409,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "掉落..."
 
@@ -2419,7 +2425,7 @@ msgstr "所有"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "丢弃"
 
@@ -2478,7 +2484,7 @@ msgstr "仓库"
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr ""
@@ -2696,10 +2702,10 @@ msgstr ""
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr "信息"
 
@@ -2891,7 +2897,7 @@ msgstr "聊天"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3204,7 +3210,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr "最大"
@@ -3216,9 +3222,9 @@ msgstr "最大"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr "+"
 
@@ -3232,7 +3238,7 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3259,9 +3265,9 @@ msgstr ""
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "添加"
@@ -3273,10 +3279,10 @@ msgstr "添加"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "退出"
 
@@ -3285,24 +3291,24 @@ msgstr "退出"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr "-"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "价格: %s / 总价: %s"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr "编辑"
 
@@ -3387,9 +3393,8 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "未知怪兽"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
@@ -3398,42 +3403,41 @@ msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "地图项"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr "音乐:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr "地图:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr "小地图:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr "光标:"
 
@@ -3444,224 +3448,232 @@ msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr "地图演员数:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "地图演员数:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr "的位置:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr ""
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr "%d的FPS"
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (软件)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr "粒子数: %d个"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr "目标:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr "目标ID:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr "攻击延迟:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr "目标水平:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr "目标:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr "目标公会:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "输入:%d 字节/"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -3768,46 +3780,57 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-msgid "Guild / party / clan message sound"
-msgstr ""
+#, fuzzy
+msgid "Guild message sound"
+msgstr "工会会长: %s"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
-msgid "Highlight message sound"
+msgid "Party message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:153
-msgid "Global message sound"
+msgid "Clan message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:158
-msgid "Error message sound"
+msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:163
-msgid "Trade request sound"
+msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:168
-msgid "Show window sound"
+msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:173
-msgid "Hide window sound"
+msgid "Trade request sound"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:178
+msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:183
+msgid "Hide window sound"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr "启用语音聊天"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr "下载音乐"
 
@@ -4332,27 +4355,27 @@ msgid "Assign"
 msgstr "分配"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr "取消分配"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "检测到按键冲突."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4361,50 +4384,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "按下开始校准按钮"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "校准"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "启用游戏杆"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "游戏杆"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "停止"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -4724,7 +4747,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "商店"
 
@@ -4933,14 +4956,14 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "否"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr ""
 
@@ -5272,19 +5295,19 @@ msgstr "允许密语"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "删除"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr "关系"
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "当忽略时:"
 
@@ -5356,8 +5379,8 @@ msgstr ""
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "主题"
 
@@ -5384,8 +5407,8 @@ msgstr "主题更改"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr "重启您的游戏客户端以使变更生效."
 
@@ -5477,9 +5500,9 @@ msgstr "FPS限制:"
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr ""
 
@@ -5489,98 +5512,98 @@ msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "自定义鼠标"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "视频"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr "w"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "切换到窗口模式，并恢复旧的模式，也没有失败!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr "切换到全屏"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "重启生效."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr "切换到OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr "自定义分辨率 (例如: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr "输入新的分辨率:                 "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr "屏幕分辨率已更改"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -5916,7 +5939,7 @@ msgstr ""
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "帮助"
 
@@ -5971,7 +5994,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "装备"
 
@@ -6116,20 +6139,20 @@ msgstr "SET"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "设置"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr "按键: %s"
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -6140,7 +6163,7 @@ msgid "Withdraw"
 msgstr ""
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr ""
 
@@ -6150,20 +6173,20 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "建立"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr "过滤器:"
 
@@ -6218,15 +6241,15 @@ msgstr "电子邮件地址不匹配."
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "错误"
 
@@ -6241,7 +6264,7 @@ msgstr "更换密码"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "密码:"
 
@@ -6282,8 +6305,8 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "姓名:"
 
@@ -6298,16 +6321,16 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "请分发%d点数"
@@ -6316,71 +6339,71 @@ msgstr "请分发%d点数"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr "头发颜色:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr "发型:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字需要至少4个字符."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "角色状态可以"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "请删除%d点数"
@@ -6407,36 +6430,37 @@ msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "开始"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "切换登陆"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr ""
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6447,27 +6471,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr "不正确的密码"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr "删除字符输入的密码"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr "输入密码:"
 
@@ -6509,7 +6533,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "是"
 
@@ -6550,42 +6574,42 @@ msgid "Connect"
 msgstr "连接"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "端口:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr "服务器类型:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -6620,7 +6644,7 @@ msgstr ""
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr ""
@@ -6655,7 +6679,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6666,93 +6690,93 @@ msgid "Equip"
 msgstr "装备"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr "全部"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "请选择交易的物品数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "请选择丢弃的物品数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr "请选择存储的物品数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr "请选择取回的物品数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "请选择你分离的物品的数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr "添加到购买商店."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr "添加到出售商店."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr "未知."
 
@@ -6762,91 +6786,91 @@ msgid "Reset stats"
 msgstr "复位统计"
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr "复位定时器"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr "最后EXP:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "等级:%d 在 %f%%"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "登录"
 
@@ -6869,29 +6893,29 @@ msgstr "更改服务器"
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "注册"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr "自定义更新主机"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "服务器:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr ""
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr ""
 
@@ -6912,14 +6936,14 @@ msgstr "至:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr ""
 
@@ -6930,7 +6954,7 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr ""
 
@@ -6954,22 +6978,22 @@ msgid "Get attach"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr ""
 
@@ -6979,24 +7003,29 @@ msgid "Refresh"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr ""
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7138,62 +7167,62 @@ msgid "Switch character"
 msgstr "交换角色"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "确认:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "帅哥"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "美女"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "电子邮件:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr ""
 
@@ -7203,48 +7232,53 @@ msgid "Choose Your Server"
 msgstr "选择您的服务器"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr "负载"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "选择你的服务器***安全模式***"
 
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr "选择你的服务器***安全模式***"
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 msgid "Use same ip for game sub servers"
 msgstr "游戏分服务器使用相同的IP"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "下载服务器列表...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr "等待服务器..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr "准备下载"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr "恢复服务器列表错误!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr "需要较新版本"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr "需要 v%s"
@@ -7302,72 +7336,72 @@ msgid "Reset Windows"
 msgstr "重置窗口"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr "个人商店"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr "公布"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr "显示在公布的联系"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr "请求交易"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -7384,46 +7418,46 @@ msgid "Skill points available: %d"
 msgstr "技能点: %d个"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr "技能为%d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr "等级: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr ""
 
@@ -7633,33 +7667,33 @@ msgid "Trade: You"
 msgstr "交易: 你"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr "你得到%s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "改变"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "你给予:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -7734,7 +7768,7 @@ msgid "Change Login"
 msgstr "切换登陆"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "选择世界"
 
@@ -8909,9 +8943,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "聊天窗口"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9122,33 +9155,33 @@ msgstr "连接到服务器终止. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "删除角色失败."
 
@@ -9178,13 +9211,13 @@ msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -9201,7 +9234,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "和服务器失去连接!"
 
@@ -9457,108 +9490,108 @@ msgid "You were killed by unknown source."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你还没有达到足够的等级!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "没有备忘录!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "你无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "看起来需要更多金币... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器无法用来使用此项技能!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "你已负重太多，无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr ""
 
@@ -9666,8 +9699,53 @@ msgstr "无法偷取任何物品..."
 msgid "Poison had no effect..."
 msgstr "毒药无效..."
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "输入密码:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+msgid "New pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+msgid "Enter new pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "更改地图浏览模式"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr "关于"
 
@@ -9687,7 +9765,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr ""
 
@@ -9738,24 +9816,24 @@ msgid "Log uploaded to:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
 msgstr ""
 
@@ -10008,57 +10086,57 @@ msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "正在连接服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "登录中"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "请求角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "正在连接游戏服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "更改密码"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "密码更改成功!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功!"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 3d863a5b7..25bbea287 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"Last-Translator: Pak Long Wu <paklongwu1006@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_HK/)\n"
 "Language: zh_HK\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
 msgid "Visible on map"
 msgstr "在地圖上可見"
 
@@ -40,12 +40,12 @@ msgid "miss"
 msgstr "失誤"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
 msgid "I"
 msgstr "I"
 
@@ -57,53 +57,53 @@ msgid "You were killed by %s."
 msgstr "你已被 %s 殺死."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
 msgid "Tried to pick up nonexistent item."
 msgstr "曾試圖拿起不存在的物品."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
 msgid "Item is too heavy."
 msgstr "該物品太重."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
 msgid "Item is too far away."
 msgstr "該物品太遠."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
 msgid "Inventory is full."
 msgstr "背包已滿."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
 msgid "Stack is too big."
 msgstr "數目太大."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
 msgid "Item belongs to someone else."
 msgstr "該物品屬於其他人."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
 msgid "You can't pickup this amount of items."
 msgstr "你不能拿起這個數量的物品."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
 msgid "Your item stack has max amount."
 msgstr "你的物品數量已達最大限額."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
 msgid "Unknown problem picking up item."
 msgstr "拿起物品時遇到不明錯誤."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -111,58 +111,58 @@ msgstr[0] "你拾取了 %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
 msgid "xp"
 msgstr "經驗值"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
 msgid "job"
 msgstr "勞動值"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
 msgid "hp"
 msgstr "生命值"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
 msgid "mana"
 msgstr "法力值"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
 #, c-format
 msgid "Follow: %s"
 msgstr "跟隨: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
 msgid "Follow canceled"
 msgstr "已取消跟隨."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
 #, c-format
 msgid "Imitation: %s"
 msgstr "模仿:%s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
 msgid "Imitation canceled"
 msgstr "已取消模仿."
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
 #, c-format
 msgid "You see %s"
 msgstr "你看到 %s"
@@ -403,9 +403,8 @@ msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:852
-#, fuzzy
 msgid "Auto lower Particle effects"
-msgstr "粒子效果"
+msgstr ""
 
 #. TRANSLATORS: auto adjust settings message
 #: src/game.cpp:873
@@ -797,32 +796,35 @@ msgstr "暫離鍵盤"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
 #: src/gui/widgets/tabs/setup_theme.cpp:326
 #: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
 #: src/gui/windows/changeemaildialog.cpp:171
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
 msgid "OK"
 msgstr "確定"
 
@@ -853,14 +855,14 @@ msgstr "(F) 自由鏡頭模式"
 #. TRANSLATORS: ok dialog button
 #: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
 #: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
 msgid "Close"
 msgstr "關閉"
 
@@ -906,7 +908,7 @@ msgstr "您在攜帶少於體重一半的物品.你可以回復生命值了."
 #: src/gui/widgets/tabs/setup_misc.cpp:100
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
 msgid "default"
 msgstr "默認"
 
@@ -1356,9 +1358,9 @@ msgstr "公會：%s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
 msgid "Clan: %s"
-msgstr "評語：%s"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:222
@@ -1554,9 +1556,9 @@ msgstr "對話"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
 #: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:170
 msgid "Buy"
@@ -1574,7 +1576,7 @@ msgstr "購買"
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
 #: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:172
 msgid "Sell"
@@ -1644,8 +1646,8 @@ msgstr "餵食"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
 msgid "Rename"
 msgstr "重新命名"
 
@@ -1669,7 +1671,7 @@ msgstr "丟棄"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -1703,6 +1705,7 @@ msgstr "把名字加至對話"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1735,10 +1738,11 @@ msgstr "把名字加至對話"
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
 #: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
 msgid "Cancel"
 msgstr "取消"
@@ -1794,7 +1798,7 @@ msgstr "清除"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
 msgid "Warp"
 msgstr "傳送"
 
@@ -1816,7 +1820,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/outfitwindow.cpp:61
 msgid "Outfits"
 msgstr "裝備"
@@ -1848,8 +1852,10 @@ msgstr "編輯咒語"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
 msgid "Clear"
 msgstr "清除"
 
@@ -2020,9 +2026,9 @@ msgstr "把 全部 加至交易"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
 msgid "Store"
 msgstr "儲存"
 
@@ -2059,8 +2065,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
 msgid "Retrieve"
 msgstr "取回"
 
@@ -2099,10 +2105,10 @@ msgstr "取回 全部"
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
 #: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "使用"
@@ -2255,7 +2261,7 @@ msgstr ""
 #. TRANSLATORS: skill cast type
 #. TRANSLATORS: button in input settings tab
 #: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Default"
 msgstr "預設"
 
@@ -2291,7 +2297,7 @@ msgstr "無視"
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
 msgid "Ignore"
 msgstr "忽略"
 
@@ -2397,8 +2403,8 @@ msgstr "保護物件"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
 msgid "Drop..."
 msgstr "丟棄..."
 
@@ -2413,7 +2419,7 @@ msgstr "丟棄全部"
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
 msgid "Drop"
 msgstr "丟棄"
 
@@ -2472,7 +2478,7 @@ msgstr ""
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
 #: src/resources/inventory/inventory.cpp:375
 msgid "Cart"
 msgstr ""
@@ -2690,10 +2696,10 @@ msgstr ""
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
 msgid "Info"
 msgstr ""
 
@@ -2885,7 +2891,7 @@ msgstr "聊天"
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
 #: src/gui/widgets/tabs/setup_chat.cpp:325
 #: src/gui/widgets/tabs/setup_misc.cpp:500
 #: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3198,7 +3204,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
 #: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
 msgid "Max"
 msgstr ""
@@ -3210,9 +3216,9 @@ msgstr ""
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
 msgid "+"
 msgstr ""
 
@@ -3226,7 +3232,7 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
 #: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
 #, c-format
 msgid "Money: %s"
@@ -3253,9 +3259,9 @@ msgstr ""
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
 #: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
 #: src/gui/windows/tradewindow.cpp:89
 msgid "Add"
 msgstr "增加"
@@ -3267,10 +3273,10 @@ msgstr "增加"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "離開"
 
@@ -3279,24 +3285,24 @@ msgstr "離開"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
 msgid "-"
 msgstr ""
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
 msgid "Edit"
 msgstr ""
 
@@ -3381,54 +3387,51 @@ msgstr ""
 
 #. TRANSLATORS: clan name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
 msgid "Clan name"
-msgstr "閃爍名字"
+msgstr ""
 
 #. TRANSLATORS: clan master name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:70
-#, fuzzy
 msgid "Master name"
-msgstr "被擦去的名字"
+msgstr ""
 
 #. TRANSLATORS: clan map name label
 #: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
 msgid "Map name"
-msgstr "GM的名字"
+msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
 msgid "Map name:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
 msgid "Cursor:"
 msgstr ""
 
@@ -3439,224 +3442,231 @@ msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+msgid "Map atlas count:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
 msgid "Draw calls:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
 msgid "Texture binds:"
 msgstr ""
 
 #. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
 #, c-format
 msgid "%d FPS (normal OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
 #, c-format
 msgid "%d FPS (safe OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
 #, c-format
 msgid "%d FPS (mobile OpenGL ES)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
 #, c-format
 msgid "%d FPS (mobile OpenGL ES 2)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
 #, c-format
 msgid "%d FPS (modern OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
 #, c-format
 msgid "%d FPS (SDL2 default)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
 msgid "Karma:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
 msgid "Manner:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
 msgid "Effects:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -3763,46 +3773,58 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:143
-msgid "Guild / party / clan message sound"
-msgstr ""
+#, fuzzy
+msgid "Guild message sound"
+msgstr "公會成員"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "隊伍成員"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+msgid "Clan message sound"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
 msgid "Highlight message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
 msgid "Global message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
 msgid "Error message sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
 msgid "Trade request sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
 msgid "Show window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
 msgid "Hide window sound"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
 msgid "Enable mumble voice chat"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
 msgid "Download music"
 msgstr ""
 
@@ -4327,27 +4349,27 @@ msgid "Assign"
 msgstr "分配"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
 msgid "Key Conflict(s) Detected."
 msgstr "檢測到按鍵衝突."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4356,50 +4378,50 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
 #: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab label
 #: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
 msgid "Press the button to start calibration"
 msgstr "按下按鈕開始矯正"
 
 #. TRANSLATORS: joystick settings tab button
 #: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "矯正"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
 msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "啟用搖桿"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
 msgid "Use joystick if client window inactive"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
 msgid "Joystick"
 msgstr "搖桿"
 
 #. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
 msgid "Stop"
 msgstr "停止"
 
 #. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
 msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
@@ -4719,7 +4741,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
 #: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
 msgid "Shop"
 msgstr "商店"
 
@@ -4928,14 +4950,14 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
 msgid "No"
 msgstr "否"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
 msgid "Performance"
 msgstr "性能"
 
@@ -5267,19 +5289,19 @@ msgstr "允許密語"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
 #: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "刪除"
 
 #. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
 msgid "Relations"
 msgstr ""
 
 #. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
 msgid "When ignoring:"
 msgstr "當忽略時:"
 
@@ -5351,8 +5373,8 @@ msgstr ""
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
 msgid "Theme"
 msgstr "主題"
 
@@ -5379,8 +5401,8 @@ msgstr ""
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -5472,9 +5494,9 @@ msgstr ""
 
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
 msgid "Alt FPS limit: "
 msgstr ""
 
@@ -5484,98 +5506,98 @@ msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
 msgid "High DPI"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
 msgid "Custom cursor"
 msgstr "自訂滑鼠標"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
 msgid "Video"
 msgstr "顯示"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
 msgid "None"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Switching to Full Screen"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Restart needed for changes to take effect."
 msgstr "請重新啟動."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
 msgid "Changing to OpenGL"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
 msgid "Applying change to OpenGL requires restart."
 msgstr "確認切換OpenGL需要重新開始."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
 msgid "Enter new resolution:                "
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
 msgid "Screen Resolution Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -5911,7 +5933,7 @@ msgstr ""
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
 msgid "Help"
 msgstr "說明"
 
@@ -5966,7 +5988,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
 msgid "Equipment"
 msgstr "裝備"
 
@@ -6111,20 +6133,20 @@ msgstr ""
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
 #: src/gui/windows/outfitwindow.cpp:631
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
 #. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
 #, c-format
 msgid "Money in bank: %s"
 msgstr ""
@@ -6135,7 +6157,7 @@ msgid "Withdraw"
 msgstr ""
 
 #. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
 msgid "Deposit"
 msgstr ""
 
@@ -6145,20 +6167,20 @@ msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
 msgid "Create"
 msgstr "建立隊伍"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
 msgid "Filter:"
 msgstr ""
 
@@ -6213,15 +6235,15 @@ msgstr ""
 #. TRANSLATORS: error message header
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
 msgid "Error"
 msgstr "錯誤"
 
@@ -6236,7 +6258,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
 msgid "Password:"
 msgstr "密碼:"
 
@@ -6277,8 +6299,8 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
 msgid "Name:"
 msgstr "名字:"
 
@@ -6293,16 +6315,16 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
 #, c-format
 msgid "Please distribute %d points"
 msgstr "請分配%d點數"
@@ -6311,71 +6333,71 @@ msgstr "請分配%d點數"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字至少需要4個字元."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
 msgid "Character stats OK"
 msgstr "角色狀態確定"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
 #, c-format
 msgid "Please remove %d points"
 msgstr "請移除%d點數"
@@ -6402,36 +6424,37 @@ msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
 #: src/gui/windows/updaterwindow.cpp:196
 msgid "Play"
 msgstr "開始"
 
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "更改"
+
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr ""
-
 #. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -6442,27 +6465,27 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
 msgid "Enter password for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
 msgid "Enter password:"
 msgstr ""
 
@@ -6504,7 +6527,7 @@ msgid "Antagonist"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "Yes"
 msgstr "是"
 
@@ -6545,42 +6568,42 @@ msgid "Connect"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
 msgid "Use same ip"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
 msgid "Address:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
 msgid "Port:"
 msgstr "端口:"
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
 msgid "Server type:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
 msgid "Description:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
 msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
 msgid "Packet version:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -6615,7 +6638,7 @@ msgstr ""
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: unknown skills tab name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
 #: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
 msgid "Unknown"
 msgstr ""
@@ -6650,7 +6673,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -6661,93 +6684,93 @@ msgid "Equip"
 msgstr "裝備"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
 msgid "Select amount of items to trade."
 msgstr "請選擇交易的物品數量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
 msgid "Select amount of items to drop."
 msgstr "請選擇丟棄的物品數量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
 msgid "Select amount of items to craft."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
 msgid "Select amount of items to split."
 msgstr "請選擇你要分離的物品數量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
 msgid "Unknown."
 msgstr ""
 
@@ -6757,91 +6780,91 @@ msgid "Reset stats"
 msgstr ""
 
 #. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
 msgid "Reset timer"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
 msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
 #, c-format
 msgid "Exp: %s/%s Left: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
 #, c-format
 msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
 msgid "Login"
 msgstr "登入"
 
@@ -6864,29 +6887,29 @@ msgstr ""
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
 #: src/gui/windows/registerdialog.cpp:63
 #: src/gui/windows/serverinfowindow.cpp:128
 msgid "Register"
 msgstr "註冊"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
 msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
 msgid "Server:"
 msgstr "伺服器:"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
 msgid "Open register url"
 msgstr ""
 
 #. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
 msgid "default updates"
 msgstr ""
 
@@ -6907,14 +6930,14 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
 msgid "Money:"
 msgstr ""
 
@@ -6925,7 +6948,7 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
 msgid "Message:"
 msgstr ""
 
@@ -6949,22 +6972,22 @@ msgid "Get attach"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
 msgid "Get money"
 msgstr ""
 
@@ -6974,24 +6997,29 @@ msgid "Refresh"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
 msgid "New"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Get old"
 msgstr ""
 
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
 msgid "Return"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
 msgid "Open"
 msgstr ""
 
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
 #. TRANSLATORS: status bar name
 #: src/gui/windows/ministatuswindow.cpp:73
 msgid "health bar"
@@ -7133,62 +7161,62 @@ msgid "Switch character"
 msgstr "交換角色"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Confirm:"
 msgstr "確認:"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
 msgid "Male"
 msgstr "男生"
 
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
 msgid "Female"
 msgstr "女生"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
 msgid "Email:"
 msgstr "電子郵件:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
 msgid "Passwords do not match."
 msgstr "密碼不一樣."
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
 #: src/net/eathena/loginrecv.cpp:120
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
 msgid "Email too long."
 msgstr ""
 
@@ -7198,48 +7226,52 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
+#: src/gui/windows/serverdialog.cpp:139
+msgid "Choose Your Server  *** SOFTWARE RENDER MODE ***"
+msgstr ""
+
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:427
+#: src/gui/windows/serverdialog.cpp:435
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -7297,72 +7329,72 @@ msgid "Reset Windows"
 msgstr "重置視窗"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
 msgid "Request for Trade"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -7379,46 +7411,46 @@ msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
 msgid "Text: "
 msgstr ""
 
@@ -7628,33 +7660,33 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
 msgid "Change"
 msgstr "更改"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
 msgid "You give:"
 msgstr "你付出:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的物品."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
 msgid "Failed adding item. You can not trade equipped items."
 msgstr ""
 
@@ -7729,7 +7761,7 @@ msgid "Change Login"
 msgstr ""
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr ""
 
@@ -8904,9 +8936,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:208
-#, fuzzy
 msgid "Clan window"
-msgstr "清除掉下視窗"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:220
@@ -9115,33 +9146,33 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr ""
 
@@ -9171,13 +9202,13 @@ msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -9194,7 +9225,7 @@ msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
 msgid "Got disconnected from server!"
 msgstr "和伺服器失去連線!"
 
@@ -9450,108 +9481,108 @@ msgid "You were killed by unknown source."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
 msgid "Skill failed!"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
 msgid "Select warp target"
 msgstr ""
 
@@ -9659,8 +9690,52 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+msgid "Enter pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+msgid "New pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+msgid "Enter new pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "更改公會職位"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
 msgid "About"
 msgstr "關於"
 
@@ -9680,7 +9755,7 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
 msgid "File uploaded"
 msgstr "檔案上載成功"
 
@@ -9688,9 +9763,8 @@ msgstr "檔案上載成功"
 #. TRANSLATORS: clear fonts cache message
 #: src/progs/manaplus/actions/actions.cpp:1100
 #: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
 msgid "Cache cleared"
-msgstr "緩存清理成功"
+msgstr ""
 
 #. TRANSLATORS: uptime command
 #: src/progs/manaplus/actions/actions.cpp:1313
@@ -9708,9 +9782,8 @@ msgstr "來源影像:"
 #. TRANSLATORS: dump command
 #: src/progs/manaplus/actions/actions.cpp:1388
 #: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
 msgid "Orphaned resource images:"
-msgstr "來源影像:"
+msgstr ""
 
 #. TRANSLATORS: dump environment command
 #: src/progs/manaplus/actions/actions.cpp:1499
@@ -9719,41 +9792,38 @@ msgstr "環境變量轉儲成功"
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1638
-#, fuzzy
 msgid "Config uploaded to:"
-msgstr "檔案上載成功"
+msgstr ""
 
 #. TRANSLATORS: upload config chat message
 #: src/progs/manaplus/actions/actions.cpp:1648
-#, fuzzy
 msgid "Server config Uploaded to:"
-msgstr "伺服器配置數值:%s"
+msgstr ""
 
 #. TRANSLATORS: upload log chat message
 #: src/progs/manaplus/actions/actions.cpp:1658
-#, fuzzy
 msgid "Log uploaded to:"
-msgstr "已把日誌上傳至:"
+msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
+#: src/progs/manaplus/actions/actions.cpp:1943
 msgid ""
 "Last seen disabled. Enable in players / collect players ID and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
+#: src/progs/manaplus/actions/actions.cpp:1964
 msgid "You have never seen this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
+#: src/progs/manaplus/actions/actions.cpp:1983
 msgid "You have not seen this nick before."
 msgstr ""
 
@@ -10006,57 +10076,57 @@ msgid "Accepting incoming trade requests"
 msgstr "正在接受傳入的交易請求"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
 msgid "Connecting to server"
 msgstr "正在連接到伺服器"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
 msgid "Logging in"
 msgstr "正在登入"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
 msgid "Entering game world"
 msgstr "正在進入遊戲"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
 msgid "Requesting characters"
 msgstr "正在查詢角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
 msgid "Connecting to the game server"
 msgstr "正在連接到遊戲伺服器"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
 msgid "Changing game servers"
 msgstr "正在轉換遊戲伺服器"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
 msgid "Requesting registration details"
 msgstr "正在查詢註冊的詳細信息"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
 msgid "Password Change"
 msgstr "更改密碼"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
 msgid "Password changed successfully!"
 msgstr "成功更改密碼!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
 msgid "Email Change"
 msgstr "更改電郵地址"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
 msgid "Email changed successfully!"
 msgstr "成功更改電郵地址!"
 
@@ -11332,12 +11402,3 @@ msgstr "%d 秒"
 #, c-format
 msgid "%d seconds"
 msgstr "%d 秒"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "來源孤立影像:"
-
-#~ msgid "Uploaded config into:"
-#~ msgstr "已把配置上傳至:"
-
-#~ msgid "Uploaded server config into:"
-#~ msgstr "已把伺服器配置上傳至:"
author	Andrei Karas <akaras@inbox.ru>	2018-05-19 23:52:10 +0300
committer	Andrei Karas <akaras@inbox.ru>	2018-05-19 23:52:10 +0300
commit	b56d398bf575459f40fcf27052ab98311af4fcd6 (patch)
tree	1e230e426dfe81c35c080e47c83254b6a92120c9
parent	62f6aea80258af22dd939546c29fcd85c489d965 (diff)
download	ManaVerse-b56d398bf575459f40fcf27052ab98311af4fcd6.tar.gz ManaVerse-b56d398bf575459f40fcf27052ab98311af4fcd6.tar.bz2 ManaVerse-b56d398bf575459f40fcf27052ab98311af4fcd6.tar.xz ManaVerse-b56d398bf575459f40fcf27052ab98311af4fcd6.zip