Update translations.

22 files changed, 8221 insertions, 4190 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1b31fbcda..ab7a533d2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -97,6 +97,9 @@ src/gui/windows/inventorywindow.cpp
 src/gui/windows/itemamountwindow.cpp
 src/gui/windows/killstats.cpp
 src/gui/windows/logindialog.cpp
+src/gui/windows/maileditwindow.cpp
+src/gui/windows/mailviewwindow.cpp
+src/gui/windows/mailwindow.cpp
 src/gui/windows/minimap.cpp
 src/gui/windows/ministatuswindow.cpp
 src/gui/windows/npcdialog.cpp
@@ -144,6 +147,7 @@ src/net/eathena/chathandler.cpp
 src/net/eathena/generalhandler.cpp
 src/net/eathena/itemflags.h
 src/net/eathena/loginhandler.cpp
+src/net/eathena/mailhandler.cpp
 src/net/eathena/maptypeproperty2.h
 src/net/eathena/pethandler.cpp
 src/net/eathena/skillhandler.cpp
diff --git a/po/ca.po b/po/ca.po
index 03b42f67e..d4210ff1b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
-"PO-Revision-Date: 2015-04-19 15:43+0000\n"
-"Last-Translator: Arnau Mas <thealchemist886@gmail.com>\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
+"PO-Revision-Date: 2015-04-25 11:56+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/manaplus/"
 "language/ca/)\n"
 "Language: ca\n"
@@ -34,7 +34,7 @@ msgstr "Arxiu enviat"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -50,7 +50,7 @@ msgstr "Arxiu enviat"
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -283,6 +283,16 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr ""
@@ -298,7 +308,7 @@ msgid "Accepting incoming trade requests"
 msgstr "Acceptant sol·licituds d'intercanvi"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -448,8 +458,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "Ignorar completament"
 
@@ -476,37 +486,37 @@ msgstr "Bombolla flotant"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configuració"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -519,46 +529,49 @@ msgstr "Ajuda"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "Tancar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Connectant al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "Iniciant sessió"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "Entrant al mon de joc"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "Sol·licitant personatges"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "Connectant al servidor de joc"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "Canviant servidors de joc"
 
@@ -574,7 +587,7 @@ msgstr "Canviant servidors de joc"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -591,37 +604,37 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "Sol·licitant detalls de registre"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "Canvi de contrasenya"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "Contrasenya canviada amb èxit!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "Canvi de correu"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "Correu canviat amb èxit!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "Registre anul·lat amb èxit"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "Adéu, torna quan vulguis..."
 
@@ -661,36 +674,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "Error al guardar la captura de pantalla!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr "S'ha perdut la connexió amb el servidor."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "Error de xarxa"
 
@@ -1083,7 +1096,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr ""
 
@@ -1266,8 +1279,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1577,20 +1590,20 @@ msgstr "Crear grup"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1610,7 +1623,7 @@ msgstr "Pes: %s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "Intercanvi"
 
@@ -1709,9 +1722,9 @@ msgstr "Parlar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1726,7 +1739,7 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1738,7 +1751,7 @@ msgstr "Vendre"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr ""
 
@@ -1764,7 +1777,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1805,7 +1818,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1847,8 +1860,8 @@ msgstr "Jugadors"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr ""
 
@@ -1860,8 +1873,8 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "Afegir al xat"
 
@@ -1876,8 +1889,8 @@ msgstr "Element del mapa"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr ""
 
@@ -1899,7 +1912,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Conjunt"
@@ -1978,8 +1991,8 @@ msgstr "Deixa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2051,10 +2064,10 @@ msgstr "Agregar-los tots al intercanvi"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "Botiga"
 
@@ -2077,8 +2090,8 @@ msgstr "Emmagatzema-ho tot"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "Recuperar"
 
@@ -2104,9 +2117,9 @@ msgstr "Recupera-ho tot"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2114,46 +2127,46 @@ msgid "Use"
 msgstr "Utilitzar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr "Amagar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr ""
 
@@ -2161,155 +2174,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "Deixar caure..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr ""
 
@@ -2317,60 +2330,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "Deixar caure"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2391,7 +2404,7 @@ msgstr "Dreceres"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr ""
 
@@ -2659,7 +2672,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2681,7 +2694,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2694,9 +2707,9 @@ msgstr "Sortir"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2707,9 +2720,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2719,7 +2732,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2728,7 +2741,7 @@ msgstr "Max"
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preu: %s / Total: %s"
@@ -3354,8 +3367,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3453,8 +3466,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3467,8 +3480,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3700,8 +3713,8 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4157,7 +4170,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "Botiga"
 
@@ -4556,12 +4569,13 @@ msgid "Allow whispers"
 msgstr "Permet xiuxiueigs"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5216,7 +5230,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "Equipament"
 
@@ -5227,7 +5241,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventari"
@@ -5239,7 +5253,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr "Motxilla"
@@ -5326,24 +5340,38 @@ msgstr ""
 msgid "Bank"
 msgstr ""
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "A"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr "CON"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5381,24 +5409,29 @@ msgid "Result"
 msgstr "Resultat"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "Crear"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5690,19 +5723,19 @@ msgid "Enter password:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Present: %s; %d jugadors estan presents."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Xiuxiuejant a %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5819,7 +5852,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5831,82 +5864,88 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "Dividir"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "Tot"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to trade."
 msgstr "Selecciona la quantitat d'objectes per intercanviar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Select amount of items to drop."
 msgstr "Selecciona la quantitat d'objectes per deixar caure."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Select amount of items to store."
 msgstr "Selecciona la quantitat d'objectes per guardar emmagatzemar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "Selecciona la quantitat d'objectes per guardar emmagatzemar."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to retrieve."
 msgstr "Selecciona la quantitat d'objectes per recuperar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:251
+#: src/gui/windows/itemamountwindow.cpp:264
 msgid "Select amount of items to split."
 msgstr "Selecciona la quantitat d'objectes per dividir."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "Afegir a la botiga \"comprar\"."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "Afegir a la botiga \"vendre\"."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "Desconegut."
 
@@ -6049,6 +6088,108 @@ msgstr ""
 msgid "Open register url"
 msgstr ""
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "Correu:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "Enviar"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "Afegeix"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "Per a:"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "Diners: %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "Element del mapa"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+msgid "Message:"
+msgstr ""
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+msgid "Time:"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?) atac"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+msgid "New"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+msgid "Return"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+msgid "Open"
+msgstr ""
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "Barra de vida"
@@ -6136,25 +6277,6 @@ msgstr "Següent"
 msgid "Submit"
 msgstr "Envia"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "Afegeix"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "Per a:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "Enviar"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8587,6 +8709,11 @@ msgstr "Antiga contrasenya incorrecta."
 msgid "New password too short."
 msgstr ""
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9525,6 +9652,65 @@ msgstr ""
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "Relació canviada amb èxit, el jugador es ara %s!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "Missatge tanca el xat."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+msgid "Item attach failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+msgid "Money attach failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+msgid "Message return failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+msgid "Message return success."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+#, fuzzy
+msgid "Message deletion failed."
+msgstr "Autenticació fallida."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "Relació canviada amb èxit, el jugador es ara %s!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/cs.po b/po/cs.po
index 946b3e51b..1cfad547a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
@@ -39,7 +39,7 @@ msgstr "Soubor byl uploadován"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -55,7 +55,7 @@ msgstr "Soubor byl uploadován"
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -287,6 +287,16 @@ msgstr "na černé listině"
 msgid "enemy"
 msgstr "nepřítel"
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr ""
@@ -302,7 +312,7 @@ msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -453,8 +463,8 @@ msgstr "Vidíš %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "Kompletně ignorovat"
 
@@ -481,37 +491,37 @@ msgstr "Plovoucí bublina"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Nastavení"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Výkon"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Téma"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr "O ManaPlus"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Nápověda"
@@ -524,46 +534,49 @@ msgstr "Nápověda"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "Zavřít"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "Vyžaduji postavy"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "Vyměňuji herní servery"
 
@@ -579,7 +592,7 @@ msgstr "Vyměňuji herní servery"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -596,37 +609,37 @@ msgid "Error"
 msgstr "Chyba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "Změna hesla"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "Změna emailu"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "Zrušení registrace úspěšné"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
@@ -666,36 +679,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Obecný"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Snímek obrazovky uložen jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr "Spojení se serverem bylo ztraceno."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "Chyba sítě"
 
@@ -1088,7 +1101,7 @@ msgstr "Zpráva"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr "Oživ"
 
@@ -1272,8 +1285,8 @@ msgstr "Maximální (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(výchozí)"
 
@@ -1583,20 +1596,20 @@ msgstr "Vytvořit partu"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1616,7 +1629,7 @@ msgstr "Váha: %s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "Obchod"
 
@@ -1715,9 +1728,9 @@ msgstr "Promluv"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1732,7 +1745,7 @@ msgstr "Nákup"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1744,7 +1757,7 @@ msgstr "Prodej"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr "Přidat komentář"
 
@@ -1770,7 +1783,7 @@ msgstr "Přidat do seznamu útoku"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr "Vložit do seznamu ignorovaných"
 
@@ -1811,7 +1824,7 @@ msgstr "Upustit kořist"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1853,8 +1866,8 @@ msgstr "Hráči"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr "Vykopnout z party"
 
@@ -1866,8 +1879,8 @@ msgstr "Sebrat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "Přidat do chatu"
 
@@ -1882,8 +1895,8 @@ msgstr "Označit na mapě"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr "Odebrat"
 
@@ -1905,7 +1918,7 @@ msgstr "Přesunout kameru"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Výstroje"
@@ -1984,8 +1997,8 @@ msgstr "Opustit"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr "Kopírovat do schránky"
 
@@ -2057,10 +2070,10 @@ msgstr "Přidat vše k obchodu"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "Uložit"
 
@@ -2083,8 +2096,8 @@ msgstr "Uschovat všechny"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "Vzít"
 
@@ -2110,9 +2123,9 @@ msgstr "Vzít všechny"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2120,47 +2133,47 @@ msgid "Use"
 msgstr "Použít"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr "Vyčistit okno upuštění"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr "Skrýt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr "Zobrazit"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 #, fuzzy
 msgid "Open yellow bar settings"
 msgstr "Resetovat žlutý pruh"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr "Resetovat žlutý pruh"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr "Zkopírovat do chatu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr "Posunout nahoru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr "Posunout dolů"
 
@@ -2168,155 +2181,155 @@ msgstr "Posunout dolů"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr "Svléknout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr "Kopírovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr "Vložit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr "Otevřít odkaz"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr "Zobrazit okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr "Přehlížet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr "Černá listina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr "Nastavit jako nepřítele"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr "Vymazat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr "Být přátelé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr "Odignorovat"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr "Následovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr "Koupit (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr "Prodat (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr "Pozvat do party"
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr "Připojit k chatu %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr "Zobrazit předměty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr "Odeber ze seznamu sběru"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr "Přidej do seznamu sběru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr "Přestat chránit předmět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr "Chránit předmět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "Upustit..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr "Upustit vše"
 
@@ -2324,60 +2337,60 @@ msgstr "Upustit vše"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "Upustit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr "GM příkazy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr "Zkontrolovat ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr "Jdi na"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr "Zavolej zpět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr "Vykopnout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2398,7 +2411,7 @@ msgstr "Zkratky"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Okna"
 
@@ -2666,7 +2679,7 @@ msgstr "Úroveň: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2688,7 +2701,7 @@ msgstr "Otevři web adresu"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2701,9 +2714,9 @@ msgstr "Ukončit"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2714,9 +2727,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2726,7 +2739,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2735,7 +2748,7 @@ msgstr "Vše"
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cena: %s / Celkem %s"
@@ -3361,8 +3374,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3460,8 +3473,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3474,8 +3487,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3707,8 +3720,8 @@ msgstr "Zobrazit knoflík pro smajlíky v chatu"
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4164,7 +4177,7 @@ msgstr "Povolit upozornění na váhu"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "Obchod"
 
@@ -4570,12 +4583,13 @@ msgid "Allow whispers"
 msgstr "Povolit šeptání"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5228,7 +5242,7 @@ msgstr "VYB"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "Vybavení"
 
@@ -5239,7 +5253,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventář"
@@ -5251,7 +5265,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr "Košík"
@@ -5338,24 +5352,38 @@ msgstr "BA"
 msgid "Bank"
 msgstr "Banka"
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "MAP"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr "OKN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr "NAS"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5393,24 +5421,29 @@ msgid "Result"
 msgstr "Výsledek"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr "Vytvořit předměty"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr "Počet:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "Vytvořit"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5707,19 +5740,19 @@ msgid "Enter password:"
 msgstr "Zadej heslo:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Přítomni: %s; %d hráčů je přítomno."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šeptání pro %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr "mazlíček patřící %s"
@@ -5836,7 +5869,7 @@ msgstr "Věděl jsi že..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5848,82 +5881,88 @@ msgid "Equip"
 msgstr "Vybavit"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "Rozdělit"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "Vše"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 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:231
+#: src/gui/windows/itemamountwindow.cpp:238
 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:235
+#: src/gui/windows/itemamountwindow.cpp:242
 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:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "Vyberte množství předmětů, které chcete uskladnit."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 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:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:251
+#: src/gui/windows/itemamountwindow.cpp:264
 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:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "Přidat k nákupu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "Přidat k prodeji."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "Neznámý."
 
@@ -6068,6 +6107,113 @@ msgstr "Host updatu: %s"
 msgid "Open register url"
 msgstr "Otevřít registrační url"
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "E-mail:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "Odeslat"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "Přidat"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "Komu:"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "Peníze: %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "Označit na mapě"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#, fuzzy
+msgid "Message:"
+msgstr "Zpráva"
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+#, fuzzy
+msgid "Time:"
+msgstr "Čas"
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?) útok"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+#, fuzzy
+msgid "New"
+msgstr "Síť"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+#, fuzzy
+msgid "Return"
+msgstr "Vrátit k vejci"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+#, fuzzy
+msgid "Open"
+msgstr "Otevři web adresu"
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "pruh zdraví"
@@ -6155,25 +6301,6 @@ msgstr "Další"
 msgid "Submit"
 msgstr "Odeslat"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "Přidat"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "Komu:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "Odeslat"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8611,6 +8738,11 @@ msgstr "Půvoní heslo je nesprávné."
 msgid "New password too short."
 msgstr "Nové heslo je příliš krátké."
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9549,6 +9681,68 @@ msgstr ""
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "Hráč byl úspěšně zařazen jako %s!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "Zpráva zavírá chat."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+#, fuzzy
+msgid "Item attach failed."
+msgstr "Pokus o polapení mazíčka selhal."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+#, fuzzy
+msgid "Money attach failed."
+msgstr "Pokus o polapení mazíčka selhal."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+#, fuzzy
+msgid "Message return failed."
+msgstr "Selhalo vytváření postavy!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+msgid "Message return success."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+#, fuzzy
+msgid "Message deletion failed."
+msgstr "Ověření selhalo."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "Parta úspěšně vytvořena."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/de.po b/po/de.po
index d78b730fd..4bc479f9c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -33,7 +33,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
 "PO-Revision-Date: 2015-04-22 16:59+0000\n"
 "Last-Translator: jmf <jm.franz@online.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
@@ -58,7 +58,7 @@ msgstr "Datei hochgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -74,7 +74,7 @@ msgstr "Datei hochgeladen"
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -308,6 +308,16 @@ msgstr "Auf die schwarze Liste gesetzt"
 msgid "enemy"
 msgstr "Feind"
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr "Dein Haustier umbennen"
@@ -323,7 +333,7 @@ msgid "Accepting incoming trade requests"
 msgstr "Eingehende Handelsanfragen akzeptieren"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -473,8 +483,8 @@ msgstr "Du siehst %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "Komplett ignorieren"
 
@@ -501,37 +511,37 @@ msgstr "Schwebende Blase"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Einstellungen"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Leistung"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Theme"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr "Über"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hilfe"
@@ -544,46 +554,49 @@ msgstr "Hilfe"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "Schließen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "Anmelden"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "Spielfiguren werden abgefragt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Spielserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "Spielserver wechseln"
 
@@ -599,7 +612,7 @@ msgstr "Spielserver wechseln"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -616,37 +629,37 @@ msgid "Error"
 msgstr "Fehler"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "Passwort ändern"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "Erfolgreich abgemeldet."
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
@@ -686,36 +699,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Allgemein"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Screenshot gespeichert unter %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "Screenshot konnte nicht gespeichert werden!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr "Die Verbindung zum Server wurde getrennt."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
@@ -1108,7 +1121,7 @@ msgstr "Nachricht"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr "Wiederbeleben"
 
@@ -1295,8 +1308,8 @@ msgstr "Riesig (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(Normal)"
 
@@ -1606,20 +1619,20 @@ msgstr "Gruppe erstellen"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1639,7 +1652,7 @@ msgstr "Gewicht: %s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "Handeln"
 
@@ -1738,9 +1751,9 @@ msgstr "Sprechen"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1755,7 +1768,7 @@ msgstr "Kaufen"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1767,7 +1780,7 @@ msgstr "Verkaufen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr "Kommentar hinzufügen"
 
@@ -1793,7 +1806,7 @@ msgstr "Zur Angriffsliste hinzufügen"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr "Zur Ignorierenliste hinzufügen"
 
@@ -1834,7 +1847,7 @@ msgstr "Beute wegwerfen"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1876,8 +1889,8 @@ msgstr "Spieler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr "Aus Gruppe werfen"
 
@@ -1889,8 +1902,8 @@ msgstr "Aufheben"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "Zum Chat hinzufügen"
 
@@ -1905,8 +1918,8 @@ msgstr "Kartengegenstand"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -1928,7 +1941,7 @@ msgstr "Kamera bewegen"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Ausrüstungset"
@@ -2007,8 +2020,8 @@ msgstr "Verlassen"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr "In die Zwischenablage kopieren"
 
@@ -2080,10 +2093,10 @@ msgstr "Alles zum Handeln hinzufügen"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "Aufbewahren"
 
@@ -2106,8 +2119,8 @@ msgstr "Alles aufbewahren"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "Abholen"
 
@@ -2133,9 +2146,9 @@ msgstr "Alles abholen"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2143,47 +2156,47 @@ msgid "Use"
 msgstr "Benutzen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr "Fenster: Wegwerfen leeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr "Verstecken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr "Zeigen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 #, fuzzy
 msgid "Open yellow bar settings"
 msgstr "Gelben Balken zurücksetzten"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr "Gelben Balken zurücksetzten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr "Zu Chat kopieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr "Nach oben bewegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr "Nach unten bewegen"
 
