1 files changed, 392 insertions, 199 deletions

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