@@ -2191,155 +2204,155 @@ msgstr "Nach unten bewegen"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr "Ausziehen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr "Kopieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr "Einfügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr "Link öffnen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr "Fenster anzeigen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr "Missachten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr "Schwarze Liste"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr "Als Feind setzen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr "Löschen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr "Befreunden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr "Nicht mehr Ignorieren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr "Folgen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr "Imitieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr "Kaufen (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr "Verkaufen (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr "Zu Gruppe einladen"
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr "Chat beitreten %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr "Gegenstände anzeigen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr "Von der Aufhebeliste entfernen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr "Zur Aufhebeliste hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr "Gegenstand nicht mehr schützen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr "Gegenstand schützen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "Wegwerfen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr "Alles wegwerfen"
 
@@ -2347,60 +2360,60 @@ msgstr "Alles wegwerfen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "Wegwerfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr "GM...."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr "GM Befehle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr "IP überprüfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr "Gehe zu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr "Zurückrufen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr "Rauswerfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr "Stummschalten %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr "Laut schalten %d"
@@ -2421,7 +2434,7 @@ msgstr "Kurzbefehle"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Fenster"
 
@@ -2689,7 +2702,7 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2711,7 +2724,7 @@ msgstr "URL öffnen"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2724,9 +2737,9 @@ msgstr "Beenden"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2737,9 +2750,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2749,7 +2762,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2758,7 +2771,7 @@ msgstr "Max"
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preis: %s / Gesamt: %s"
@@ -3384,8 +3397,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3483,8 +3496,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3497,8 +3510,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3730,8 +3743,8 @@ msgstr "Emotes im Chat anzeigen"
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4187,7 +4200,7 @@ msgstr "Benachrichtigungen über Gewicht aktivieren"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "Laden"
 
@@ -4595,12 +4608,13 @@ msgid "Allow whispers"
 msgstr "Flüstern erlauben"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5258,7 +5272,7 @@ msgstr "AUS"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "Ausrüstung"
 
@@ -5269,7 +5283,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventar"
@@ -5281,7 +5295,7 @@ msgstr "EK"
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr "Einkaufswagen"
@@ -5368,24 +5382,38 @@ msgstr "BA"
 msgid "Bank"
 msgstr "Bank"
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "KAR"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr "FL"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr "EINST"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5423,24 +5451,29 @@ msgid "Result"
 msgstr "Resultat"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr "Gegenstände erstellen"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr "Menge:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "Erstellen"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5737,19 +5770,19 @@ msgid "Enter password:"
 msgstr "Gib dein Passwort ein:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Anwesend: %s ; %d Spieler sind anwesend."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüstern zu %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr "%ss Haustier"
@@ -5866,7 +5899,7 @@ msgstr "Wusstest Du schon..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5878,82 +5911,88 @@ msgid "Equip"
 msgstr "Ausrüsten"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "Aufteilen"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 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:231
+#: src/gui/windows/itemamountwindow.cpp:238
 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:235
+#: src/gui/windows/itemamountwindow.cpp:242
 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:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "Anzahl der Gegenstände zum Aufbewaren auswählen."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 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:243
+#: src/gui/windows/itemamountwindow.cpp:256
 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:247
+#: src/gui/windows/itemamountwindow.cpp:260
 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:251
+#: src/gui/windows/itemamountwindow.cpp:264
 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:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "Zum Einkaufsstand hinzufügen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "Zum Verkaufsstand hinzufügen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "Unbekannt."
 
@@ -6096,6 +6135,113 @@ msgstr "Updateserver: %s"
 msgid "Open register url"
 msgstr "Registrierungslink öffnen"
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "E-Mail eingeben:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "Senden"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "Hinzufügen"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "Nach:"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "Geld: %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "Kartengegenstand"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#, fuzzy
+msgid "Message:"
+msgstr "Nachricht"
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+#, fuzzy
+msgid "Time:"
+msgstr "Zeit"
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?) Angriff"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+#, fuzzy
+msgid "New"
+msgstr "Net"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+#, fuzzy
+msgid "Return"
+msgstr "Zum Ei zurückkehren"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+#, fuzzy
+msgid "Open"
+msgstr "URL öffnen"
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "Balken: Gesundheit"
@@ -6183,25 +6329,6 @@ msgstr "Weiter"
 msgid "Submit"
 msgstr "Absenden"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "Hinzufügen"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "Nach:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "Senden"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8646,6 +8773,11 @@ msgstr "Altes Passwort falsch."
 msgid "New password too short."
 msgstr "Das neue Passwort ist zu kurz."
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9598,6 +9730,69 @@ msgstr "Beitreten fehlgeschlagen. Falsche Rasse."
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "Spieler erfolgreich %s!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "Gegenstand suchen ist fehlgeschlagen."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+#, fuzzy
+msgid "Item attach failed."
+msgstr "Haustierfang fehlgeschlagen."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+#, fuzzy
+msgid "Money attach failed."
+msgstr "Haustierfang fehlgeschlagen."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+#, fuzzy
+msgid "Message return failed."
+msgstr "Gegenstand suchen ist fehlgeschlagen."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+#, fuzzy
+msgid "Message return success."
+msgstr "Hautier füttern erfolgreich."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+#, fuzzy
+msgid "Message deletion failed."
+msgstr "Authentifizierung fehlgeschlagen."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "Gruppe erfolgreich erstellt."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/es.po b/po/es.po
index 6c5c93989..8deac56f8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
-"PO-Revision-Date: 2015-04-06 16:11+0000\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
+"PO-Revision-Date: 2015-04-25 22:40+0000\n"
 "Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
 "language/es/)\n"
@@ -46,7 +46,7 @@ msgstr "Archivo subido"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -62,7 +62,7 @@ msgstr "Archivo subido"
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -295,6 +295,16 @@ msgstr "en la lista negra"
 msgid "enemy"
 msgstr "enemigo"
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr "Renombrar tu mascota"
@@ -310,7 +320,7 @@ msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -460,8 +470,8 @@ msgstr "Tú ves %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -488,37 +498,37 @@ msgstr "Burbuja flotante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configuración"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Rendimiento"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr "Acerca de..."
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ayuda"
@@ -531,46 +541,49 @@ msgstr "Ayuda"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "Cerrar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
@@ -586,7 +599,7 @@ msgstr "Cambiando servidores del juego"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -603,37 +616,37 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "Cambio de Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
@@ -673,36 +686,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd archivoOrigen archivoDestino"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de pantalla guardada como %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con el servidor."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "Error de Red"
 
@@ -1095,7 +1108,7 @@ msgstr "Mensaje"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr "Revivir"
 
@@ -1281,8 +1294,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(predeterminado)"
 
@@ -1592,20 +1605,20 @@ msgstr "Crear grupo"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1625,7 +1638,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "Intercambio"
 
@@ -1724,9 +1737,9 @@ msgstr "Hablar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1741,7 +1754,7 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1753,7 +1766,7 @@ msgstr "Vender"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr "Agregar comentario"
 
@@ -1779,7 +1792,7 @@ msgstr "Agregar a la lista de ataque"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr "Agregar a la lista de ignorados"
 
@@ -1820,7 +1833,7 @@ msgstr "Soltar botín"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1862,8 +1875,8 @@ msgstr "Jugadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr "Expulsar del grupo"
 
@@ -1875,8 +1888,8 @@ msgstr "Recoger"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
@@ -1891,8 +1904,8 @@ msgstr "Mapa Objeto"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr "Quitar"
 
@@ -1914,7 +1927,7 @@ msgstr "Mover cámara"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Vestimenta"
@@ -1993,8 +2006,8 @@ msgstr "Dejar"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr "Copiar al portapapeles"
 
@@ -2066,10 +2079,10 @@ msgstr "Agregar todo al intercambio"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "Almacenar"
 
@@ -2092,8 +2105,8 @@ msgstr "Almacenar todo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "Recuperar"
 
@@ -2119,9 +2132,9 @@ msgstr "Recuperar todo"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2129,47 +2142,47 @@ msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
-msgstr "Limpiar ventana de lanzamiento"
+msgstr "Limpiar ventana de drop"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 #, fuzzy
 msgid "Open yellow bar settings"
 msgstr "Restablecer barra amarilla"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr "Subir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr "Bajar"
 
@@ -2177,155 +2190,155 @@ msgstr "Bajar"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr "Desvestir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr "Abrir enlace"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr "Mostrar ventana"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr "Desatender"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr "Lista negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr "Fijar como enemigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr "Borrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr "Ser amigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr "Dejar de ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr "Invitar al grupo"
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr "Unirse al chat %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr "Mostrar vestimenta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr "Remover de lista de recogido"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr "Agregar a lista de recogido"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr "Desproteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr "Proteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "Tirar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr "Tirar todo"
 
@@ -2333,60 +2346,60 @@ msgstr "Tirar todo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "Tirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr "Comandos GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr "Chequear IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr "Ir a"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr "Llamar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr "Expulsar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr "Enmudecer %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr "Desenmudecer %d"
@@ -2407,7 +2420,7 @@ msgstr "Atajos"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Ventanas"
 
@@ -2675,7 +2688,7 @@ msgstr "Nivel: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2697,7 +2710,7 @@ msgstr "Abrir url"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2710,9 +2723,9 @@ msgstr "Salir"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2723,9 +2736,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2735,7 +2748,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2744,7 +2757,7 @@ msgstr "Máx"
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Precio: %s / Total: %s"
@@ -3370,8 +3383,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3470,8 +3483,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3484,8 +3497,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3717,8 +3730,8 @@ msgstr "Mostrar botón de emoticonos en el chat"
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4174,7 +4187,7 @@ msgstr "Habilitar notificaciones de peso"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "Tienda"
 
@@ -4580,12 +4593,13 @@ msgid "Allow whispers"
 msgstr "Permitir mensajes privados"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5240,7 +5254,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "Equipamiento"
 
@@ -5251,7 +5265,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventario"
@@ -5263,7 +5277,7 @@ msgstr "CA"
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr "Mochila"
@@ -5350,24 +5364,38 @@ msgstr "BA"
 msgid "Bank"
 msgstr "Banco"
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "MAP"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5405,24 +5433,29 @@ msgid "Result"
 msgstr "Resultado"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr "Crear artículos"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr "Cantidad:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "Crear"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5723,19 +5756,19 @@ msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jugadores están presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Susurrando a %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr "Mascota de %s"
@@ -5853,7 +5886,7 @@ msgstr "¿Sabías que..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5865,82 +5898,88 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "Dividir"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "Todo"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 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:231
+#: src/gui/windows/itemamountwindow.cpp:238
 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:235
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Select amount of items to store."
 msgstr "Seleccione la cantidad de objetos a almacenar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "Seleccione la cantidad de objetos a almacenar."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 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:243
+#: src/gui/windows/itemamountwindow.cpp:256
 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:247
+#: src/gui/windows/itemamountwindow.cpp:260
 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:251
+#: src/gui/windows/itemamountwindow.cpp:264
 msgid "Select amount of items to split."
 msgstr "Seleccione la cantidad de artículos."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "Agregar tienda (compra)."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "Agregar a la tienda (venta)."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "Desconocido."
 
@@ -6083,6 +6122,113 @@ msgstr "Host de actualización: %s"
 msgid "Open register url"
 msgstr "Abrir url de registro"
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "Introduce tu correo:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "Enviar"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "Añadir"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "Para:"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "Dinero: %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "Mapa Objeto"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#, fuzzy
+msgid "Message:"
+msgstr "Mensaje"
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+#, fuzzy
+msgid "Time:"
+msgstr "Tiempo"
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?) ataque"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+#, fuzzy
+msgid "New"
+msgstr "Red"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+#, fuzzy
+msgid "Return"
+msgstr "Regresar al huevo"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+#, fuzzy
+msgid "Open"
+msgstr "Abrir url"
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "barra de salud"
@@ -6170,25 +6316,6 @@ msgstr "Siguiente"
 msgid "Submit"
 msgstr "Enviar"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "Añadir"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "Para:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "Enviar"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -7425,7 +7552,7 @@ msgstr "Tirar N artículos rápidamente"
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:138
 msgid "Switch Quick Drop Counter"
-msgstr "Cambiar el contador de lanzamientos"
+msgstr "Intercambiar rápidamente el contador de drop"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:144
@@ -7844,7 +7971,7 @@ msgstr "Ventana de la Tienda"
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:150
 msgid "Quick drop Window"
-msgstr "Ventana para Tirar Rápido"
+msgstr "Ventana de drop Rápido"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:156
@@ -8634,6 +8761,11 @@ msgstr "Contraseña anterior incorrecta."
 msgid "New password too short."
 msgstr "Nueva contraseña es muy corta."
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9581,6 +9713,69 @@ msgstr "Error al unirse a la sala. Raza equivocada."
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "¡Relación cambiada exitosamente! ¡El jugador ahora es %s!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "Búsqueda de artículos fallida."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+#, fuzzy
+msgid "Item attach failed."
+msgstr "Captura fallida de mascota."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+#, fuzzy
+msgid "Money attach failed."
+msgstr "Captura fallida de mascota."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+#, fuzzy
+msgid "Message return failed."
+msgstr "Búsqueda de artículos fallida."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+#, fuzzy
+msgid "Message return success."
+msgstr "Éxito al alimentar la mascota."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+#, fuzzy
+msgid "Message deletion failed."
+msgstr "Autenticación fallida."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "Grupo creado."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/fi.po b/po/fi.po
index 0f0431142..b6b03dfdd 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
@@ -34,7 +34,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -50,7 +50,7 @@ msgstr ""
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -282,6 +282,16 @@ msgstr "mustalistattu"
 msgid "enemy"
 msgstr "vihollinen"
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr ""
@@ -297,7 +307,7 @@ msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -447,8 +457,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
@@ -475,37 +485,37 @@ msgstr "Leijuva puhekupla"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Asetukset"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "Kuva"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Teema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Apua"
@@ -518,46 +528,49 @@ msgstr "Apua"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "Sulje"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
@@ -573,7 +586,7 @@ msgstr "Vaihdan pelipalvelinta"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -590,37 +603,37 @@ msgid "Error"
 msgstr "Virhe"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
@@ -660,36 +673,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Yleiset"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
@@ -1082,7 +1095,7 @@ msgstr "Viesti"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr ""
 
@@ -1265,8 +1278,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(oletus)"
 
@@ -1576,20 +1589,20 @@ msgstr "Luo ryhmä"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1609,7 +1622,7 @@ msgstr "Paino: %s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "Tee kaupat"
 
@@ -1708,9 +1721,9 @@ msgstr "Keskustele"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1725,7 +1738,7 @@ msgstr "Osta"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1737,7 +1750,7 @@ msgstr "Myy"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr "Lisää kommentti"
 
@@ -1763,7 +1776,7 @@ msgstr "Lisää hyökkäyslistaan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr "Lisää ohitettavien listaan"
 
@@ -1804,7 +1817,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1846,8 +1859,8 @@ msgstr "Pelaajat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr "Potki ryhmästä"
 
@@ -1859,8 +1872,8 @@ msgstr "Poimi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "Lisää keskusteluun"
 
@@ -1875,8 +1888,8 @@ msgstr "Karttaolio"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr "Poista"
 
@@ -1898,7 +1911,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Asukokonaisuudet"
@@ -1977,8 +1990,8 @@ msgstr "Eroa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr "Kopioi leikepöydälle"
 
@@ -2050,10 +2063,10 @@ msgstr "Lisää kaikki kauppaan"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "Varastoi"
 
@@ -2076,8 +2089,8 @@ msgstr "Varastoi kaikki"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "Ota"
 
@@ -2103,9 +2116,9 @@ msgstr "Ota kaikki"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2113,47 +2126,47 @@ msgid "Use"
 msgstr "Käytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr "Piilota"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr "Näytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 #, fuzzy
 msgid "Open yellow bar settings"
 msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr "Kopioi keskusteluun"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr "Siirrä ylös"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr "Siirrä alas"
 
@@ -2161,155 +2174,155 @@ msgstr "Siirrä alas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr "Riisu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr "Vaimenna"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ohita"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr "Musta lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr "Aseta viholliseksi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr "Pyyhi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr "Ystävysty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr "Huomioi jälleen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr "Seuraa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr "Osta (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr "Myy (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr "Kutsu ryhmään"
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr "Näytä tavarat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "Pudota..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr "Pudota kaikki"
 
@@ -2317,60 +2330,60 @@ msgstr "Pudota kaikki"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "Pudota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr "Potki"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2391,7 +2404,7 @@ msgstr "Pikavalinnat"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr ""
 
@@ -2659,7 +2672,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2681,7 +2694,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2694,9 +2707,9 @@ msgstr "Sulje"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2707,9 +2720,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2719,7 +2732,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2728,7 +2741,7 @@ msgstr "Max"
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Hinta: %s / Kaikkiaan: %s"
@@ -3354,8 +3367,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3453,8 +3466,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3467,8 +3480,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3700,8 +3713,8 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4157,7 +4170,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "Kauppa"
 
@@ -4556,12 +4569,13 @@ msgid "Allow whispers"
 msgstr "Salli kuiskaukset"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5212,7 +5226,7 @@ msgstr "Var"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "Varusteet"
 
@@ -5223,7 +5237,7 @@ msgstr "Tav"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Tavarat"
@@ -5235,7 +5249,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr "Kärry"
@@ -5322,24 +5336,38 @@ msgstr ""
 msgid "Bank"
 msgstr ""
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "P"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr "Ase"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5377,24 +5405,29 @@ msgid "Result"
 msgstr "Tulos"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr "Määrä:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "Luo"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5686,19 +5719,19 @@ msgid "Enter password:"
 msgstr "Salasana:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Läsnä: %s; %d pelaajaa paikalla."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Kuiskaat pelaajalle %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5815,7 +5848,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5827,82 +5860,88 @@ msgid "Equip"
 msgstr "Ota käyttöön"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "Jaa"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "Kaikki"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to trade."
 msgstr "Anna vaihtokaupattavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Select amount of items to drop."
 msgstr "Anna pudotettavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Select amount of items to store."
 msgstr "Anna varastoitavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "Anna varastoitavien tavaroiden määrä."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to retrieve."
 msgstr "Anna varastosta otettavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:251
+#: src/gui/windows/itemamountwindow.cpp:264
 msgid "Select amount of items to split."
 msgstr "Anna eri pinoon jaettavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "Lisää ostokauppaan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "Lisää myyntikauppaan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "Tuntematon."
 
@@ -6045,6 +6084,111 @@ msgstr ""
 msgid "Open register url"
 msgstr ""
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "Sähköpostiosoite:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "Lähetä"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "Lisää"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "Vastaanottaja:"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "Rahat: %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "Karttaolio"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#, fuzzy
+msgid "Message:"
+msgstr "Viesti"
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+#, fuzzy
+msgid "Time:"
+msgstr "Aika"
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?) hyökkäys"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+#, fuzzy
+msgid "New"
+msgstr "Verkko"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+msgid "Return"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+msgid "Open"
+msgstr ""
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "terveyspalkki"
@@ -6132,25 +6276,6 @@ msgstr "Seuraava"
 msgid "Submit"
 msgstr "Lähetä"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "Lisää"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "Vastaanottaja:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "Lähetä"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8585,6 +8710,11 @@ msgstr "Vanha salsana on väärä."
 msgid "New password too short."
 msgstr "Uusi salasana on liian lyhyt."
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9524,6 +9654,68 @@ msgstr ""
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "Pelaaja on nyt %s!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "Viesti sulkee keskustelun."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+#, fuzzy
+msgid "Item attach failed."
+msgstr "Emperium-tarkistus epäonnistui."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+#, fuzzy
+msgid "Money attach failed."
+msgstr "Ota käyttöön hyökkäyssuodin"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+#, fuzzy
+msgid "Message return failed."
+msgstr "Keskustelun luonti epäonnistui!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+msgid "Message return success."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+#, fuzzy
+msgid "Message deletion failed."
+msgstr "Tunnistus epäonnistui."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "Ryhmä luotu."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/fr.po b/po/fr.po
index 48eb0fa1e..e826659d7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
-"PO-Revision-Date: 2015-04-11 11:21+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
+"PO-Revision-Date: 2015-04-26 23:49+0000\n"
+"Last-Translator: Alige <aligetmw@hotmail.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
 "fr/)\n"
 "Language: fr\n"
@@ -46,7 +46,7 @@ msgstr "Fichier mis en ligne"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -62,7 +62,7 @@ msgstr "Fichier mis en ligne"
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -297,6 +297,16 @@ msgstr "sous liste noire"
 msgid "enemy"
 msgstr "ennemi"
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr "Renommer ton familier"
@@ -312,7 +322,7 @@ msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -462,8 +472,8 @@ msgstr "Tu vois %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
@@ -490,37 +500,37 @@ msgstr "Bulle flottante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configuration"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performance"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "Vidéo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Thème"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr "À propos"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Aide"
@@ -533,46 +543,49 @@ msgstr "Aide"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "Fermer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "Connexion"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "Entrée dans le monde de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
@@ -588,7 +601,7 @@ msgstr "Changement de serveur de jeu"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -605,37 +618,37 @@ msgid "Error"
 msgstr "Erreur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "À bientôt, Revenez quand vous voulez..."
 
@@ -676,37 +689,37 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Général"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Débogage"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Capture d'écran sauvegardée sous %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "La  capture d'écran a échoué !"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr ""
 "La connexion au serveur a été coupée, le programme va maintenant se fermer."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
@@ -1099,7 +1112,7 @@ msgstr "Message"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr "Ressusciter"
 
@@ -1286,8 +1299,8 @@ msgstr "Énorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(défaut)"
 
@@ -1597,20 +1610,20 @@ msgstr "Créer un groupe"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1630,7 +1643,7 @@ msgstr "Poids : %s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "Échange"
 
@@ -1729,9 +1742,9 @@ msgstr "Parler"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1746,7 +1759,7 @@ msgstr "Acheter"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1758,7 +1771,7 @@ msgstr "Vendre"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr "Ajouter commentaire"
 
@@ -1784,7 +1797,7 @@ msgstr "Ajouter à la liste d'attaque"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr "Ajouter à la liste d'ignorés"
 
@@ -1825,7 +1838,7 @@ msgstr "Déposer le butin"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1867,8 +1880,8 @@ msgstr "Joueurs"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr "Éjecter du groupe"
 
@@ -1880,8 +1893,8 @@ msgstr "Ramasser"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
@@ -1896,8 +1909,8 @@ msgstr "Objet de carte"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr "Enlever"
 
@@ -1919,7 +1932,7 @@ msgstr "Bouger la caméra"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Costumes"
@@ -1998,8 +2011,8 @@ msgstr "Quitter"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr "Copier vers le presse-papier"
 
@@ -2071,10 +2084,10 @@ msgstr "Ajouter tout dans l'échange"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "Entreposer"
 
@@ -2097,8 +2110,8 @@ msgstr "Entreposer tout"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "Récupérer"
 
@@ -2124,9 +2137,9 @@ msgstr "Reprendre tout"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2134,47 +2147,47 @@ msgid "Use"
 msgstr "Utiliser"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr "Vider la fenêtre de dépôt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr "Cacher"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr "Montrer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 #, fuzzy
 msgid "Open yellow bar settings"
 msgstr "Remise aux valeurs de défaut de la barre jaune"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr "Remise aux valeurs de défaut de la barre jaune"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr "Copier dans la conversation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr "Aller vers le haut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr "Aller vers le bas"
 
@@ -2182,155 +2195,155 @@ msgstr "Aller vers le bas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr "Déshabiller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr "Copier"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr "Coller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr "Ouvrir lien"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr "Afficher la fenêtre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr "Éviter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr "Liste noire"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr "Définir comme ennemi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr "Éliminer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr "Être ami"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr "Ne plus ignorer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr "Suivre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr "Imiter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr "Acheter (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr "Vendre (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr "Inviter dans le groupe"
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr "Rejoindre la conversation %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr "Montrer les objets"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr "Retirer de la liste de ramassage"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr "Ajouter à la liste de ramassage"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr "Objet non protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr "Objet protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "Déposer..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr "Déposer tout"
 
@@ -2338,60 +2351,60 @@ msgstr "Déposer tout"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "Déposer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr "MJ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr "Commandes de MJ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr "Vérifier ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr "Aller à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr "Rappeler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr "Virer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr "Mettre en silence %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr "Redonner la parole à %d"
@@ -2412,7 +2425,7 @@ msgstr "Raccourcis"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Fenêtres"
 
@@ -2680,7 +2693,7 @@ msgstr "Niveau : %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2702,7 +2715,7 @@ msgstr "Ouvrir l'adresse"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2715,9 +2728,9 @@ msgstr "Quitter"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2728,9 +2741,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2740,7 +2753,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2749,7 +2762,7 @@ msgstr "Max."
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prix : %s / Total : %s"
@@ -3375,8 +3388,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3476,8 +3489,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3490,8 +3503,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3723,8 +3736,8 @@ msgstr "Afficher le bouton des émoticônes dans la conversation"
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4180,7 +4193,7 @@ msgstr "Activer les notifications de poids"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "Boutique"
 
@@ -4590,12 +4603,13 @@ msgid "Allow whispers"
 msgstr "Autoriser les messages privés"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5253,7 +5267,7 @@ msgstr "Equ"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "Équipement"
 
@@ -5264,7 +5278,7 @@ msgstr "Inv"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventaire"
@@ -5276,7 +5290,7 @@ msgstr "CA"
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr "Panier"
@@ -5363,24 +5377,38 @@ msgstr "CB"
 msgid "Bank"
 msgstr "Banque"
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "CRT"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr "FEN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr "Cfg"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5418,24 +5446,29 @@ msgid "Result"
 msgstr "Résultat"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr "Créer des objets"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr "Montant :"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "Créer"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5732,19 +5765,19 @@ msgid "Enter password:"
 msgstr "Entre le mot de passe :"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Présents : %s ; %d joueurs sont présents."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Message privé envoyé à %s : %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr "%s du familier"
@@ -5861,7 +5894,7 @@ msgstr "Savais-tu que..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5873,82 +5906,88 @@ msgid "Equip"
 msgstr "Équiper"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "Partager"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "Tout"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to trade."
 msgstr "Choisir le nombre d'objets à échanger."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Select amount of items to drop."
 msgstr "Choisir le nombre d'objets à déposer."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Select amount of items to store."
 msgstr "Choisir le nombre d'objets à stocker."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "Choisir le nombre d'objets à stocker."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to store to cart."
 msgstr "Sélectionnez la quantité d'articles à mettre dans votre panier."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to retrieve."
 msgstr "Choisir le nombre d'objet à reprendre."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to retrieve from cart."
 msgstr "Sélectionnez la quantité d'articles à récupérer du panier."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:251
+#: src/gui/windows/itemamountwindow.cpp:264
 msgid "Select amount of items to split."
 msgstr "Choisir le nombre d'objets à séparer."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "Ajouter à la boutique d'achats."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "Ajouter à la boutique de ventes."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "Inconnu."
 
@@ -6091,6 +6130,113 @@ msgstr "Hôte de mise à jour : %s"
 msgid "Open register url"
 msgstr "Ouvrir l'URL d'inscription"
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "Saisissez e-mail:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "Envoyer"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "Ajouter"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "Vers :"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "Argent : %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "Objet de carte"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#, fuzzy
+msgid "Message:"
+msgstr "Message"
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+#, fuzzy
+msgid "Time:"
+msgstr "Temps"
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?) attaque"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+#, fuzzy
+msgid "New"
+msgstr "Réseau"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+#, fuzzy
+msgid "Return"
+msgstr "Retourner à l'œuf"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+#, fuzzy
+msgid "Open"
+msgstr "Ouvrir l'adresse"
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "Barre de vie"
@@ -6178,25 +6324,6 @@ msgstr "Suivant"
 msgid "Submit"
 msgstr "Soumettre"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "Ajouter"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "Vers :"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "Envoyer"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8648,6 +8775,11 @@ msgstr "Ancien mot de passe incorrect."
 msgid "New password too short."
 msgstr "Le nouveau mot de passe est trop court."
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9506,19 +9638,19 @@ msgstr "Echec de l'alimentation du familier."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:504
 msgid "A manner point has been successfully aligned."
-msgstr ""
+msgstr "Un point de comportement a été aligné avec succès."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:508
 #, c-format
 msgid "You got positive manner points from %s."
-msgstr ""
+msgstr "Tu as reçu des points positifs de comportement par %s."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:512
 #, c-format
 msgid "You got negative manner points from %s."
-msgstr ""
+msgstr "Tu as reçu des points négatifs de comportement par %s."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:516
@@ -9595,6 +9727,69 @@ msgstr "Vous ne pouvez rejoindre ce salon : mauvaise race."
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "Joueur %s avec succès !"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "La recherche d'objets a échoué."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+#, fuzzy
+msgid "Item attach failed."
+msgstr "Echec de capture du familier."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+#, fuzzy
+msgid "Money attach failed."
+msgstr "Echec de capture du familier."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+#, fuzzy
+msgid "Message return failed."
+msgstr "La recherche d'objets a échoué."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+#, fuzzy
+msgid "Message return success."
+msgstr "Succès de l'alimentation du familier."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+#, fuzzy
+msgid "Message deletion failed."
+msgstr "Échec de l'authentification."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "Création du groupe réussie."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/id.po b/po/id.po
index 0a5c6bfea..c17268140 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
@@ -38,7 +38,7 @@ msgstr "Data telah terunggah"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -54,7 +54,7 @@ msgstr "Data telah terunggah"
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -287,6 +287,16 @@ msgstr "daftar hitam"
 msgid "enemy"
 msgstr "musuh"
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr ""
@@ -302,7 +312,7 @@ msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -451,8 +461,8 @@ msgstr "Kamu lihat %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "Sepenuhnya tolak"
 
@@ -479,37 +489,37 @@ msgstr "Gelembung mengambang"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Pengaturan"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performa"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "Vidio"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr "Tentang"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Bantuan"
@@ -522,46 +532,49 @@ msgstr "Bantuan"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "Tutup"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Terhubung ke server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "Masuk"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "Mengambil karakter"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "Terhubung ke server permainan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "Mengganti server"
 
@@ -577,7 +590,7 @@ msgstr "Mengganti server"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -594,37 +607,37 @@ msgid "Error"
 msgstr "Kesalahan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "Perubahan Sandi"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "Perubahan email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat..."
 
@@ -664,36 +677,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "pewarnacmd sumberpewarnastring datadst"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Umum"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Tangkapan layar disimpan sebagai %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan tangkapan layar!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server hilang."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
@@ -1086,7 +1099,7 @@ msgstr "Pesan"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr "Hidupkan"
 
@@ -1270,8 +1283,8 @@ msgstr "Super besar (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(dasar)"
 
@@ -1581,20 +1594,20 @@ msgstr "Buat kelompok"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1614,7 +1627,7 @@ msgstr "Berat: %s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "Dagang"
 
@@ -1713,9 +1726,9 @@ msgstr "Berbicara"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1730,7 +1743,7 @@ msgstr "Beli"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1742,7 +1755,7 @@ msgstr "Jual"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr "Tambah komentar"
 
@@ -1768,7 +1781,7 @@ msgstr "Tambah ke daftar serangan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr "Tambah ke daftar abaikan"
 
@@ -1809,7 +1822,7 @@ msgstr "Jatuhkan rampasan"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1851,8 +1864,8 @@ msgstr "Pemain"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr "Keluarkan dari kelompok"
 
@@ -1864,8 +1877,8 @@ msgstr "Ambil"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "Tambah ke obrolan"
 
@@ -1880,8 +1893,8 @@ msgstr "Item Peta"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr "Hapus"
 
@@ -1903,7 +1916,7 @@ msgstr "Gerakkan kamera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Perlengkapan"
@@ -1982,8 +1995,8 @@ msgstr "Meninggalkan"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr "Salin ke papan"
 
@@ -2055,10 +2068,10 @@ msgstr "Tambah semua ke dagangan"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "Simpan"
 
@@ -2081,8 +2094,8 @@ msgstr "Simpan semua"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "Ambil"
 
@@ -2108,9 +2121,9 @@ msgstr "Ambil semua"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2118,47 +2131,47 @@ msgid "Use"
 msgstr "Gunakan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr "Bersihkan jendela buang"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr "Sembunyi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr "Tampil"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 #, fuzzy
 msgid "Open yellow bar settings"
 msgstr "Atur ulang bar kuning"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr "Atur ulang bar kuning"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr "Salin ke obrolan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr "Bergerak keatas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr "Bergerak kebawah"
 
@@ -2166,155 +2179,155 @@ msgstr "Bergerak kebawah"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr "Tanggalkan baju"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr "Salin"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr "Tempel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr "Buka tautan"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr "Tampil jendela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr "Abaikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Abaikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr "Daftar hitam"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr "Set sebagai musuh"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr "Berteman"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr "Batal pengabaian"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr "Ikuti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr "Beli(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr "Jual(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr "Undang ke kelompok"
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr "Gabung obrolan %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr "Perlihatkan Item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr "Hapus dari daftar pungut"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr "Tambah ke daftar pungut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr "Batal proteksi item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr "Proteksi item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "Buang..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr "Buang semua"
 
@@ -2322,60 +2335,60 @@ msgstr "Buang semua"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "Buang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr "Komando GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr "Cek ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr "Pergi ke"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr "Panggil balik"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr "Keluarkan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2396,7 +2409,7 @@ msgstr "Tombol cepat"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Jendela"
 
@@ -2664,7 +2677,7 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2686,7 +2699,7 @@ msgstr "Buka url"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2699,9 +2712,9 @@ msgstr "Keluar"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2712,9 +2725,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2724,7 +2737,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2733,7 +2746,7 @@ msgstr "Maks"
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Harga: %s / Total: %s"
@@ -3359,8 +3372,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3458,8 +3471,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3472,8 +3485,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3705,8 +3718,8 @@ msgstr "Tampil tombol emosi di obrolan"
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4160,7 +4173,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "Toko"
 
@@ -4559,12 +4572,13 @@ msgid "Allow whispers"
 msgstr "Perbolehkan berbisik"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5214,7 +5228,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "Perlengkapan"
 
@@ -5225,7 +5239,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Perbekalan"
@@ -5237,7 +5251,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr ""
@@ -5324,24 +5338,38 @@ msgstr ""
 msgid "Bank"
 msgstr ""
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "A"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5379,24 +5407,29 @@ msgid "Result"
 msgstr "Hasil"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "Buat"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5688,19 +5721,19 @@ msgid "Enter password:"
 msgstr "Masukkan sandi:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Kehadiran: %s; %d pemain yang hadir."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Berbisik ke %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5817,7 +5850,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5829,82 +5862,88 @@ msgid "Equip"
 msgstr "Pakai"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "Pecah"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "Semua"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to trade."
 msgstr "Pilih jumlah item yang mau di perdagangkan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Select amount of items to drop."
 msgstr "Pilih jumlah item yang ingin dibuang."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Select amount of items to store."
 msgstr "Pilih jumlah item yang ingin disimpan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "Pilih jumlah item yang ingin disimpan."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to retrieve."
 msgstr "Pilih jumlah item yang ingin diambil kembali."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:251
+#: src/gui/windows/itemamountwindow.cpp:264
 msgid "Select amount of items to split."
 msgstr "Pilih jumlah item yang ingin dipisahkan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "Tambahkan ke daftar beli."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "Tambahkan ke daftar jual."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "Tidak diketahui."
 
@@ -6045,6 +6084,113 @@ msgstr ""
 msgid "Open register url"
 msgstr ""
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "Email:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "Kirim"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "Tambah"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "Kepada:"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "Uang: %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "Item Peta"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#, fuzzy
+msgid "Message:"
+msgstr "Pesan"
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+#, fuzzy
+msgid "Time:"
+msgstr "Waktu"
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?)serangan"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+#, fuzzy
+msgid "New"
+msgstr "Jaring"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+#, fuzzy
+msgid "Return"
+msgstr "Kembali ke telur"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+#, fuzzy
+msgid "Open"
+msgstr "Buka url"
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr ""
@@ -6132,25 +6278,6 @@ msgstr "Berikutnya"
 msgid "Submit"
 msgstr "Masukan"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "Tambah"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "Kepada:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "Kirim"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8581,6 +8708,11 @@ msgstr ""
 msgid "New password too short."
 msgstr ""
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9519,6 +9651,66 @@ msgstr ""
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "Pemain berhasil %s!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "Pesan menutup obrolan."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+#, fuzzy
+msgid "Item attach failed."
+msgstr "Perbolehkan Penyaring Serangan"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+#, fuzzy
+msgid "Money attach failed."
+msgstr "Jarak serangan musuh"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+msgid "Message return failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+msgid "Message return success."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+msgid "Message deletion failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "Pemain berhasil %s!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/it.po b/po/it.po
index 6185751f2..3781a8d78 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
@@ -43,7 +43,7 @@ msgstr "File caricato"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -59,7 +59,7 @@ msgstr "File caricato"
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -292,6 +292,16 @@ msgstr "nella lista nera"
 msgid "enemy"
 msgstr "nemico"
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr ""
@@ -307,7 +317,7 @@ msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -457,8 +467,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "Ignora completamente."
 
@@ -485,37 +495,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Impostazioni"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Aiuto"
@@ -528,46 +538,49 @@ msgstr "Aiuto"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "Chiudi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "Accesso all'account"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "Caricamento personaggi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
@@ -583,7 +596,7 @@ msgstr "Cambiamento server del gioco"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -600,37 +613,37 @@ msgid "Error"
 msgstr "Errore"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "Cambia password"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "Cambia Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
@@ -670,36 +683,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Generale"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio immagine fallito!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è caduta."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "Errore di rete"
 
@@ -1092,7 +1105,7 @@ msgstr "Messaggio"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr ""
 
@@ -1278,8 +1291,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(default)"
 
@@ -1589,20 +1602,20 @@ msgstr "Crea gruppo"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1622,7 +1635,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "Commercia"
 
@@ -1721,9 +1734,9 @@ msgstr "Parla"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1738,7 +1751,7 @@ msgstr "Compra"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1750,7 +1763,7 @@ msgstr "Vendi"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr "Aggiungi commento"
 
@@ -1776,7 +1789,7 @@ msgstr "Aggiungi alla lista Attacco"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr "Aggiungi alla lista Ignora"
 
@@ -1817,7 +1830,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1859,8 +1872,8 @@ msgstr "Giocatori"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr "Caccia dal party"
 
@@ -1872,8 +1885,8 @@ msgstr "Raccogli"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
 
@@ -1888,8 +1901,8 @@ msgstr "Oggetto mappa"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -1911,7 +1924,7 @@ msgstr "Muovi telecamera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Attrezzatura"
@@ -1990,8 +2003,8 @@ msgstr "Lascia"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr "Copia negli appunti"
 
@@ -2063,10 +2076,10 @@ msgstr "Aggiungi tutti"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "Magazzino"
 
@@ -2089,8 +2102,8 @@ msgstr "Salva tutto"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "Recupera"
 
@@ -2116,9 +2129,9 @@ msgstr "Ritira tutto"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2126,47 +2139,47 @@ msgid "Use"
 msgstr "Usa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr "Nascondi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr "Mostra"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 #, fuzzy
 msgid "Open yellow bar settings"
 msgstr "Reset barra gialla"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr "Reset barra gialla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr "Copia in Chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr "Muovi Su"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr "Muovi Giù"
 
@@ -2174,155 +2187,155 @@ msgstr "Muovi Giù"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr "Spogliati"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr "Copia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr "Incolla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr "Apri link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr "Mostra Finestra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr "Lista nera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr "Identifica come nemico"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr "Elimina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr "Chiedi amicizia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr "Stop Ignora"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr "Segui"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr "Compra (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr "Vendi (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr "Invita nel party"
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr "Mostra Oggetti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr "Rimuovi dalla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr "Aggiungi alla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "Lascia..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr "Lascia tutto"
 
@@ -2330,60 +2343,60 @@ msgstr "Lascia tutto"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "Lascia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr "Caccia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2404,7 +2417,7 @@ msgstr "Shortcuts"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Finestre"
 
@@ -2672,7 +2685,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2694,7 +2707,7 @@ msgstr "Apri url"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2707,9 +2720,9 @@ msgstr "Esci"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2720,9 +2733,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2732,7 +2745,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2741,7 +2754,7 @@ msgstr "Massimo"
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prezzo: %s / Totale: %s"
@@ -3367,8 +3380,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3466,8 +3479,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3480,8 +3493,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3713,8 +3726,8 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4170,7 +4183,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "Negozio"
 
@@ -4569,12 +4582,13 @@ msgid "Allow whispers"
 msgstr "Permetti sussurri"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5230,7 +5244,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
@@ -5241,7 +5255,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventario"
@@ -5253,7 +5267,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr "Carrello"
@@ -5340,24 +5354,38 @@ msgstr ""
 msgid "Bank"
 msgstr ""
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "A"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5395,24 +5423,29 @@ msgid "Result"
 msgstr "Risultato"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr "Quantita':"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "Crea"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5704,19 +5737,19 @@ msgid "Enter password:"
 msgstr "Digitare password:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presente: %s; %d giocatori sono presenti."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurra a %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5833,7 +5866,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5845,82 +5878,88 @@ msgid "Equip"
 msgstr "Equipaggia"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "Dividi"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "Tutti"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to trade."
 msgstr "Seleziona la quantità di oggetti da scambiare."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Select amount of items to drop."
 msgstr "Seleziona la quantità di oggetti da lasciare."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Select amount of items to store."
 msgstr "Selezionare la quantità di oggetti da riporre."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "Selezionare la quantità di oggetti da riporre."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to retrieve."
 msgstr "Seleziona la quantità di oggetti da ritirare."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:251
+#: src/gui/windows/itemamountwindow.cpp:264
 msgid "Select amount of items to split."
 msgstr "Seleziona la quantità di oggetti da dividere."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "Aggiungi allo shop di acquisto."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "Aggiungi allo shop di vendita."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "Sconosciuto."
 
@@ -6063,6 +6102,112 @@ msgstr ""
 msgid "Open register url"
 msgstr "Apri URL di registrazione"
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "Email:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "Invia"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "Aggiungi"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "A:"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "Soldi: %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "Oggetto mappa"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#, fuzzy
+msgid "Message:"
+msgstr "Messaggio"
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+#, fuzzy
+msgid "Time:"
+msgstr "Tempo"
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?) attacco"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+#, fuzzy
+msgid "New"
+msgstr "Rete"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+msgid "Return"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+#, fuzzy
+msgid "Open"
+msgstr "Apri url"
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "Barra HP"
@@ -6150,25 +6295,6 @@ msgstr "Prossimo"
 msgid "Submit"
 msgstr "Invia"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "Aggiungi"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "A:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "Invia"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8608,6 +8734,11 @@ msgstr "La vecchia password è sbagliata."
 msgid "New password too short."
 msgstr "La nuova password è troppo corta."
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9546,6 +9677,68 @@ msgstr ""
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "Il giocatore è stato %s con successo!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "I messaggi chiudono la conversazione."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+#, fuzzy
+msgid "Item attach failed."
+msgstr "Attiva filtro attacchi"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+#, fuzzy
+msgid "Money attach failed."
+msgstr "Attiva filtro attacchi"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+#, fuzzy
+msgid "Message return failed."
+msgstr "Creazione Chat fallita!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+msgid "Message return success."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+#, fuzzy
+msgid "Message deletion failed."
+msgstr "Autenticazione fallita."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "La creazione del Party è avvenuta con successo."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/ja.po b/po/ja.po
index b530fd47c..ba4c6f6bb 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
@@ -39,7 +39,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -55,7 +55,7 @@ msgstr ""
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -287,6 +287,16 @@ msgstr "ブラックリスト化されています"
 msgid "enemy"
 msgstr "敵"
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr ""
@@ -302,7 +312,7 @@ msgid "Accepting incoming trade requests"
 msgstr "トレードリクエストを有効にしました"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -451,8 +461,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "完全無視"
 
@@ -479,37 +489,37 @@ msgstr "吹出し"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "ビデオ"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "テーマ"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "ヘルプ"
@@ -522,46 +532,49 @@ msgstr "ヘルプ"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "閉じる"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "サーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "ログインしています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
@@ -577,7 +590,7 @@ msgstr "ゲームサーバーを変更しています"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -594,37 +607,37 @@ msgid "Error"
 msgstr "エラー"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "パスワード変更"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "登録を解除しました"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "さようなら　また会いましょう..."
 
@@ -664,36 +677,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "一般"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "デバッグ"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存できませんでした!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr "サーバーへの接続が切断されました."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
@@ -1086,7 +1099,7 @@ msgstr "メッセージ"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr ""
 
@@ -1269,8 +1282,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(デフォルト)"
 
@@ -1580,20 +1593,20 @@ msgstr "パーティを作る"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1613,7 +1626,7 @@ msgstr "重力: %s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "トレード"
 
@@ -1712,9 +1725,9 @@ msgstr "話す"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1729,7 +1742,7 @@ msgstr "買う"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1741,7 +1754,7 @@ msgstr "売る"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr "コメントをする"
 
@@ -1767,7 +1780,7 @@ msgstr "攻撃リストへ追加する"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr "攻撃無視リストへ追加する"
 
@@ -1808,7 +1821,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1850,8 +1863,8 @@ msgstr "プレイヤー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr "パーティから一時的に追い出す"
 
@@ -1863,8 +1876,8 @@ msgstr "拾う"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "チャットに追加"
 
@@ -1879,8 +1892,8 @@ msgstr "マップアイテム"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr "削除"
 
@@ -1902,7 +1915,7 @@ msgstr "カメラを動かす"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "服装"
@@ -1981,8 +1994,8 @@ msgstr "退会"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr "クリップボードにコピー"
 
@@ -2054,10 +2067,10 @@ msgstr "トレードウィンドウに全て追加する"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "保管"
 
@@ -2080,8 +2093,8 @@ msgstr "全部保存"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "取出す"
 
@@ -2107,9 +2120,9 @@ msgstr "全部取出す"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2117,47 +2130,47 @@ msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr "ドロップ窓を消す"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr " 非表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr "表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 #, fuzzy
 msgid "Open yellow bar settings"
 msgstr "黄色バーをリセットする"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr "黄色バーをリセットする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr "チャットへコピーする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr "上へ移動"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr "下へ移動"
 
@@ -2165,155 +2178,155 @@ msgstr "下へ移動"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr "脱ぐ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr "コピー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr "ペースト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr "無視する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "無視"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr "ブラックリスト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr "敵に設定する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr "消す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr "友達になる"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr "完全無視解除"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr "フォロー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr "買う (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr "売る (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr "パーティへ招待"
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr "アイテムを表示する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "落とす..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr "全て落とす"
 
@@ -2321,60 +2334,60 @@ msgstr "全て落とす"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "落とす"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr "追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2395,7 +2408,7 @@ msgstr "ショートカット"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "ウィンドウ"
 
@@ -2663,7 +2676,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2685,7 +2698,7 @@ msgstr "URLを開く"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2698,9 +2711,9 @@ msgstr "終了"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2711,9 +2724,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2723,7 +2736,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2732,7 +2745,7 @@ msgstr "最大"
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "価格:%s /合計:%s"
@@ -3358,8 +3371,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3457,8 +3470,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3471,8 +3484,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3704,8 +3717,8 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4161,7 +4174,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "店"
 
@@ -4560,12 +4573,13 @@ msgid "Allow whispers"
 msgstr "全てのささやきを受け取る"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5215,7 +5229,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "装着品"
 
@@ -5226,7 +5240,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "インベントリー"
@@ -5238,7 +5252,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr "カート"
@@ -5325,24 +5339,38 @@ msgstr ""
 msgid "Bank"
 msgstr ""
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "地図"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5380,24 +5408,29 @@ msgid "Result"
 msgstr "結果"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr "量:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "作成"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5689,19 +5722,19 @@ msgid "Enter password:"
 msgstr "パスワードを入力して下さい:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "現在: %s; %d プレイヤーがいます."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%sにささやき中:%s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5818,7 +5851,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5830,82 +5863,88 @@ msgid "Equip"
 msgstr "装着"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "分割"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "全て"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to trade."
 msgstr "トレードするアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Select amount of items to drop."
 msgstr "落とすアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Select amount of items to store."
 msgstr "保管するアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "保管するアイテムの数量を入力してください."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to retrieve."
 msgstr "取出すアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:251
+#: src/gui/windows/itemamountwindow.cpp:264
 msgid "Select amount of items to split."
 msgstr "分割するアイテムの量を選択してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "購入リストに追加."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "販売リストに追加."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "不明."
 
@@ -6046,6 +6085,112 @@ msgstr "アップデートホスト: %s"
 msgid "Open register url"
 msgstr ""
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "Eメール:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "送信する"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "追加"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "宛先:"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "GP: %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "マップアイテム"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#, fuzzy
+msgid "Message:"
+msgstr "メッセージ"
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+#, fuzzy
+msgid "Time:"
+msgstr "時間"
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?) 攻撃"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+#, fuzzy
+msgid "New"
+msgstr "ネット"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+msgid "Return"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+#, fuzzy
+msgid "Open"
+msgstr "URLを開く"
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "健康"
@@ -6133,25 +6278,6 @@ msgstr "次"
 msgid "Submit"
 msgstr "決定"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "追加"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "宛先:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "送信する"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8591,6 +8717,11 @@ msgstr "変更前のパスワードが間違っています."
 msgid "New password too short."
 msgstr "新しいパスワードは文字数が足りません."
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9529,6 +9660,68 @@ msgstr ""
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "プレイヤーの%sに成功しました!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "チャットを閉じます."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+#, fuzzy
+msgid "Item attach failed."
+msgstr "認証エラー."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+#, fuzzy
+msgid "Money attach failed."
+msgstr "攻撃フィルターを有効にする"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+#, fuzzy
+msgid "Message return failed."
+msgstr "チャット作成失敗!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+msgid "Message return success."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+#, fuzzy
+msgid "Message deletion failed."
+msgstr "認証に失敗しました."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "パーティを作成しました."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 062b5e0d1..eb3a8a1a0 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
+"POT-Creation-Date: 2015-05-04 02:30+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"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -48,7 +48,7 @@ msgstr ""
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -280,6 +280,16 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr ""
@@ -295,7 +305,7 @@ msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -445,8 +455,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr ""
 
@@ -473,37 +483,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
@@ -516,46 +526,49 @@ msgstr ""
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr ""
 
@@ -571,7 +584,7 @@ msgstr ""
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -588,37 +601,37 @@ msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -658,36 +671,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr ""
 
@@ -1080,7 +1093,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr ""
 
@@ -1263,8 +1276,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1574,20 +1587,20 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1607,7 +1620,7 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr ""
 
@@ -1706,9 +1719,9 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1723,7 +1736,7 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1735,7 +1748,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr ""
 
@@ -1761,7 +1774,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1802,7 +1815,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1844,8 +1857,8 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr ""
 
@@ -1857,8 +1870,8 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr ""
 
@@ -1873,8 +1886,8 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr ""
 
@@ -1896,7 +1909,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr ""
@@ -1975,8 +1988,8 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2048,10 +2061,10 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr ""
 
@@ -2074,8 +2087,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr ""
 
@@ -2101,9 +2114,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2111,46 +2124,46 @@ msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr ""
 
@@ -2158,155 +2171,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr ""
 
@@ -2314,60 +2327,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2388,7 +2401,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr ""
 
@@ -2656,7 +2669,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2678,7 +2691,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2691,9 +2704,9 @@ msgstr ""
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr ""
@@ -2704,9 +2717,9 @@ msgstr ""
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr ""
@@ -2716,7 +2729,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2725,7 +2738,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -3351,8 +3364,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3450,8 +3463,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3464,8 +3477,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3697,8 +3710,8 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4152,7 +4165,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr ""
 
@@ -4551,12 +4564,13 @@ msgid "Allow whispers"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5206,7 +5220,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr ""
 
@@ -5217,7 +5231,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr ""
@@ -5229,7 +5243,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr ""
@@ -5316,24 +5330,37 @@ msgstr ""
 msgid "Bank"
 msgstr ""
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+msgid "MA"
+msgstr ""
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5371,24 +5398,29 @@ msgid "Result"
 msgstr ""
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr ""
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5680,19 +5712,19 @@ msgid "Enter password:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5809,7 +5841,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5821,82 +5853,87 @@ msgid "Equip"
 msgstr ""
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:247
+msgid "Select amount of items to send."
+msgstr ""
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:251
+#: src/gui/windows/itemamountwindow.cpp:264
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr ""
 
@@ -6039,6 +6076,104 @@ msgstr ""
 msgid "Open register url"
 msgstr ""
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+msgid "Edit mail"
+msgstr ""
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr ""
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+msgid "Money:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+msgid "Item:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+msgid "Message:"
+msgstr ""
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+msgid "Time:"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+msgid "Get attach"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+msgid "New"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+msgid "Return"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+msgid "Open"
+msgstr ""
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr ""
@@ -6126,25 +6261,6 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr ""
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr ""
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr ""
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8574,6 +8690,11 @@ msgstr ""
 msgid "New password too short."
 msgstr ""
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9512,6 +9633,61 @@ msgstr ""
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+msgid "Message succesfully sent."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+msgid "Message send failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+msgid "Item attach failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+msgid "Money attach failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+msgid "Message return failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+msgid "Message return success."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+msgid "Message deletion failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+msgid "Message successfully deleted."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/nl.po b/po/nl.po
index cea7b2614..190622cb1 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
@@ -36,7 +36,7 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -52,7 +52,7 @@ msgstr "Bestand is opgeladen"
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -284,6 +284,16 @@ msgstr "Op de zwarte lijst gezet"
 msgid "enemy"
 msgstr "vijand"
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr ""
@@ -299,7 +309,7 @@ msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -449,8 +459,8 @@ msgstr "You see %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -477,37 +487,37 @@ msgstr "Zwevende bel"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performantie"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Thema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr "Over"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Help"
@@ -520,46 +530,49 @@ msgstr "Help"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "Inloggen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
@@ -575,7 +588,7 @@ msgstr "Wijzigen spelservers"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -592,37 +605,37 @@ msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
@@ -662,36 +675,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Algemeen"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Schermafdruk opgeslagen als %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "Netwerkfout"
 
@@ -1084,7 +1097,7 @@ msgstr "Bericht"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr ""
 
@@ -1269,8 +1282,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1580,20 +1593,20 @@ msgstr "Groep aanmaken"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1613,7 +1626,7 @@ msgstr "Gewicht: %s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "Handel"
 
@@ -1712,9 +1725,9 @@ msgstr "Spreken"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1729,7 +1742,7 @@ msgstr "Kopen"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1741,7 +1754,7 @@ msgstr "Verkopen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr ""
 
@@ -1767,7 +1780,7 @@ msgstr "Aan de aanvalslijst toevoegen"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
@@ -1808,7 +1821,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1850,8 +1863,8 @@ msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
@@ -1863,8 +1876,8 @@ msgstr "Raap op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
@@ -1879,8 +1892,8 @@ msgstr "Plaats voorwerp op de kaart"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr "Verwijder"
 
@@ -1902,7 +1915,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Kleren"
@@ -1981,8 +1994,8 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2054,10 +2067,10 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "Opslaan"
 
@@ -2080,8 +2093,8 @@ msgstr "Plaats alles"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "Afhalen"
 
@@ -2107,9 +2120,9 @@ msgstr "Haal alles op"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2117,46 +2130,46 @@ msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2164,155 +2177,155 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr "Geen rekening mee houden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Negeer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr "uitnodigen voor de groep"
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
@@ -2320,60 +2333,60 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr "Ga naar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr "Schop"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2394,7 +2407,7 @@ msgstr "Snelkoppeling"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr ""
 
@@ -2662,7 +2675,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2684,7 +2697,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2697,9 +2710,9 @@ msgstr "Afsluiten"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2710,9 +2723,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2722,7 +2735,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2731,7 +2744,7 @@ msgstr "Maximum"
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prijs: %s / Totaal: %s"
@@ -3357,8 +3370,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3456,8 +3469,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3470,8 +3483,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3703,8 +3716,8 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4158,7 +4171,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "Winkel"
 
@@ -4557,12 +4570,13 @@ msgid "Allow whispers"
 msgstr "Fluisteren toestaan"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5218,7 +5232,7 @@ msgstr "UITR"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "Uitrusting"
 
@@ -5229,7 +5243,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventaris"
@@ -5241,7 +5255,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr "Winkelkar"
@@ -5328,24 +5342,38 @@ msgstr ""
 msgid "Bank"
 msgstr ""
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "MAP"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr "CONF"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5383,24 +5411,29 @@ msgid "Result"
 msgstr "Resultaat"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "Aanmaken"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5692,19 +5725,19 @@ msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Aanwezig: %s; %d speler zijn aanwezig."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5821,7 +5854,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5833,82 +5866,88 @@ msgid "Equip"
 msgstr "Uitrusten"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "Splitsen"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal voorwerpen om te verhandelen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:238
 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:235
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Select amount of items to store."
 msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to retrieve."
 msgstr "Selecteer hoeveelheid voorwerpen terug te nemen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:251
+#: src/gui/windows/itemamountwindow.cpp:264
 msgid "Select amount of items to split."
 msgstr "Selecteer hoeveelheid voorwerpen om te splitsen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "Toevoegen om te kopen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "Toevoegen om te verkopen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "Onbekend."
 
@@ -6051,6 +6090,111 @@ msgstr ""
 msgid "Open register url"
 msgstr ""
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "E-mail:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "Verzenden"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "Toevoegen"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "Aan:"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "Geld: %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "Plaats voorwerp op de kaart"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#, fuzzy
+msgid "Message:"
+msgstr "Bericht"
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+#, fuzzy
+msgid "Time:"
+msgstr "Tijd"
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?) aanval"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+#, fuzzy
+msgid "New"
+msgstr "Net"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+msgid "Return"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+msgid "Open"
+msgstr ""
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr ""
@@ -6138,25 +6282,6 @@ msgstr "Volgende"
 msgid "Submit"
 msgstr "Indienen"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "Toevoegen"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "Aan:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "Verzenden"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8593,6 +8718,11 @@ msgstr "Oud wachtwoord is ongeldig."
 msgid "New password too short."
 msgstr "Nieuw wachtwoord is te kort."
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9532,6 +9662,68 @@ msgstr ""
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "Speler succesvol %s!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "Bericht sluit chat."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+#, fuzzy
+msgid "Item attach failed."
+msgstr "Voorwerpdeling ingeschakeld."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+#, fuzzy
+msgid "Money attach failed."
+msgstr "Aanvalsbereik van monster"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+#, fuzzy
+msgid "Message return failed."
+msgstr "Chatcreatie mislukte!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+msgid "Message return success."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+#, fuzzy
+msgid "Message deletion failed."
+msgstr "Authenticatie gefaald."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "Groep succesvol aangemaakt."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/nl_BE.po b/po/nl_BE.po
index cea7b2614..190622cb1 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
@@ -36,7 +36,7 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -52,7 +52,7 @@ msgstr "Bestand is opgeladen"
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -284,6 +284,16 @@ msgstr "Op de zwarte lijst gezet"
 msgid "enemy"
 msgstr "vijand"
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr ""
@@ -299,7 +309,7 @@ msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -449,8 +459,8 @@ msgstr "You see %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -477,37 +487,37 @@ msgstr "Zwevende bel"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performantie"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Thema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr "Over"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Help"
@@ -520,46 +530,49 @@ msgstr "Help"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "Inloggen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
@@ -575,7 +588,7 @@ msgstr "Wijzigen spelservers"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -592,37 +605,37 @@ msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
@@ -662,36 +675,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Algemeen"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Schermafdruk opgeslagen als %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "Netwerkfout"
 
@@ -1084,7 +1097,7 @@ msgstr "Bericht"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr ""
 
@@ -1269,8 +1282,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1580,20 +1593,20 @@ msgstr "Groep aanmaken"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1613,7 +1626,7 @@ msgstr "Gewicht: %s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "Handel"
 
@@ -1712,9 +1725,9 @@ msgstr "Spreken"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1729,7 +1742,7 @@ msgstr "Kopen"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1741,7 +1754,7 @@ msgstr "Verkopen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr ""
 
@@ -1767,7 +1780,7 @@ msgstr "Aan de aanvalslijst toevoegen"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
@@ -1808,7 +1821,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1850,8 +1863,8 @@ msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
@@ -1863,8 +1876,8 @@ msgstr "Raap op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
@@ -1879,8 +1892,8 @@ msgstr "Plaats voorwerp op de kaart"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr "Verwijder"
 
@@ -1902,7 +1915,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Kleren"
@@ -1981,8 +1994,8 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2054,10 +2067,10 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "Opslaan"
 
@@ -2080,8 +2093,8 @@ msgstr "Plaats alles"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "Afhalen"
 
@@ -2107,9 +2120,9 @@ msgstr "Haal alles op"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2117,46 +2130,46 @@ msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2164,155 +2177,155 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr "Geen rekening mee houden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Negeer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr "uitnodigen voor de groep"
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
@@ -2320,60 +2333,60 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr "Ga naar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr "Schop"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2394,7 +2407,7 @@ msgstr "Snelkoppeling"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr ""
 
@@ -2662,7 +2675,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2684,7 +2697,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2697,9 +2710,9 @@ msgstr "Afsluiten"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2710,9 +2723,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2722,7 +2735,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2731,7 +2744,7 @@ msgstr "Maximum"
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prijs: %s / Totaal: %s"
@@ -3357,8 +3370,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3456,8 +3469,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3470,8 +3483,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3703,8 +3716,8 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4158,7 +4171,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "Winkel"
 
@@ -4557,12 +4570,13 @@ msgid "Allow whispers"
 msgstr "Fluisteren toestaan"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5218,7 +5232,7 @@ msgstr "UITR"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "Uitrusting"
 
@@ -5229,7 +5243,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventaris"
@@ -5241,7 +5255,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr "Winkelkar"
@@ -5328,24 +5342,38 @@ msgstr ""
 msgid "Bank"
 msgstr ""
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "MAP"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr "CONF"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5383,24 +5411,29 @@ msgid "Result"
 msgstr "Resultaat"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "Aanmaken"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5692,19 +5725,19 @@ msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Aanwezig: %s; %d speler zijn aanwezig."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5821,7 +5854,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5833,82 +5866,88 @@ msgid "Equip"
 msgstr "Uitrusten"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "Splitsen"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal voorwerpen om te verhandelen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:238
 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:235
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Select amount of items to store."
 msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to retrieve."
 msgstr "Selecteer hoeveelheid voorwerpen terug te nemen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:251
+#: src/gui/windows/itemamountwindow.cpp:264
 msgid "Select amount of items to split."
 msgstr "Selecteer hoeveelheid voorwerpen om te splitsen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "Toevoegen om te kopen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "Toevoegen om te verkopen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "Onbekend."
 
@@ -6051,6 +6090,111 @@ msgstr ""
 msgid "Open register url"
 msgstr ""
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "E-mail:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "Verzenden"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "Toevoegen"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "Aan:"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "Geld: %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "Plaats voorwerp op de kaart"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#, fuzzy
+msgid "Message:"
+msgstr "Bericht"
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+#, fuzzy
+msgid "Time:"
+msgstr "Tijd"
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?) aanval"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+#, fuzzy
+msgid "New"
+msgstr "Net"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+msgid "Return"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+msgid "Open"
+msgstr ""
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr ""
@@ -6138,25 +6282,6 @@ msgstr "Volgende"
 msgid "Submit"
 msgstr "Indienen"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "Toevoegen"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "Aan:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "Verzenden"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8593,6 +8718,11 @@ msgstr "Oud wachtwoord is ongeldig."
 msgid "New password too short."
 msgstr "Nieuw wachtwoord is te kort."
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9532,6 +9662,68 @@ msgstr ""
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "Speler succesvol %s!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "Bericht sluit chat."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+#, fuzzy
+msgid "Item attach failed."
+msgstr "Voorwerpdeling ingeschakeld."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+#, fuzzy
+msgid "Money attach failed."
+msgstr "Aanvalsbereik van monster"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+#, fuzzy
+msgid "Message return failed."
+msgstr "Chatcreatie mislukte!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+msgid "Message return success."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+#, fuzzy
+msgid "Message deletion failed."
+msgstr "Authenticatie gefaald."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "Groep succesvol aangemaakt."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/pl.po b/po/pl.po
index bc8eee80d..0046a5bbf 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
@@ -40,7 +40,7 @@ msgstr "Plik wysłano"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -56,7 +56,7 @@ msgstr "Plik wysłano"
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -288,6 +288,16 @@ msgstr "dodany/a do czarnej listy"
 msgid "enemy"
 msgstr "wróg"
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr ""
@@ -303,7 +313,7 @@ msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -454,8 +464,8 @@ msgstr "Widzisz %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "Całkowicie ignoruj"
 
@@ -482,37 +492,37 @@ msgstr "Bąbelek nad głową"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Konfiguracja"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Wydajność"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "Ekran"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Skórka"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr "O..."
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Pomoc"
@@ -525,46 +535,49 @@ msgstr "Pomoc"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "Zamknij"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "Logowanie"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "Wchodzenie do świata gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "Sprawdzanie postaci"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "Łączenie się z serwerem gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "Zmiana serwera"
 
@@ -580,7 +593,7 @@ msgstr "Zmiana serwera"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -597,37 +610,37 @@ msgid "Error"
 msgstr "Błąd"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "Sprawdzanie szczegółów rejestracji"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "Zmiana hasła"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "Hasło zmienione z powodzeniem!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "Zmiana adresu e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "Adres e-mail zmieniony z powodzeniem!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "Wyrejestrowano z powodzeniem"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "Żegnaj, będziemy czekać na Twój powrót..."
 
@@ -667,36 +680,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Ogólny"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Zrzut ekranu zapisany jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr "Połączenie z serwerem zostało zerwane."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "Błąd sieci"
 
@@ -1089,7 +1102,7 @@ msgstr "Wiadomość"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr "Wskrześ"
 
@@ -1275,8 +1288,8 @@ msgstr "Ogromna (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(domyślne)"
 
@@ -1586,20 +1599,20 @@ msgstr "Utwórz grupę"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1619,7 +1632,7 @@ msgstr "Waga: %s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "Handel"
 
@@ -1718,9 +1731,9 @@ msgstr "Rozmowa"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1735,7 +1748,7 @@ msgstr "Kup"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1747,7 +1760,7 @@ msgstr "Sprzedaj"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr "Dodaj komentarz"
 
@@ -1773,7 +1786,7 @@ msgstr "Dodaj do listy atakowanych"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr "Dodaj do listy ignorowanych"
 
@@ -1814,7 +1827,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1856,8 +1869,8 @@ msgstr "Gracze"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr "Wyrzuć z grupy"
 
@@ -1869,8 +1882,8 @@ msgstr "Podnieś"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "Dodaj do czatu"
 
@@ -1885,8 +1898,8 @@ msgstr "Portal"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr "Usuń"
 
@@ -1908,7 +1921,7 @@ msgstr "Przesuwaj kamerę"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Stroje"
@@ -1987,8 +2000,8 @@ msgstr "Opuść"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr "Skopiuj do schowka"
 
@@ -2060,10 +2073,10 @@ msgstr "Dodaj wszystko do handlu"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "Podaj"
 
@@ -2086,8 +2099,8 @@ msgstr "Podaj wszystko"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "Pobierz"
 
@@ -2113,9 +2126,9 @@ msgstr "Pobierz wszystko"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2123,47 +2136,47 @@ msgid "Use"
 msgstr "Użyj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr "Wyczyść okno upuszczeń."
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr "Ukryj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr "Pokaż"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 #, fuzzy
 msgid "Open yellow bar settings"
 msgstr "Zresetuj żółty pasek"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr "Zresetuj żółty pasek"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr "Skopiuj do czatu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr "W górę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr "W dół"
 
@@ -2171,155 +2184,155 @@ msgstr "W dół"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr "Rozbierz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr "Kopiuj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr "Wklej"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr "Otwórz adres internetowy"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr "Pokaż okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr "Lekceważ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignoruj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr "Czarna lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr "Ustaw jako wroga"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr "Usuń"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr "Dodaj do znajomych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr "Odignoruj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr "Podążaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr "Kup (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr "Sprzedaj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr "Zaproś do grupy"
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr "Pokaż przedmioty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr "Usuń z listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr "Dodaj do listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr "Przestań chronić przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr "Chroń przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "Upuść..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr "Upuść wszystko"
 
@@ -2327,60 +2340,60 @@ msgstr "Upuść wszystko"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "Upuść"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr "Polecenia GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr "Sprawdź IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr "Idź do"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr "Przywołaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr "Wyrzuć"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2401,7 +2414,7 @@ msgstr "Skróty"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Okna"
 
@@ -2669,7 +2682,7 @@ msgstr "Poziom: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2691,7 +2704,7 @@ msgstr "Otwórz adres url"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2704,9 +2717,9 @@ msgstr "Wyjdź"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2717,9 +2730,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2729,7 +2742,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2738,7 +2751,7 @@ msgstr "Maks."
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cena: %s/ Razem: %s"
@@ -3366,8 +3379,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3465,8 +3478,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3479,8 +3492,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3712,8 +3725,8 @@ msgstr "Pokazuj przycisk emotek w czacie"
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4169,7 +4182,7 @@ msgstr "Aktywuj powiadomienia dotyczące wagi."
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "Sklep"
 
@@ -4570,12 +4583,13 @@ msgid "Allow whispers"
 msgstr "Zezwól na szepty"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5230,7 +5244,7 @@ msgstr "EKW"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "Ekwipunek"
 
@@ -5241,7 +5255,7 @@ msgstr "INW"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inwentarz"
@@ -5253,7 +5267,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr "Wózek"
@@ -5340,24 +5354,38 @@ msgstr ""
 msgid "Bank"
 msgstr ""
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "MAP"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr "OKN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5395,24 +5423,29 @@ msgid "Result"
 msgstr "Rezultat"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr "Utwórz przedmioty"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr "Ilość:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "Utwórz"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5709,19 +5742,19 @@ msgid "Enter password:"
 msgstr "Wprowadź hasło:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%s obecny/a. %d graczy online."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Szepczesz do %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr "zwierzątko gracza %s's"
@@ -5838,7 +5871,7 @@ msgstr "Czy wiesz, że..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5850,82 +5883,88 @@ msgid "Equip"
 msgstr "Załóż"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "Podziel"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "wszystkie"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to trade."
 msgstr "Wybierz ilość przedmiotów do handlu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Select amount of items to drop."
 msgstr "Wybierz ilość przedmiotów do upuszczenia."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Select amount of items to store."
 msgstr "Podaj ilość rzeczy do przechowania."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "Podaj ilość rzeczy do przechowania."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to retrieve."
 msgstr "Wybierz ilość przedmiotów do pobrania."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:251
+#: src/gui/windows/itemamountwindow.cpp:264
 msgid "Select amount of items to split."
 msgstr "Wybierz ilość przedmiotów do podziału."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "Dodaj to sklepu (sprzedaj)."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "Dodaj do sklepu (kupuj)."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "Nieznany obiekt."
 
@@ -6070,6 +6109,112 @@ msgstr "Host aktualizacji: %s"
 msgid "Open register url"
 msgstr "Otwórz stronę z rejestracją"
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "E-mail:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "Wyślij"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "Dodaj"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "Do:"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "Pieniądze: %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "Portal"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#, fuzzy
+msgid "Message:"
+msgstr "Wiadomość"
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+#, fuzzy
+msgid "Time:"
+msgstr "Czas"
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?) atak"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+#, fuzzy
+msgid "New"
+msgstr "Sieć"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+msgid "Return"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+#, fuzzy
+msgid "Open"
+msgstr "Otwórz adres url"
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "pasek życia"
@@ -6157,25 +6302,6 @@ msgstr "Dalej"
 msgid "Submit"
 msgstr "Zatwierdź"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "Dodaj"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "Do:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "Wyślij"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8610,6 +8736,11 @@ msgstr "Stare hasło nieprawidłowe."
 msgid "New password too short."
 msgstr "Nowe hasło jest zbyt krótkie."
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9552,6 +9683,68 @@ msgstr ""
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "Gracz jest teraz %s!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "Wiadomość zamyka czat."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+#, fuzzy
+msgid "Item attach failed."
+msgstr "Na tym serwerze nie można utworzyć gildii."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+#, fuzzy
+msgid "Money attach failed."
+msgstr "Zasięg ataku potwora"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+#, fuzzy
+msgid "Message return failed."
+msgstr "Nie można stworzyć czatu!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+msgid "Message return success."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+#, fuzzy
+msgid "Message deletion failed."
+msgstr "Błąd uwierzytelniania."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "Grupa utworzona z powodzeniem."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/pt.po b/po/pt.po
index ad90e8aa4..f469a6329 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
@@ -36,7 +36,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -52,7 +52,7 @@ msgstr ""
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -284,6 +284,16 @@ msgstr "Na Lista Negra"
 msgid "enemy"
 msgstr "Inimigo"
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr ""
@@ -299,7 +309,7 @@ msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -449,8 +459,8 @@ msgstr "Você vê %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -477,37 +487,37 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -520,46 +530,49 @@ msgstr "Ajuda"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "Efetuando login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
@@ -575,7 +588,7 @@ msgstr "Mudando servidores do jogo"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -592,37 +605,37 @@ msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
@@ -662,36 +675,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em: %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "Erro de conexão"
 
@@ -1084,7 +1097,7 @@ msgstr "Mensagem"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr ""
 
@@ -1271,8 +1284,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1582,20 +1595,20 @@ msgstr "Criar grupo"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1615,7 +1628,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "Negócios"
 
@@ -1714,9 +1727,9 @@ msgstr "Falar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1731,7 +1744,7 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1743,7 +1756,7 @@ msgstr "Vender"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
@@ -1769,7 +1782,7 @@ msgstr "Adicionar a lista de ataques"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
@@ -1810,7 +1823,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1852,8 +1865,8 @@ msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr "Chutar do grupo"
 
@@ -1865,8 +1878,8 @@ msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "Nome no chat"
 
@@ -1881,8 +1894,8 @@ msgstr "Mapa Item"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr "A Remover"
 
@@ -1904,7 +1917,7 @@ msgstr "Mover câmera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Roupas"
@@ -1983,8 +1996,8 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr "CopiaCopiar para a área de transferência"
 
@@ -2056,10 +2069,10 @@ msgstr "Add. todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "Armazenar"
 
@@ -2082,8 +2095,8 @@ msgstr "Guardar tudo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "Retirar"
 
@@ -2109,9 +2122,9 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2119,47 +2132,47 @@ msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 #, fuzzy
 msgid "Open yellow bar settings"
 msgstr "Resetar barra amarela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr "Resetar barra amarela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr "Copiar para o chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr "Mover a cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr "Mover a baixo"
 
@@ -2167,155 +2180,155 @@ msgstr "Mover a baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr "Abrir link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr "Mostrar janela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr "Ser inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr "Definir como inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr "Ser Amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr "Mostar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr "Remover lista de pegar itens"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr "Adicionar na lista de pegar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -2323,60 +2336,60 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr "Chutar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2397,7 +2410,7 @@ msgstr "Atalhos"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Janelas"
 
@@ -2665,7 +2678,7 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2687,7 +2700,7 @@ msgstr "Abrir URL"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2700,9 +2713,9 @@ msgstr "Sair"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2713,9 +2726,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2725,7 +2738,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2734,7 +2747,7 @@ msgstr "Máximo"
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preço: %s / Total: %s"
@@ -3360,8 +3373,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3459,8 +3472,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3473,8 +3486,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3706,8 +3719,8 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4163,7 +4176,7 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "Loja"
 
@@ -4562,12 +4575,13 @@ msgid "Allow whispers"
 msgstr "Permitir mensagens particulares"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5221,7 +5235,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "Equipamento"
 
@@ -5232,7 +5246,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventário"
@@ -5244,7 +5258,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr "Carrinho"
@@ -5331,24 +5345,38 @@ msgstr ""
 msgid "Bank"
 msgstr ""
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "MAP"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr "CON"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5386,24 +5414,29 @@ msgid "Result"
 msgstr "Resultado"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr "Quantidade:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "Criar"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5700,19 +5733,19 @@ msgid "Enter password:"
 msgstr "Entre com a senha:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5829,7 +5862,7 @@ msgstr "Você Sabia..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5841,82 +5874,88 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "Dividir"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "Tudo"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to trade."
 msgstr "Selecionar quantidade de itens para negociar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Select amount of items to drop."
 msgstr "Selecionar quantidade de itens para descartar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Select amount of items to store."
 msgstr "Escolha a quantidade de itens para armazenar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "Escolha a quantidade de itens para armazenar."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to retrieve."
 msgstr "Escolha a quantidade de itens para retirar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:251
+#: src/gui/windows/itemamountwindow.cpp:264
 msgid "Select amount of items to split."
 msgstr "Selecionar quantidade de itens para dividir."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "Adicionar na loja de compra."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "Adicionar na loja de venda."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "Desconhecido."
 
@@ -6059,6 +6098,112 @@ msgstr "Atualizando Servidores: %s"
 msgid "Open register url"
 msgstr "Abrir URL de cadastro"
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "Email:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "Enviar"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "Adicionar"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "Para:"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "Dinheiro: %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "Mapa Item"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#, fuzzy
+msgid "Message:"
+msgstr "Mensagem"
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+#, fuzzy
+msgid "Time:"
+msgstr "Tempo"
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?) Ataque"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+#, fuzzy
+msgid "New"
+msgstr "Rede"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+msgid "Return"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+#, fuzzy
+msgid "Open"
+msgstr "Abrir URL"
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "Barra de Vida"
@@ -6146,25 +6291,6 @@ msgstr "Próximo"
 msgid "Submit"
 msgstr "Enviar"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "Adicionar"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "Para:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "Enviar"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8605,6 +8731,11 @@ msgstr "Senha antiga incorreta."
 msgid "New password too short."
 msgstr "Nova senha é muito curta."
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9544,6 +9675,68 @@ msgstr ""
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "Jogador %s com sucesso!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "A mensagem fecha o chat."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+#, fuzzy
+msgid "Item attach failed."
+msgstr "Falha ao checar Emperium."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+#, fuzzy
+msgid "Money attach failed."
+msgstr "Alcance do monstro"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+#, fuzzy
+msgid "Message return failed."
+msgstr "Falha ao criar Chat!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+msgid "Message return success."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+#, fuzzy
+msgid "Message deletion failed."
+msgstr "Falha de autenticação."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "Grupo criado."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b8867ea18..86b9b39e9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -47,7 +47,7 @@ msgstr "Arquivo enviado"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -63,7 +63,7 @@ msgstr "Arquivo enviado"
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -297,6 +297,16 @@ msgstr "Na Lista Negra"
 msgid "enemy"
 msgstr "inimigo"
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr ""
@@ -312,7 +322,7 @@ msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -462,8 +472,8 @@ msgstr "Você vê %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -490,37 +500,37 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Desempenho"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr "Sobre"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -533,46 +543,49 @@ msgstr "Ajuda"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Conectando-se ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "Fazendo login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "Entrando no mundo do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "Requerindo personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "Mudando de servidor do jogo"
 
@@ -588,7 +601,7 @@ msgstr "Mudando de servidor do jogo"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -605,37 +618,37 @@ msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "Adeus, volte sempre..."
 
@@ -675,36 +688,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "Erro de conexão"
 
@@ -1097,7 +1110,7 @@ msgstr "Mensagem"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr "Reviver"
 
@@ -1284,8 +1297,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1595,20 +1608,20 @@ msgstr "Criar grupo"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1628,7 +1641,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "Negociação"
 
@@ -1727,9 +1740,9 @@ msgstr "Falar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1744,7 +1757,7 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1756,7 +1769,7 @@ msgstr "Vender"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
@@ -1782,7 +1795,7 @@ msgstr "Adicionar a lista de ataques"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
@@ -1823,7 +1836,7 @@ msgstr "Descartar saque"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1865,8 +1878,8 @@ msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr "Expulsar do grupo"
 
@@ -1878,8 +1891,8 @@ msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "Nome no chat"
 
@@ -1894,8 +1907,8 @@ msgstr "Mapa Item"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr "Remover"
 
@@ -1917,7 +1930,7 @@ msgstr "Mover câmera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Roupas"
@@ -1996,8 +2009,8 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr "Copiar para a área de transferência"
 
@@ -2069,10 +2082,10 @@ msgstr "Adicionar todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "Armazenar"
 
@@ -2095,8 +2108,8 @@ msgstr "Guardar tudo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "Retirar"
 
@@ -2122,9 +2135,9 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2132,47 +2145,47 @@ msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 #, fuzzy
 msgid "Open yellow bar settings"
 msgstr "Zerar barra amarela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr "Zerar barra amarela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr "Copiar para chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr "Mover para cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr "Mover para baixo"
 
@@ -2180,155 +2193,155 @@ msgstr "Mover para baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr "Despir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr "Abrir endereço"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr "Mostrar Janela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr "Ser inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr "Definir como inimigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr "Ser amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr "vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr "Entrar no chat %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr "Mostrar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr "Remover da lista de pegar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr "Adicionar a lista de captura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr "Desproteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr "Proteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -2336,60 +2349,60 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr "Comandos de GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr "Checar IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr "Ir à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr "Trazer jogador"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr "Chutar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2410,7 +2423,7 @@ msgstr "Atalhos"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Janelas"
 
@@ -2678,7 +2691,7 @@ msgstr "Nível: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2700,7 +2713,7 @@ msgstr "Abrir URL"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2713,9 +2726,9 @@ msgstr "Sair"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2726,9 +2739,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2738,7 +2751,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2747,7 +2760,7 @@ msgstr "Máximo"
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preço: %s / Total: %s"
@@ -3373,8 +3386,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3472,8 +3485,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3486,8 +3499,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3719,8 +3732,8 @@ msgstr "Mostrar botão de emoticon no chat"
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4176,7 +4189,7 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "Loja"
 
@@ -4579,12 +4592,13 @@ msgid "Allow whispers"
 msgstr "Permitir mensagens particulares"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5238,7 +5252,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "Equipamento"
 
@@ -5249,7 +5263,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventário"
@@ -5261,7 +5275,7 @@ msgstr "CA"
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr "Carrinho"
@@ -5348,24 +5362,38 @@ msgstr "BA"
 msgid "Bank"
 msgstr "Banco"
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "MAP"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr "CON"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5403,24 +5431,29 @@ msgid "Result"
 msgstr "Resultado"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr "Criar itens"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr "Quantidade:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "Criar"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5717,19 +5750,19 @@ msgid "Enter password:"
 msgstr "Entre com a senha:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr "Animal de estimação de %s"
@@ -5846,7 +5879,7 @@ msgstr "Você sabia que ..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5858,82 +5891,88 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "Dividir"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "Tudo"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to trade."
 msgstr "Selecionar quantidade de itens para negociar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Select amount of items to drop."
 msgstr "Selecionar quantidade de itens para descartar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Select amount of items to store."
 msgstr "Escolha a quantidade de itens para armazenar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "Escolha a quantidade de itens para armazenar."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 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:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to retrieve."
 msgstr "Escolha a quantidade de itens para retirar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 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:251
+#: src/gui/windows/itemamountwindow.cpp:264
 msgid "Select amount of items to split."
 msgstr "Selecionar quantidade de itens para dividir."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "Adicionar na loja de compra."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "Adicionar na loja de venda."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "Desconhecido."
 
@@ -6076,6 +6115,113 @@ msgstr "Atualizando Servidor: %s"
 msgid "Open register url"
 msgstr "Abrir endereço de registro"
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "Insira e-mail:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "Enviar"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "Adicionar"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "Para:"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "Dinheiro: %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "Mapa Item"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#, fuzzy
+msgid "Message:"
+msgstr "Mensagem"
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+#, fuzzy
+msgid "Time:"
+msgstr "Tempo"
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?) Ataque"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+#, fuzzy
+msgid "New"
+msgstr "Rede"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+#, fuzzy
+msgid "Return"
+msgstr "Retornar ao ovo"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+#, fuzzy
+msgid "Open"
+msgstr "Abrir URL"
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "Barra de Vida"
@@ -6163,25 +6309,6 @@ msgstr "Próximo"
 msgid "Submit"
 msgstr "Enviar"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "Adicionar"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "Para:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "Enviar"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8622,6 +8749,11 @@ msgstr "Senha antiga incorreta."
 msgid "New password too short."
 msgstr "Nova senha é muito curta."
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9567,6 +9699,68 @@ msgstr ""
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "Jogador %s com sucesso!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "A mensagem fecha o chat."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+#, fuzzy
+msgid "Item attach failed."
+msgstr "Captura de animal de estimação falhou."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+#, fuzzy
+msgid "Money attach failed."
+msgstr "Captura de animal de estimação falhou."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+#, fuzzy
+msgid "Message return failed."
+msgstr "Falha ao criar Chat!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+msgid "Message return success."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+#, fuzzy
+msgid "Message deletion failed."
+msgstr "Falha de autenticação."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "Grupo criado."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/ru.po b/po/ru.po
index 44fd1637f..2949148c1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
 "PO-Revision-Date: 2015-04-11 11:22+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
@@ -44,7 +44,7 @@ msgstr "Файл выгружен"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -60,7 +60,7 @@ msgstr "Файл выгружен"
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -292,6 +292,16 @@ msgstr "добавлен в черный список"
 msgid "enemy"
 msgstr "враг"
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr "Переименовать животное"
@@ -307,7 +317,7 @@ msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -458,8 +468,8 @@ msgstr "Вы видите %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "Полностью игнорировать"
 
@@ -486,37 +496,37 @@ msgstr "Плавающий пузырек"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Настройка"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Производительность"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "Видео"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Тема"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr "О Программе"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Помощь"
@@ -529,46 +539,49 @@ msgstr "Помощь"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "Закрыть"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "Авторизация"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
@@ -584,7 +597,7 @@ msgstr "Смена игрового сервера"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -601,37 +614,37 @@ msgid "Error"
 msgstr "Ошибка"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "Сменить Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
@@ -671,36 +684,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файл_строка_цвета файл_назначения"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Общие"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Отладка"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Снимок экрана сохранен как %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "Ошибка сети"
 
@@ -1093,7 +1106,7 @@ msgstr "Сообщение"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr "Оживить"
 
@@ -1280,8 +1293,8 @@ msgstr "Огромный (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(по умолчанию)"
 
@@ -1591,20 +1604,20 @@ msgstr "Создать группу"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1624,7 +1637,7 @@ msgstr "Вес: %s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "Торговать"
 
@@ -1723,9 +1736,9 @@ msgstr "Разговор"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1740,7 +1753,7 @@ msgstr "Купить"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1752,7 +1765,7 @@ msgstr "Продать"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr "Добавить комментарий"
 
@@ -1778,7 +1791,7 @@ msgstr "Добавить в список атаки"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr "Добавить в список игнорирования"
 
@@ -1819,7 +1832,7 @@ msgstr "Бросить лут"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1861,8 +1874,8 @@ msgstr "Игроки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr "Выкинуть из группы"
 
@@ -1874,8 +1887,8 @@ msgstr "Поднять"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
@@ -1890,8 +1903,8 @@ msgstr "Элемент карты"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr "Удалить"
 
@@ -1913,7 +1926,7 @@ msgstr "Передвинуть камеру"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Наряды"
@@ -1992,8 +2005,8 @@ msgstr "Покинуть"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr "Копировать в буфер обмена"
 
@@ -2065,10 +2078,10 @@ msgstr "Добавить к торговле все"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "Сохранить"
 
@@ -2091,8 +2104,8 @@ msgstr "Сохранить все"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "Получить"
 
@@ -2118,9 +2131,9 @@ msgstr "Получить все"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2128,47 +2141,47 @@ msgid "Use"
 msgstr "Использовать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr "Очистить окно дропов"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr "Спрятать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr "Показать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 #, fuzzy
 msgid "Open yellow bar settings"
 msgstr "сбросить настройки"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr "Передвинуть выше"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
@@ -2176,155 +2189,155 @@ msgstr "Передвинуть ниже"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr "Раздеть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr "Копировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr "Вставить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr "Открыть ссылку"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr "Показать окно"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr "Пренебречь"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Игнорировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr "Черный список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr "Сделать врагом"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr "Стереть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr "Подружиться"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr "Не игнорировать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr "Следовать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr "Имитировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr "Купить (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr "Продать (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr "Пригласить в группу"
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr "Присоединиться к чату %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr "Показать предметы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr "Удалить из поднятия"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr "Сделать поднимаемым"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr "Снять защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr "Поставить защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "Бросить..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr "Бросить все"
 
@@ -2332,60 +2345,60 @@ msgstr "Бросить все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "Бросить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr "ГМ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr "Коменды ГМ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr "Проверить IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr "Перейти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr "Вызвать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr "Кикнуть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr "Приглушить %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr "Убрать пришлушение %d"
@@ -2406,7 +2419,7 @@ msgstr "Горячие клавиши"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Окна"
 
@@ -2674,7 +2687,7 @@ msgstr "Уровень: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2696,7 +2709,7 @@ msgstr "Открыть ссылку"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2709,9 +2722,9 @@ msgstr "Выход"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2722,9 +2735,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2734,7 +2747,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2743,7 +2756,7 @@ msgstr "Макс"
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Цена: %s / Всего: %s"
@@ -3369,8 +3382,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3468,8 +3481,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3482,8 +3495,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3715,8 +3728,8 @@ msgstr "Показывать кнопку эмоций в чате"
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4172,7 +4185,7 @@ msgstr "Включить напоминание о весе"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "Магазин"
 
@@ -4578,12 +4591,13 @@ msgid "Allow whispers"
 msgstr "Разрешить шептание"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5239,7 +5253,7 @@ msgstr "СН"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "Снаряжение"
 
@@ -5250,7 +5264,7 @@ msgstr "ИНВ"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Инвентарь"
@@ -5262,7 +5276,7 @@ msgstr "ТЕ"
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr "Телега"
@@ -5349,24 +5363,38 @@ msgstr "БА"
 msgid "Bank"
 msgstr "Банк"
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "КАР"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr "ОТЛ"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr "ОКН"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr "ОПЦ"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5404,24 +5432,29 @@ msgid "Result"
 msgstr "Результат"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr "Создание предметов"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr "Количество:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "Создать"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5718,19 +5751,19 @@ msgid "Enter password:"
 msgstr "Введите пароль:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Присутствуют: %s; Всего %d игроков."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Вы прошептали %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr "животное %s'а"
@@ -5847,7 +5880,7 @@ msgstr "Знаете ли вы..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5859,82 +5892,88 @@ msgid "Equip"
 msgstr "Надеть"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "Разделить"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr "Н"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr "П"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr "М"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr "С"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "Всё"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to trade."
 msgstr "Сколько предметов продать."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Select amount of items to drop."
 msgstr "Сколько предметов сбросить."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Select amount of items to store."
 msgstr "Укажите количество вещей для хранения."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "Укажите количество вещей для хранения."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to store to cart."
 msgstr "Укажите количество вещей для хранения в прицепе."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to retrieve."
 msgstr "Укажите количество вещей для изъятия."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to retrieve from cart."
 msgstr "Укажите количество вещей для изъятия из прицепа."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:251
+#: src/gui/windows/itemamountwindow.cpp:264
 msgid "Select amount of items to split."
 msgstr "Сколько предметов разделить."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "Добавить в список покупки."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "Добавить в список продажи."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "Неизвестно."
 
@@ -6079,6 +6118,113 @@ msgstr "Сервер обновлений: %s"
 msgid "Open register url"
 msgstr "Открыть ссылку регистрации"
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "Введите email:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "Отправить"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "Добавить"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "Для:"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "Деньги: %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "Элемент карты"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#, fuzzy
+msgid "Message:"
+msgstr "Сообщение"
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+#, fuzzy
+msgid "Time:"
+msgstr "Время"
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?) неизвестная атака"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+#, fuzzy
+msgid "New"
+msgstr "Сеть"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+#, fuzzy
+msgid "Return"
+msgstr "Вернут в яйцо"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+#, fuzzy
+msgid "Open"
+msgstr "Открыть ссылку"
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "здоровье"
@@ -6166,25 +6312,6 @@ msgstr "Следующий"
 msgid "Submit"
 msgstr "Применить"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "Добавить"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "Для:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "Отправить"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8622,6 +8749,11 @@ msgstr "Старый пароль указан неверно."
 msgid "New password too short."
 msgstr "Новый пароль слишком короткий."
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9563,6 +9695,69 @@ msgstr "Ошибка входа в комнату. Неправильная ра
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "Игрок удачно %s!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "Предмет не найден."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+#, fuzzy
+msgid "Item attach failed."
+msgstr "Попытка поймать не удалась."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+#, fuzzy
+msgid "Money attach failed."
+msgstr "Попытка поймать не удалась."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+#, fuzzy
+msgid "Message return failed."
+msgstr "Предмет не найден."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+#, fuzzy
+msgid "Message return success."
+msgstr "Кормление животного удалось."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+#, fuzzy
+msgid "Message deletion failed."
+msgstr "Ошибка авторизации."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "Группа успешно создана."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/sv.po b/po/sv.po
index 2ef2f2a41..0234a325a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/"
@@ -33,7 +33,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -49,7 +49,7 @@ msgstr ""
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -281,6 +281,16 @@ msgstr "blacklistad"
 msgid "enemy"
 msgstr "enemy"
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr ""
@@ -296,7 +306,7 @@ msgid "Accepting incoming trade requests"
 msgstr "Acceptera inkommande bytes-förfrågningar"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -446,8 +456,8 @@ msgstr "Du ser %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
@@ -474,37 +484,37 @@ msgstr "Floating bubble"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hjälp"
@@ -517,46 +527,49 @@ msgstr "Hjälp"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Ansluter till server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "Loggar in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "Går in i spelvärld"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "Begär karaktärer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "Ansluter till spelservern"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
@@ -572,7 +585,7 @@ msgstr "Ändrar spelserver"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -589,37 +602,37 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "Begär registreringsuppgifter"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "Lösenordsändring"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "Lösenordsändring har lyckats!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "Byte av E-post"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "E-posten har ändrats!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "Avregistrering lyckad"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "Farväl, kom gärna tillbaka snart igen..."
 
@@ -659,36 +672,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Skärmdump sparades som %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "Spara skärmdump misslyckades!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr "Anslutningen till servern förlorades."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "Nätverksfel"
 
@@ -1081,7 +1094,7 @@ msgstr "Meddelande"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr "Återuppliva"
 
@@ -1264,8 +1277,8 @@ msgstr "Skitstor (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1575,20 +1588,20 @@ msgstr "Skapa Party"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1608,7 +1621,7 @@ msgstr "Vikt: %s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "Trade"
 
@@ -1707,9 +1720,9 @@ msgstr "Prata med"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1724,7 +1737,7 @@ msgstr "Köp"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1736,7 +1749,7 @@ msgstr "Sälj"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr ""
 
@@ -1762,7 +1775,7 @@ msgstr "Lägg till i attacklistan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr "Lägg till i ignoreringslistan"
 
@@ -1803,7 +1816,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1845,8 +1858,8 @@ msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr "Kicka från party"
 
@@ -1858,8 +1871,8 @@ msgstr "Pick up"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
@@ -1874,8 +1887,8 @@ msgstr "Kartobjekt"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -1897,7 +1910,7 @@ msgstr "Rör kamera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Utstyrsel"
@@ -1976,8 +1989,8 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
@@ -2049,10 +2062,10 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "Lagra"
 
@@ -2075,8 +2088,8 @@ msgstr "Lagra alla"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "Ta emot"
 
@@ -2102,9 +2115,9 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2112,47 +2125,47 @@ msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 #, fuzzy
 msgid "Open yellow bar settings"
 msgstr "Återställ yellow bar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr "Återställ yellow bar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr "Kopiera till chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -2160,155 +2173,155 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr "Visa fönster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr "Bjud in till party"
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr "Ta bort från pickup-listan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr "Lägg till i pickup-listan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr "Släng allt"
 
@@ -2316,60 +2329,60 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "Släng"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr "Goto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr "Sparka"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2390,7 +2403,7 @@ msgstr "Genvägar"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Fönster"
 
@@ -2658,7 +2671,7 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2680,7 +2693,7 @@ msgstr "Öppna url"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2693,9 +2706,9 @@ msgstr "Avsluta"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2706,9 +2719,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2718,7 +2731,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2727,7 +2740,7 @@ msgstr "Max"
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
@@ -3353,8 +3366,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3452,8 +3465,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3466,8 +3479,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3699,8 +3712,8 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4156,7 +4169,7 @@ msgstr "Aktivera vikt-notationer"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "Shop"
 
@@ -4556,12 +4569,13 @@ msgid "Allow whispers"
 msgstr "Tillåt viskningar"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5215,7 +5229,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "Equipment"
 
@@ -5226,7 +5240,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventory"
@@ -5238,7 +5252,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr "Cart"
@@ -5325,24 +5339,38 @@ msgstr ""
 msgid "Bank"
 msgstr ""
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "MAP"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5380,24 +5408,29 @@ msgid "Result"
 msgstr "Resultat"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr "Skapa items"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr "Antal:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "Skapa"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5694,19 +5727,19 @@ msgid "Enter password:"
 msgstr "Skriv lösenord:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentera: %s; %d spelare är presenterad."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5825,7 +5858,7 @@ msgstr "Viste du att..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5837,82 +5870,88 @@ msgid "Equip"
 msgstr "Equip"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "Dela"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "Alla"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to trade."
 msgstr "Välj antal items att byta."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Select amount of items to drop."
 msgstr "Välj antal items att slänga."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Select amount of items to store."
 msgstr "Välj antal items att lagra."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "Välj antal items att lagra."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to retrieve."
 msgstr "Välj antal items att apportera."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:251
+#: src/gui/windows/itemamountwindow.cpp:264
 msgid "Select amount of items to split."
 msgstr "Välj antal items att dela."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "Lägg till i buy shop."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "Lägg till i sell shop."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "Okänd."
 
@@ -6055,6 +6094,112 @@ msgstr "Uppdatera host: %s"
 msgid "Open register url"
 msgstr "Öppna register-url"
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "E-post:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "Skicka"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "Lägg till"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "Till:"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "Money: %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "Kartobjekt"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#, fuzzy
+msgid "Message:"
+msgstr "Meddelande"
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+#, fuzzy
+msgid "Time:"
+msgstr "Tid"
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?) attack"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+#, fuzzy
+msgid "New"
+msgstr "Nät"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+msgid "Return"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+#, fuzzy
+msgid "Open"
+msgstr "Öppna url"
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "health bar"
@@ -6142,25 +6287,6 @@ msgstr "Nästa"
 msgid "Submit"
 msgstr "Submit"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "Lägg till"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "Till:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "Skicka"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8601,6 +8727,11 @@ msgstr "Gamla lösenordet är felaktigt."
 msgid "New password too short."
 msgstr "Det nya lösenordet är för kort."
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9539,6 +9670,67 @@ msgstr ""
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "Spelare %s lyckades!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "Meddelande stänger chat."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+#, fuzzy
+msgid "Item attach failed."
+msgstr "Emperium check misslyckades."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+#, fuzzy
+msgid "Money attach failed."
+msgstr "Monster attack-range"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+#, fuzzy
+msgid "Message return failed."
+msgstr "Chat-skapning misslyckades!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+msgid "Message return success."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+msgid "Message deletion failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "Partyt skapades utan problem."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 2ef2f2a41..0234a325a 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/"
@@ -33,7 +33,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -49,7 +49,7 @@ msgstr ""
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -281,6 +281,16 @@ msgstr "blacklistad"
 msgid "enemy"
 msgstr "enemy"
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr ""
@@ -296,7 +306,7 @@ msgid "Accepting incoming trade requests"
 msgstr "Acceptera inkommande bytes-förfrågningar"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -446,8 +456,8 @@ msgstr "Du ser %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
@@ -474,37 +484,37 @@ msgstr "Floating bubble"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hjälp"
@@ -517,46 +527,49 @@ msgstr "Hjälp"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Ansluter till server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "Loggar in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "Går in i spelvärld"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "Begär karaktärer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "Ansluter till spelservern"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
@@ -572,7 +585,7 @@ msgstr "Ändrar spelserver"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -589,37 +602,37 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "Begär registreringsuppgifter"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "Lösenordsändring"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "Lösenordsändring har lyckats!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "Byte av E-post"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "E-posten har ändrats!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "Avregistrering lyckad"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "Farväl, kom gärna tillbaka snart igen..."
 
@@ -659,36 +672,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Skärmdump sparades som %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "Spara skärmdump misslyckades!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr "Anslutningen till servern förlorades."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "Nätverksfel"
 
@@ -1081,7 +1094,7 @@ msgstr "Meddelande"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr "Återuppliva"
 
@@ -1264,8 +1277,8 @@ msgstr "Skitstor (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1575,20 +1588,20 @@ msgstr "Skapa Party"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1608,7 +1621,7 @@ msgstr "Vikt: %s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "Trade"
 
@@ -1707,9 +1720,9 @@ msgstr "Prata med"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1724,7 +1737,7 @@ msgstr "Köp"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1736,7 +1749,7 @@ msgstr "Sälj"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr ""
 
@@ -1762,7 +1775,7 @@ msgstr "Lägg till i attacklistan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr "Lägg till i ignoreringslistan"
 
@@ -1803,7 +1816,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1845,8 +1858,8 @@ msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr "Kicka från party"
 
@@ -1858,8 +1871,8 @@ msgstr "Pick up"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
@@ -1874,8 +1887,8 @@ msgstr "Kartobjekt"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -1897,7 +1910,7 @@ msgstr "Rör kamera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Utstyrsel"
@@ -1976,8 +1989,8 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
@@ -2049,10 +2062,10 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "Lagra"
 
@@ -2075,8 +2088,8 @@ msgstr "Lagra alla"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "Ta emot"
 
@@ -2102,9 +2115,9 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2112,47 +2125,47 @@ msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 #, fuzzy
 msgid "Open yellow bar settings"
 msgstr "Återställ yellow bar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr "Återställ yellow bar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr "Kopiera till chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -2160,155 +2173,155 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr "Visa fönster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr "Bjud in till party"
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr "Ta bort från pickup-listan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr "Lägg till i pickup-listan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr "Släng allt"
 
@@ -2316,60 +2329,60 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "Släng"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr "Goto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr "Sparka"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2390,7 +2403,7 @@ msgstr "Genvägar"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Fönster"
 
@@ -2658,7 +2671,7 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2680,7 +2693,7 @@ msgstr "Öppna url"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2693,9 +2706,9 @@ msgstr "Avsluta"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2706,9 +2719,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2718,7 +2731,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2727,7 +2740,7 @@ msgstr "Max"
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
@@ -3353,8 +3366,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3452,8 +3465,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3466,8 +3479,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3699,8 +3712,8 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4156,7 +4169,7 @@ msgstr "Aktivera vikt-notationer"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "Shop"
 
@@ -4556,12 +4569,13 @@ msgid "Allow whispers"
 msgstr "Tillåt viskningar"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5215,7 +5229,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "Equipment"
 
@@ -5226,7 +5240,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventory"
@@ -5238,7 +5252,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr "Cart"
@@ -5325,24 +5339,38 @@ msgstr ""
 msgid "Bank"
 msgstr ""
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "MAP"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5380,24 +5408,29 @@ msgid "Result"
 msgstr "Resultat"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr "Skapa items"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr "Antal:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "Skapa"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5694,19 +5727,19 @@ msgid "Enter password:"
 msgstr "Skriv lösenord:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentera: %s; %d spelare är presenterad."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5825,7 +5858,7 @@ msgstr "Viste du att..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5837,82 +5870,88 @@ msgid "Equip"
 msgstr "Equip"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "Dela"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "Alla"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to trade."
 msgstr "Välj antal items att byta."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Select amount of items to drop."
 msgstr "Välj antal items att slänga."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Select amount of items to store."
 msgstr "Välj antal items att lagra."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "Välj antal items att lagra."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to retrieve."
 msgstr "Välj antal items att apportera."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:251
+#: src/gui/windows/itemamountwindow.cpp:264
 msgid "Select amount of items to split."
 msgstr "Välj antal items att dela."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "Lägg till i buy shop."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "Lägg till i sell shop."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "Okänd."
 
@@ -6055,6 +6094,112 @@ msgstr "Uppdatera host: %s"
 msgid "Open register url"
 msgstr "Öppna register-url"
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "E-post:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "Skicka"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "Lägg till"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "Till:"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "Money: %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "Kartobjekt"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#, fuzzy
+msgid "Message:"
+msgstr "Meddelande"
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+#, fuzzy
+msgid "Time:"
+msgstr "Tid"
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?) attack"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+#, fuzzy
+msgid "New"
+msgstr "Nät"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+msgid "Return"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+#, fuzzy
+msgid "Open"
+msgstr "Öppna url"
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "health bar"
@@ -6142,25 +6287,6 @@ msgstr "Nästa"
 msgid "Submit"
 msgstr "Submit"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "Lägg till"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "Till:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "Skicka"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8601,6 +8727,11 @@ msgstr "Gamla lösenordet är felaktigt."
 msgid "New password too short."
 msgstr "Det nya lösenordet är för kort."
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9539,6 +9670,67 @@ msgstr ""
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "Spelare %s lyckades!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "Meddelande stänger chat."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+#, fuzzy
+msgid "Item attach failed."
+msgstr "Emperium check misslyckades."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+#, fuzzy
+msgid "Money attach failed."
+msgstr "Monster attack-range"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+#, fuzzy
+msgid "Message return failed."
+msgstr "Chat-skapning misslyckades!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+msgid "Message return success."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+msgid "Message deletion failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "Partyt skapades utan problem."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/tr.po b/po/tr.po
index 669dc8d41..81ff54c07 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
@@ -35,7 +35,7 @@ msgstr "Dosya yüklendi"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -51,7 +51,7 @@ msgstr "Dosya yüklendi"
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -283,6 +283,16 @@ msgstr "kara listeye alınmış"
 msgid "enemy"
 msgstr "düşman"
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr ""
@@ -298,7 +308,7 @@ msgid "Accepting incoming trade requests"
 msgstr "Gelen takas istekleri kabul ediliyor"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -448,8 +458,8 @@ msgstr "%s görüyorsun"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "Tamamen görmezden gel"
 
@@ -476,37 +486,37 @@ msgstr "Yüzen balon"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Ayarlar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performans"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr "Hakkında"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Yardım"
@@ -519,46 +529,49 @@ msgstr "Yardım"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "Kapat"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Sunucuya bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "Giriş yapılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "Oyun dünyasına giriliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "Karakterler isteniliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "Oyun sunucusuna bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "Oyun sunucusu değiştiriliyor"
 
@@ -574,7 +587,7 @@ msgstr "Oyun sunucusu değiştiriliyor"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -591,37 +604,37 @@ msgid "Error"
 msgstr "Hata"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "Kayıt detayları isteniyor"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "Şifre Değiştir"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "Şifreniz başarı ile değiştirildi!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "E-posta Değiştir"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "E-posta başarı ile değiştirildi!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "Kayıt silme başarılı"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "Hoşçakal, tekrar bekleriz..."
 
@@ -661,36 +674,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Genel"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Hata ayıklama"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Ekran görüntüsü %s olarak kaydedildi"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "Ekran görüntüsü kaydı başarısız!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr "Sunucu bağlantısı koptu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "Ağ Hatası"
 
@@ -1083,7 +1096,7 @@ msgstr "Mesaj"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr "Dirilt"
 
@@ -1270,8 +1283,8 @@ msgstr "Kocaman (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(varsayılan)"
 
@@ -1581,20 +1594,20 @@ msgstr "Parti kur"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1614,7 +1627,7 @@ msgstr "Ağırlık: %s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "Takas"
 
@@ -1713,9 +1726,9 @@ msgstr "Konuş"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1730,7 +1743,7 @@ msgstr "Satın Al"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1742,7 +1755,7 @@ msgstr "Sat"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr "Yorum ekle"
 
@@ -1768,7 +1781,7 @@ msgstr "Saldırı listesine ekle"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr "Gözmezden gelinenler listesine ekle"
 
@@ -1809,7 +1822,7 @@ msgstr "Ganimet bırak"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1851,8 +1864,8 @@ msgstr "Oyuncular"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr "Partiden at"
 
@@ -1864,8 +1877,8 @@ msgstr "Topla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "Sohbete ekle"
 
@@ -1880,8 +1893,8 @@ msgstr "Harita itemi"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr "Kaldır"
 
@@ -1903,7 +1916,7 @@ msgstr "Hareket kamerası"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Kıyafetler"
@@ -1982,8 +1995,8 @@ msgstr "Ayrıl"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr "Panoya kopyala"
 
@@ -2055,10 +2068,10 @@ msgstr "Tamamını takasa ekle"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "Sakla"
 
@@ -2081,8 +2094,8 @@ msgstr "Tamamını sakla"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "Geri al"
 
@@ -2108,9 +2121,9 @@ msgstr "Tamamını geri al"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2118,46 +2131,46 @@ msgid "Use"
 msgstr "Kullan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr ""
 
@@ -2165,155 +2178,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr "İhmal et"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Görmezden gel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr "Görmezden gelmeyi bırak"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr "Satın Al (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr "Gruba davet et"
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr "Nesneleri göster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr "Toplama listesinden kaldır"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr "Toplama listesine ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "Bırak..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr ""
 
@@ -2321,60 +2334,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "Bırak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2395,7 +2408,7 @@ msgstr "Kısayollar"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr ""
 
@@ -2663,7 +2676,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2685,7 +2698,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2698,9 +2711,9 @@ msgstr "Çıkış"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2711,9 +2724,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2723,7 +2736,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2732,7 +2745,7 @@ msgstr "En Fazla"
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Fiyat: %s / Toplam: %s"
@@ -3358,8 +3371,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3458,8 +3471,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3472,8 +3485,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3705,8 +3718,8 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4162,7 +4175,7 @@ msgstr "Ağırlık bildirimlerini etkinleştir"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "Mağaza"
 
@@ -4561,12 +4574,13 @@ msgid "Allow whispers"
 msgstr "Fısıltılara izin ver"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5216,7 +5230,7 @@ msgstr "EKP"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "Ekipman"
 
@@ -5227,7 +5241,7 @@ msgstr "ENV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Envanter"
@@ -5239,7 +5253,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr ""
@@ -5326,24 +5340,38 @@ msgstr ""
 msgid "Bank"
 msgstr ""
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "A"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr "AYR"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5381,24 +5409,29 @@ msgid "Result"
 msgstr "Sonuç"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "Oluştur"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5690,19 +5723,19 @@ msgid "Enter password:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Mevcut: %s; %d oyuncu mevcut."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%s 'e fısıldanıyor: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5819,7 +5852,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5831,82 +5864,88 @@ msgid "Equip"
 msgstr "Donatmak"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "Bölme"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "Hepsi"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to trade."
 msgstr "Takas yapılacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Select amount of items to drop."
 msgstr "Bırakılacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Select amount of items to store."
 msgstr "Saklanacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "Saklanacak nesne miktarını seç."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to retrieve."
 msgstr "Depodan alınacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:251
+#: src/gui/windows/itemamountwindow.cpp:264
 msgid "Select amount of items to split."
 msgstr "Bölünecek nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "Satın alma mağazasına ekle."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "Satış mağazasına ekle."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "Bilinmeyen."
 
@@ -6049,6 +6088,110 @@ msgstr ""
 msgid "Open register url"
 msgstr ""
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "E-Posta:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "Gönder"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "Ekle"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "Alıcı:"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "Para: %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "Harita itemi"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#, fuzzy
+msgid "Message:"
+msgstr "Mesaj"
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+msgid "Time:"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?) saldırı"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+msgid "New"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+#, fuzzy
+msgid "Return"
+msgstr "Yumurtaya dön"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+msgid "Open"
+msgstr ""
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr ""
@@ -6136,25 +6279,6 @@ msgstr "İleri"
 msgid "Submit"
 msgstr "Onayla"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "Ekle"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "Alıcı:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "Gönder"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8587,6 +8711,11 @@ msgstr "Eski şifre hatalı."
 msgid "New password too short."
 msgstr ""
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9525,6 +9654,65 @@ msgstr ""
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "Oyuncu başarı ile %s!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "Mesaj sohbeti kapatır."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+#, fuzzy
+msgid "Item attach failed."
+msgstr "Nesne paylaşımı etkinleştirildi."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+msgid "Money attach failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+msgid "Message return failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+msgid "Message return success."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+msgid "Message deletion failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "Grup başarıyla kuruldu."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/uk.po b/po/uk.po
index 888fa74c0..59f07def3 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/manaplus/"
@@ -36,7 +36,7 @@ msgstr "Файл завантажено"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -52,7 +52,7 @@ msgstr "Файл завантажено"
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -286,6 +286,16 @@ msgstr "чорний список"
 msgid "enemy"
 msgstr "супротивник"
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr ""
@@ -301,7 +311,7 @@ msgid "Accepting incoming trade requests"
 msgstr "Приймання вхідних пропозицій торгівлі"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -452,8 +462,8 @@ msgstr "Ти бачиш %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "Остаточно ігнорувати"
 
@@ -480,37 +490,37 @@ msgstr "Плаваюча бульбашка"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Налаштування"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Продуктивність"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "Відео"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "Теми"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr "Про програму"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Довідка"
@@ -523,46 +533,49 @@ msgstr "Довідка"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "Закрити"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "Очікування відповіді сервера"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "Авторизація..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "Поринаємо в ігровий всесвіт..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "Завантаження списку персонажів..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "Приєднання до серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "Зміна ігрового серверу..."
 
@@ -578,7 +591,7 @@ msgstr "Зміна ігрового серверу..."
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -595,37 +608,37 @@ msgid "Error"
 msgstr "Помилка"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "Запитуємо деталі реєстрації"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "Змінити пароль"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "Пароль змінено!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "Змінити імейл"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "Імейл змінено!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "Акаунт видалено"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "До побачення та вертайтесь."
 
@@ -665,36 +678,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файл_рядків_кольору файл_призначення"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Загальне"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Зневадження"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Скріншот збережено як %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "Збереження скріншоту провалилось!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr "Втрачено з'єднання з сервером."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "Мережева помилка"
 
@@ -1087,7 +1100,7 @@ msgstr "Повідомлення"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr "Опритомнити"
 
@@ -1272,8 +1285,8 @@ msgstr "Величезний (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(за замовчуванням)"
 
@@ -1583,20 +1596,20 @@ msgstr "Створити групу"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1616,7 +1629,7 @@ msgstr "Вага: %s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "Торгівля"
 
@@ -1715,9 +1728,9 @@ msgstr "Діалог"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1732,7 +1745,7 @@ msgstr "Придбати"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1744,7 +1757,7 @@ msgstr "Продати"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr "Додати примітку"
 
@@ -1770,7 +1783,7 @@ msgstr "Додати до списку атаки"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr "Ігнорувати тип мобу"
 
@@ -1811,7 +1824,7 @@ msgstr "Скинути дропи"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1853,8 +1866,8 @@ msgstr "Гравці"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr "Виштовхати з групи"
 
@@ -1866,8 +1879,8 @@ msgstr "Підняти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "Додати до чату"
 
@@ -1882,8 +1895,8 @@ msgstr "Елемент карти"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr "Видалити"
 
@@ -1905,7 +1918,7 @@ msgstr "Рухати камеру"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Швидке спорядження"
@@ -1984,8 +1997,8 @@ msgstr "Залишити"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr "Внести в буфер обміну"
 
@@ -2057,10 +2070,10 @@ msgstr "Додати всю кількість"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "Зберегти"
 
@@ -2083,8 +2096,8 @@ msgstr "Зберегти всю кількість"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "Вилучити"
 
@@ -2110,9 +2123,9 @@ msgstr "Вилучити всю кількість"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2120,47 +2133,47 @@ msgid "Use"
 msgstr "Використати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr "Скинути значення комірців"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr "Сховати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr "Показати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 #, fuzzy
 msgid "Open yellow bar settings"
 msgstr "Скинути Жовтий рядок"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr "Скинути Жовтий рядок"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr "Додати до чату"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr "Пріоритет вище"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr "Пріоритет нижче"
 
@@ -2168,155 +2181,155 @@ msgstr "Пріоритет нижче"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr "Роздягнути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr "Копіювати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr "Вставити"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr "Відвідати посилання"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr "Показати вікно"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr "Зневажати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ігнорувати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr "В чорний список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr "Позначити супротивником"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr "Стерти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr "Приятелювати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr "Повернути з ігнору"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr "Іти слідом"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr "Купувати (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr "Продати (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr "Запросити до групи"
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr "Ввійти до чату %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr "Показати спорядження"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr "Видалити зі списку підбирання"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr "Додати до списку підбирання"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr "Зняти захист"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr "Захистити предмет"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "Кинути..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr "Кинути все"
 
@@ -2324,60 +2337,60 @@ msgstr "Кинути все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "Кинути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr "ГМ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr "ГМ команди"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr "Перевірити IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr "Відвідати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr "Викликати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr "Виштовхати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2398,7 +2411,7 @@ msgstr "Швидкі клавіші"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Вікна"
 
@@ -2666,7 +2679,7 @@ msgstr "Рівень: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2688,7 +2701,7 @@ msgstr "Відвідати посилання"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2701,9 +2714,9 @@ msgstr "Вийти"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2714,9 +2727,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2726,7 +2739,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2735,7 +2748,7 @@ msgstr "Все"
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Ціна: %s / Загалом: %s"
@@ -3361,8 +3374,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3460,8 +3473,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3474,8 +3487,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3707,8 +3720,8 @@ msgstr "Показати кнопку смайликів у чаті"
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4164,7 +4177,7 @@ msgstr "Повідомляти про вагове перенавантажен�
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "Крамниця"
 
@@ -4568,12 +4581,13 @@ msgid "Allow whispers"
 msgstr "Дозволити шепіт (приватне спілкування)"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5223,7 +5237,7 @@ msgstr "СПР"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "Спорядження"
 
@@ -5234,7 +5248,7 @@ msgstr "СУМ"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Сумка"
@@ -5246,7 +5260,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr "Візок"
@@ -5333,24 +5347,38 @@ msgstr "БА"
 msgid "Bank"
 msgstr "Банк"
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "МАП"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr "ЗНВ"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr "ВІК"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr "НАЛ"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5388,24 +5416,29 @@ msgid "Result"
 msgstr "Результат"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr "Створення предметів"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr "Кількість:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "Створити"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5702,19 +5735,19 @@ msgid "Enter password:"
 msgstr "Пароль:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Присутні: %s; %d гравців онлайн."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Шепчу до %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr "%s'ів улюбленець"
@@ -5831,7 +5864,7 @@ msgstr "Чи вам відомо..."
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5843,82 +5876,88 @@ msgid "Equip"
 msgstr "Вдягнути"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "Поділити"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "Все"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to trade."
 msgstr "Вкажіть кількість предметів для торгівлі."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Select amount of items to drop."
 msgstr "Вкажіть кількість предметів, щоб кинути."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Select amount of items to store."
 msgstr "Вкажіть кількість предметів для зберігання."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "Вкажіть кількість предметів для зберігання."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to retrieve."
 msgstr "Вкажіть кількість предметів для отримання."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:251
+#: src/gui/windows/itemamountwindow.cpp:264
 msgid "Select amount of items to split."
 msgstr "Вкажіть кількість предметів для розподілу."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "Продавати до списку купівлі."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "Додати до списку продажу."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "Невідомо."
 
@@ -6063,6 +6102,113 @@ msgstr "Сервер оновлень: %s"
 msgid "Open register url"
 msgstr "Відкрити посилання реєстрації"
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "Пошта:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "Надіслати"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "Додати"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "Для:"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "Кошти: %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "Елемент карти"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#, fuzzy
+msgid "Message:"
+msgstr "Повідомлення"
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+#, fuzzy
+msgid "Time:"
+msgstr "Час"
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?) невідомий режим атаки"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+#, fuzzy
+msgid "New"
+msgstr "Мережа"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+#, fuzzy
+msgid "Return"
+msgstr "Повернути до яйця"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+#, fuzzy
+msgid "Open"
+msgstr "Відвідати посилання"
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "здоров'я"
@@ -6150,25 +6296,6 @@ msgstr "Далі"
 msgid "Submit"
 msgstr "Відправити"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "Додати"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "Для:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "Надіслати"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8603,6 +8730,11 @@ msgstr "Старий пароль некоректний."
 msgid "New password too short."
 msgstr "Новий пароль замалий."
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9541,6 +9673,68 @@ msgstr ""
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "Гравця позначено як \"%s\"!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "Повідомлення закриває вікно чату."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+#, fuzzy
+msgid "Item attach failed."
+msgstr "Не вдалося завести улюбленця."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+#, fuzzy
+msgid "Money attach failed."
+msgstr "Не вдалося завести улюбленця."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+#, fuzzy
+msgid "Message return failed."
+msgstr "Не вдалось створити чат!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+msgid "Message return success."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+#, fuzzy
+msgid "Message deletion failed."
+msgstr "Аутентифікація не вдалася."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "Групу створено."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8113309f6..dec08cfe2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-04-25 14:28+0300\n"
+"POT-Creation-Date: 2015-05-04 02:30+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
@@ -40,7 +40,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1462 src/client.cpp:1489
+#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
 #: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
 #: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -56,7 +56,7 @@ msgstr ""
 #: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:167 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -288,6 +288,16 @@ msgstr ""
 msgid "enemy"
 msgstr ""
 
+#: src/actions/commands.cpp:944
+#, c-format
+msgid "Config value: %s"
+msgstr ""
+
+#: src/actions/commands.cpp:956
+#, c-format
+msgid "Server config value: %s"
+msgstr ""
+
 #: src/actions/pets.cpp:104
 msgid "Rename your pet"
 msgstr ""
@@ -303,7 +313,7 @@ msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:328 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
@@ -452,8 +462,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2296
-#: src/gui/popups/popupmenu.cpp:2338
+#: src/being/playerrelations.cpp:467 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2339
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -480,37 +490,37 @@ msgstr "流动的泡沫"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:167
+#: src/client.cpp:913 src/gui/windowmenu.cpp:171
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "设置"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:916 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:107
+#: src/client.cpp:919 src/gui/widgets/tabs/setup_video.cpp:107
 msgid "Video"
 msgstr "视频"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:922 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "主题"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:925
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:72
+#: src/client.cpp:928 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "帮助"
@@ -523,46 +533,49 @@ msgstr "帮助"
 #. TRANSLATORS: close window
 #. TRANSLATORS: did you know window button
 #. TRANSLATORS: storage button
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: mail view window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/client.cpp:1390 src/client.cpp:1404
+#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:256
-#: src/gui/windows/inventorywindow.cpp:279 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:280
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
 msgstr "关闭"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "正在连接服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1109
 msgid "Logging in"
 msgstr "登录中"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1152
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1284
 msgid "Requesting characters"
 msgstr "请求角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1321
+#: src/client.cpp:1324
 msgid "Connecting to the game server"
 msgstr "正在连接游戏服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1333
+#: src/client.cpp:1336
 msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
@@ -578,7 +591,7 @@ msgstr "正在更改游戏服务器"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1388 src/client.cpp:1402 src/client.cpp:1597
+#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
@@ -595,37 +608,37 @@ msgid "Error"
 msgstr "错误"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1417
+#: src/client.cpp:1420
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password Change"
 msgstr "更改密码"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1460
+#: src/client.cpp:1463
 msgid "Password changed successfully!"
 msgstr "密码更改成功!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1487
+#: src/client.cpp:1490
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Unregister Successful"
 msgstr "取消注册成功"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1519
 msgid "Farewell, come back any time..."
 msgstr "再见，欢迎随时回来..."
 
@@ -665,36 +678,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2138
+#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "常规"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:154
+#: src/game.cpp:274 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "调试"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:564
+#: src/game.cpp:571
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:574
+#: src/game.cpp:581
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:661
+#: src/game.cpp:668
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:664
+#: src/game.cpp:671
 msgid "Network Error"
 msgstr "网络错误"
 
@@ -1087,7 +1100,7 @@ msgstr "讯息"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr ""
 
@@ -1270,8 +1283,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2000
+#: src/gui/popups/popupmenu.cpp:2078 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1581,20 +1594,20 @@ msgstr "建立"
 #: src/gui/popups/popupmenu.cpp:660 src/gui/popups/popupmenu.cpp:685
 #: src/gui/popups/popupmenu.cpp:710 src/gui/popups/popupmenu.cpp:899
 #: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:959
-#: src/gui/popups/popupmenu.cpp:1739 src/gui/popups/popupmenu.cpp:1775
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/popups/popupmenu.cpp:1867
-#: src/gui/popups/popupmenu.cpp:1908 src/gui/popups/popupmenu.cpp:1978
-#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
-#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
-#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1740 src/gui/popups/popupmenu.cpp:1776
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/popups/popupmenu.cpp:1868
+#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:1979
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2091
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:2159 src/gui/popups/popupmenu.cpp:2184
+#: src/gui/popups/popupmenu.cpp:2201 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2682 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:55
 #: src/gui/windows/changepassworddialog.cpp:57
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:169
+#: src/gui/windows/itemamountwindow.cpp:176
 #: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
@@ -1614,7 +1627,7 @@ msgstr "重量：%s"
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:156 src/gui/popups/popupmenu.cpp:805
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:321
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:328
 msgid "Trade"
 msgstr "交易"
 
@@ -1713,9 +1726,9 @@ msgstr "说话"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2368
-#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:207
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
 msgid "Buy"
@@ -1730,7 +1743,7 @@ msgstr "购买"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:2381
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:246 src/resources/db/npcdb.cpp:148
@@ -1742,7 +1755,7 @@ msgstr "出售"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:2478
+#: src/gui/popups/popupmenu.cpp:2479
 msgid "Add comment"
 msgstr "发表评论"
 
@@ -1768,7 +1781,7 @@ msgstr "加入攻击清单"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:308 src/gui/popups/popupmenu.cpp:2499
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1809,7 +1822,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:188 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:189 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
@@ -1851,8 +1864,8 @@ msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2421
-#: src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:2422
+#: src/gui/popups/popupmenu.cpp:2446
 msgid "Kick from party"
 msgstr "踢从党"
 
@@ -1864,8 +1877,8 @@ msgstr "拾取"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1735
-#: src/gui/popups/popupmenu.cpp:1811 src/gui/popups/popupmenu.cpp:1853
+#: src/gui/popups/popupmenu.cpp:590 src/gui/popups/popupmenu.cpp:1736
+#: src/gui/popups/popupmenu.cpp:1812 src/gui/popups/popupmenu.cpp:1854
 msgid "Add to chat"
 msgstr "加入聊天"
 
@@ -1880,8 +1893,8 @@ msgstr "地图项"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2052
-#: src/gui/popups/popupmenu.cpp:2086
+#: src/gui/popups/popupmenu.cpp:617 src/gui/popups/popupmenu.cpp:2053
+#: src/gui/popups/popupmenu.cpp:2087
 msgid "Remove"
 msgstr ""
 
@@ -1903,7 +1916,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "套装"
@@ -1982,8 +1995,8 @@ msgstr "留下"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2154
-#: src/gui/popups/popupmenu.cpp:2196
+#: src/gui/popups/popupmenu.cpp:786 src/gui/popups/popupmenu.cpp:2155
+#: src/gui/popups/popupmenu.cpp:2197
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2055,10 +2068,10 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1807
-#: src/gui/popups/popupmenu.cpp:1848 src/gui/windows/inventorywindow.cpp:251
-#: src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:872 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:275
+#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "存储"
 
@@ -2081,8 +2094,8 @@ msgstr "商店所有"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:253
-#: src/gui/windows/inventorywindow.cpp:276
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/windows/inventorywindow.cpp:277
 msgid "Retrieve"
 msgstr "取回"
 
@@ -2108,9 +2121,9 @@ msgstr "检索所有"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1769 src/gui/popups/popupmenu.cpp:2567
-#: src/gui/windows/inventorywindow.cpp:186
-#: src/gui/windows/inventorywindow.cpp:756 src/gui/windows/skilldialog.cpp:79
+#: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
+#: src/gui/windows/inventorywindow.cpp:187
+#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2118,46 +2131,46 @@ msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1863
+#: src/gui/popups/popupmenu.cpp:1864
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1956
 msgid "Hide"
 msgstr "隐藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/popups/popupmenu.cpp:1963
 msgid "Show"
 msgstr "显示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1969
+#: src/gui/popups/popupmenu.cpp:1970
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1972
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:92
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/windows/statuswindow.cpp:92
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2016 src/gui/popups/popupmenu.cpp:2035
 msgid "Move up"
 msgstr "x"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
+#: src/gui/popups/popupmenu.cpp:2022 src/gui/popups/popupmenu.cpp:2041
 msgid "Move down"
 msgstr ""
 
@@ -2165,155 +2178,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2476
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2130
+#: src/gui/popups/popupmenu.cpp:2131
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2133
+#: src/gui/popups/popupmenu.cpp:2134
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2151
+#: src/gui/popups/popupmenu.cpp:2152
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2169
+#: src/gui/popups/popupmenu.cpp:2170
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
+#: src/gui/popups/popupmenu.cpp:2243 src/gui/popups/popupmenu.cpp:2279
+#: src/gui/popups/popupmenu.cpp:2318 src/gui/popups/popupmenu.cpp:2336
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
+#: src/gui/popups/popupmenu.cpp:2249 src/gui/popups/popupmenu.cpp:2324
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2288
+#: src/gui/popups/popupmenu.cpp:2300 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2327
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2265
 msgid "Be friend"
 msgstr "是朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2294
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2333
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2351
+#: src/gui/popups/popupmenu.cpp:2352
 msgid "Follow"
 msgstr "按照"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2356
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2398
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2399
 msgid "Buy (?)"
 msgstr "购买(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/popupmenu.cpp:2401
+#: src/gui/popups/popupmenu.cpp:2387 src/gui/popups/popupmenu.cpp:2402
 msgid "Sell (?)"
 msgstr "出售(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2415 src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2416 src/gui/popups/popupmenu.cpp:2440
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2464
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2473
 msgid "Show Items"
 msgstr "显示项目"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2495
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2544
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2553
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2582 src/gui/windows/inventorywindow.cpp:201
-#: src/gui/windows/inventorywindow.cpp:880
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:884
 msgid "Drop..."
 msgstr "掉落..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2585
+#: src/gui/popups/popupmenu.cpp:2586
 msgid "Drop all"
 msgstr "所有"
 
@@ -2321,60 +2334,60 @@ msgstr "所有"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2591 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:885
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/windows/inventorywindow.cpp:889
 msgid "Drop"
 msgstr "丢弃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2616
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2619
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2621
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2630
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2637 src/gui/popups/popupmenu.cpp:2641
-#: src/gui/popups/popupmenu.cpp:2645 src/gui/popups/popupmenu.cpp:2649
-#: src/gui/popups/popupmenu.cpp:2653
+#: src/gui/popups/popupmenu.cpp:2638 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2646 src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2658 src/gui/popups/popupmenu.cpp:2662
-#: src/gui/popups/popupmenu.cpp:2666 src/gui/popups/popupmenu.cpp:2670
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:2675
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2395,7 +2408,7 @@ msgstr "快捷键"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:163 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr ""
 
@@ -2663,7 +2676,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:672 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -2685,7 +2698,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:270
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:114
 #: src/input/pages/basic.cpp:216
@@ -2698,9 +2711,9 @@ msgstr "退出"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:262
-#: src/gui/windows/itemamountwindow.cpp:165
-#: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/npcdialog.cpp:106
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:172
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/npcdialog.cpp:106
 #: src/gui/windows/statuswindow.cpp:749
 msgid "+"
 msgstr "+"
@@ -2711,9 +2724,9 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/itemamountwindow.cpp:163
-#: src/gui/windows/itemamountwindow.cpp:197 src/gui/windows/npcdialog.cpp:108
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:272
+#: src/gui/windows/itemamountwindow.cpp:170
+#: src/gui/windows/itemamountwindow.cpp:204 src/gui/windows/npcdialog.cpp:108
 #: src/gui/windows/statuswindow.cpp:762
 msgid "-"
 msgstr "-"
@@ -2723,7 +2736,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:272
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:492 src/gui/windows/statuswindow.cpp:547
 #: src/gui/windows/statuswindow.cpp:746 src/gui/windows/statuswindow.cpp:778
 msgid "Max"
@@ -2732,7 +2745,7 @@ msgstr "最大"
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
 #: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
-#: src/gui/windows/buydialog.cpp:248 src/gui/windows/buydialog.cpp:604
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "价格：%s / 总价：%s"
@@ -3358,8 +3371,8 @@ msgid ""
 "Enable this setting to show color selection drop-down in chat window. Chat "
 "window will display color selection drop-down.\n"
 "\n"
-"It allows to select default color of outgoing chat messages easily, but also "
-"occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3457,8 +3470,8 @@ msgid ""
 "If this setting is enabled, online status changes of party members will be "
 "shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -3471,8 +3484,8 @@ msgid ""
 "If this setting is enabled, online status changes of guild members will be "
 "shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows to see when your buddies are "
-"coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -3704,8 +3717,8 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_chat.cpp:282
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
-"button allows to invoke composing window, which allows to insert smiles and "
-"text formatting easily.\n"
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
 "Note: same window can also be invoked by hotkey when typing, usually F1 by "
 "default."
@@ -4159,7 +4172,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "Shop"
 msgstr "商店"
 
@@ -4558,12 +4571,13 @@ msgid "Allow whispers"
 msgstr "允许密语"
 
 #. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: mail window button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -5213,7 +5227,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "Equipment"
 msgstr "装备"
 
@@ -5224,7 +5238,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:142
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "物品栏"
@@ -5236,7 +5250,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
 #: src/inventory.cpp:311
 msgid "Cart"
 msgstr ""
@@ -5323,24 +5337,38 @@ msgstr ""
 msgid "Bank"
 msgstr ""
 
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for mail window.
 #: src/gui/windowmenu.cpp:152
+#, fuzzy
+msgid "MA"
+msgstr "A"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: mail window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/inventory.cpp:322
+msgid "Mail"
+msgstr ""
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:156
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:165
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:169
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:300 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5378,24 +5406,29 @@ msgid "Result"
 msgstr "结果"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:175
+#: src/gui/windows/buydialog.cpp:176
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/buydialog.cpp:264
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
 #: src/gui/windows/charselectdialog.cpp:623
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "建立"
 
+#. TRANSLATORS: buy dialog label
+#: src/gui/windows/buydialog.cpp:316
+msgid "Filter:"
+msgstr ""
+
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
 #: src/gui/windows/changeemaildialog.cpp:47
@@ -5687,19 +5720,19 @@ msgid "Enter password:"
 msgstr "输入密码:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:675
+#: src/gui/windows/chatwindow.cpp:674
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1118
+#: src/gui/windows/chatwindow.cpp:1117
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1728 src/net/eathena/pethandler.cpp:174
+#: src/gui/windows/chatwindow.cpp:1727 src/net/eathena/pethandler.cpp:174
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5816,7 +5849,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:184 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
 #: 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
@@ -5828,82 +5861,88 @@ msgid "Equip"
 msgstr "装备"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:204
 msgid "Split"
 msgstr "分离"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:206
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:207
+#: src/gui/windows/inventorywindow.cpp:208
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:209
+#: src/gui/windows/inventorywindow.cpp:210
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:211
+#: src/gui/windows/inventorywindow.cpp:212
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:171
+#: src/gui/windows/itemamountwindow.cpp:178
 msgid "All"
 msgstr "全部"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to trade."
 msgstr "请选择交易的物品数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Select amount of items to drop."
 msgstr "请选择丢弃的物品数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Select amount of items to store."
 msgstr "请选择存储的物品数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:247
+#, fuzzy
+msgid "Select amount of items to send."
+msgstr "请选择存储的物品数量."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to retrieve."
 msgstr "请选择取回的物品数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:251
+#: src/gui/windows/itemamountwindow.cpp:264
 msgid "Select amount of items to split."
 msgstr "请选择你分离的物品的数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:255
+#: src/gui/windows/itemamountwindow.cpp:268
 msgid "Add to buy shop."
 msgstr "添加到购买商店."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:259
+#: src/gui/windows/itemamountwindow.cpp:272
 msgid "Add to sell shop."
 msgstr "添加到出售商店."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:263
+#: src/gui/windows/itemamountwindow.cpp:276
 msgid "Unknown."
 msgstr "未知."
 
@@ -6044,6 +6083,110 @@ msgstr ""
 msgid "Open register url"
 msgstr ""
 
+#. TRANSLATORS: mail edit window name
+#: src/gui/windows/maileditwindow.cpp:53
+#, fuzzy
+msgid "Edit mail"
+msgstr "电子邮件:"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "发送"
+
+#. TRANSLATORS: mail edit window button
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: trade window button
+#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
+#: src/gui/windows/tradewindow.cpp:84
+msgid "Add"
+msgstr "添加"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "至:"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+msgid "Subject:"
+msgstr ""
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:106
+#, fuzzy
+msgid "Money:"
+msgstr "金币: %s"
+
+#. TRANSLATORS: mail edit window label
+#: src/gui/windows/maileditwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:127
+#, fuzzy
+msgid "Item:"
+msgstr "地图项"
+
+#. TRANSLATORS: mail edit window label
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#, fuzzy
+msgid "Message:"
+msgstr "讯息"
+
+#. TRANSLATORS: mail view window name
+#: src/gui/windows/mailviewwindow.cpp:56
+msgid "View mail"
+msgstr ""
+
+#. TRANSLATORS: mail view window button
+#: src/gui/windows/mailviewwindow.cpp:66
+msgid "Reply"
+msgstr ""
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:68
+#, fuzzy
+msgid "Time:"
+msgstr "时间"
+
+#. TRANSLATORS: mail view window label
+#: src/gui/windows/mailviewwindow.cpp:72
+msgid "From:"
+msgstr ""
+
+#: src/gui/windows/mailviewwindow.cpp:134
+#, fuzzy
+msgid "Get attach"
+msgstr "(?) 攻击"
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:61
+msgid "Refresh"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:63
+msgid "New"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:67
+msgid "Return"
+msgstr ""
+
+#. TRANSLATORS: mail window button
+#: src/gui/windows/mailwindow.cpp:69
+msgid "Open"
+msgstr ""
+
 #: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr ""
@@ -6131,25 +6274,6 @@ msgstr "下一个"
 msgid "Submit"
 msgstr "提交"
 
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:118
-#: src/gui/windows/shopwindow.cpp:121 src/gui/windows/tradewindow.cpp:84
-msgid "Add"
-msgstr "添加"
-
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:59
-msgid "To:"
-msgstr "至:"
-
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:66
-msgid "Send"
-msgstr "发送"
-
 #. TRANSLATORS: npc post message error
 #: src/gui/windows/npcpostdialog.cpp:113
 msgid "Failed to send as sender or letter invalid."
@@ -8582,6 +8706,11 @@ msgstr "旧密码不正确."
 msgid "New password too short."
 msgstr "新密码太短."
 
+#: src/net/eathena/mailhandler.cpp:217
+#, c-format
+msgid "You have new mail from %s with subject %s"
+msgstr ""
+
 #: src/net/eathena/skillhandler.cpp:361
 #, c-format
 msgid "Unknown skill error: %d"
@@ -9520,6 +9649,68 @@ msgstr ""
 msgid "Left %d seconds until you can use item."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:572
+#, fuzzy
+msgid "Message succesfully sent."
+msgstr "玩家成功%s!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:576
+#, fuzzy
+msgid "Message send failed."
+msgstr "讯息关闭聊天."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:580
+#, fuzzy
+msgid "Item attach failed."
+msgstr "启用攻击过滤器"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:584
+#, fuzzy
+msgid "Money attach failed."
+msgstr "启用攻击过滤器"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:588
+#, fuzzy
+msgid "Message return failed."
+msgstr "聊天创建失败!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:592
+msgid "Message return success."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:596
+#, fuzzy
+msgid "Message deletion failed."
+msgstr "身份验证失败."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:600
+#, fuzzy
+msgid "Message successfully deleted."
+msgstr "帮会创建成功."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:604
+msgid "You got attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:608
+msgid "Error on getting attach successfully."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:612
+msgid "Can't get attach. Too many items."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format