1 files changed, 151 insertions, 146 deletions

diff --git a/po/ja.po b/po/ja.po
index f0d4b83bd..78de69dcf 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-09-16 17:07+0300\n"
-"PO-Revision-Date: 2017-09-12 02:41+0000\n"
+"POT-Creation-Date: 2017-09-30 15:41+0300\n"
+"PO-Revision-Date: 2017-09-19 09:37+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
 "ja/)\n"
@@ -56,59 +56,59 @@ msgstr "I"
 
 #. TRANSLATORS: chat message after death
 #. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:404 src/net/eathena/playerrecv.cpp:475
+#: src/being/localplayer.cpp:403 src/net/eathena/playerrecv.cpp:475
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:889
 msgid "Tried to pick up nonexistent item."
 msgstr "存在しないアイテムは拾えません."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:893
 msgid "Item is too heavy."
 msgstr "アイテムが重過ぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:897
 msgid "Item is too far away."
 msgstr "アイテムが遠すぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:901
 msgid "Inventory is full."
 msgstr "インベントリーが満杯です."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:905
 msgid "Stack is too big."
 msgstr "量が多すぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:910
+#: src/being/localplayer.cpp:909
 msgid "Item belongs to someone else."
 msgstr "これは他のプレイヤーのアイテムです."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:914
+#: src/being/localplayer.cpp:913
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:918
+#: src/being/localplayer.cpp:917
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:925
+#: src/being/localplayer.cpp:924
 msgid "Unknown problem picking up item."
 msgstr "不明なエラーの為拾えません."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:955
+#: src/being/localplayer.cpp:954
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -116,58 +116,58 @@ msgstr[0] "%d [@@%d|%s@@]を手に入れました."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1166 src/being/localplayer.cpp:1168
-#: src/being/localplayer.cpp:1194 src/being/localplayer.cpp:1207
+#: src/being/localplayer.cpp:1165 src/being/localplayer.cpp:1167
+#: src/being/localplayer.cpp:1193 src/being/localplayer.cpp:1206
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1172 src/being/localplayer.cpp:1178
-#: src/being/localplayer.cpp:1184
+#: src/being/localplayer.cpp:1171 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1183
 msgid "job"
 msgstr "ジョブ"
 
 #. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1204
+#: src/being/localplayer.cpp:1203
 msgid "Homun"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1216
+#: src/being/localplayer.cpp:1215
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1225
+#: src/being/localplayer.cpp:1224
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2304
+#: src/being/localplayer.cpp:2301
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2310 src/being/localplayer.cpp:2335
+#: src/being/localplayer.cpp:2307 src/being/localplayer.cpp:2332
 msgid "Follow canceled"
 msgstr "フォローを止める"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2320
+#: src/being/localplayer.cpp:2317
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2326 src/being/localplayer.cpp:2340
+#: src/being/localplayer.cpp:2323 src/being/localplayer.cpp:2337
 msgid "Imitation canceled"
 msgstr "真似をやめる"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2698
+#: src/being/localplayer.cpp:2695
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -371,7 +371,7 @@ msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2173
+#: src/game.cpp:284 src/gui/windows/chatwindow.cpp:2171
 msgid "General"
 msgstr "一般"
 
@@ -803,18 +803,18 @@ msgstr "アウェイ"
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:264
-#: src/gui/windows/charselectdialog.cpp:307 src/gui/windows/editdialog.cpp:51
+#: src/gui/windows/charselectdialog.cpp:265
+#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:51
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:200 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
-#: src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:298
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:465
+#: src/net/eathena/charserverrecv.cpp:493 src/net/tmwa/charserverrecv.cpp:295
 #: src/progs/manaplus/actions/actions.cpp:175
-#: src/progs/manaplus/client.cpp:1477 src/progs/manaplus/client.cpp:1512
+#: src/progs/manaplus/client.cpp:1475 src/progs/manaplus/client.cpp:1510
 msgid "OK"
 msgstr "OK"
 
@@ -851,8 +851,8 @@ msgstr "(F) フリーカメラモード"
 #: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
 #: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
 #: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
-#: src/progs/dyecmd/client.cpp:552 src/progs/manaplus/client.cpp:912
-#: src/progs/manaplus/client.cpp:1391 src/progs/manaplus/client.cpp:1410
+#: src/progs/dyecmd/client.cpp:550 src/progs/manaplus/client.cpp:910
+#: src/progs/manaplus/client.cpp:1389 src/progs/manaplus/client.cpp:1408
 msgid "Close"
 msgstr "閉じる"
 
@@ -1389,8 +1389,8 @@ msgstr ""
 #. TRANSLATORS: status window label
 #: src/gui/popups/beingpopup.cpp:274 src/gui/popups/popupmenu.cpp:2362
 #: src/gui/popups/skillpopup.cpp:149 src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/statuswindow.cpp:75 src/gui/windows/statuswindow.cpp:279
-#: src/gui/windows/statuswindow.cpp:374
+#: src/gui/windows/statuswindow.cpp:74 src/gui/windows/statuswindow.cpp:280
+#: src/gui/windows/statuswindow.cpp:320
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
@@ -2127,7 +2127,7 @@ msgstr "黄色バーをリセットする"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:1991 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr "チャットへコピーする"
 
@@ -2676,8 +2676,8 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:3296 src/gui/popups/popupmenu.cpp:3325
 #: src/gui/popups/popupmenu.cpp:3344 src/gui/windows/charselectdialog.cpp:78
 #: src/gui/windows/serverdialog.cpp:120 src/net/ea/charserverrecv.cpp:130
-#: src/net/eathena/charserverrecv.cpp:417
-#: src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:462
 msgid "Info"
 msgstr "情報"
 
@@ -2821,7 +2821,7 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
-#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:238
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:239
 msgid "Basic"
 msgstr "基本"
 
@@ -2871,7 +2871,7 @@ msgstr "チャット"
 #: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:442
 #: src/gui/widgets/tabs/setup_audio.cpp:159
 #: src/gui/widgets/tabs/setup_chat.cpp:293
-#: src/gui/widgets/tabs/setup_misc.cpp:430
+#: src/gui/widgets/tabs/setup_misc.cpp:434
 #: src/gui/widgets/tabs/setup_visual.cpp:207 src/input/pages/chat.cpp:145
 #: src/input/pages/gui.cpp:85 src/input/pages/other.cpp:106
 msgid "Other"
@@ -3183,7 +3183,7 @@ msgstr ""
 #: src/gui/widgets/attrs/changedisplay.cpp:48
 #: src/gui/widgets/attrs/changedisplay.cpp:70
 #: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:350
-#: src/gui/windows/statuswindow.cpp:452 src/gui/windows/statuswindow.cpp:508
+#: src/gui/windows/statuswindow.cpp:454 src/gui/windows/statuswindow.cpp:516
 msgid "Max"
 msgstr "最大"
 
@@ -3210,8 +3210,8 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:77
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/inventorywindow.cpp:712 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/statuswindow.cpp:221 src/gui/windows/statuswindow.cpp:313
 #, c-format
 msgid "Money: %s"
 msgstr "GP: %s"
@@ -4764,104 +4764,109 @@ msgstr "プロキシタイプ"
 msgid "Proxy address:port"
 msgstr "プロキシアドレス:ポート"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_misc.cpp:389
+msgid "Tunnel through HTTP proxy"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_misc.cpp:390
+#: src/gui/widgets/tabs/setup_misc.cpp:394
 msgid "Logging"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:393
+#: src/gui/widgets/tabs/setup_misc.cpp:397
 msgid "Enable OpenGL version check (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:398
+#: src/gui/widgets/tabs/setup_misc.cpp:402
 msgid "Enable debug log"
 msgstr "デバッグログを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:402
+#: src/gui/widgets/tabs/setup_misc.cpp:406
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:406
+#: src/gui/widgets/tabs/setup_misc.cpp:410
 msgid "Log unimplemented packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:410
+#: src/gui/widgets/tabs/setup_misc.cpp:414
 msgid "Enable OpenGL log"
 msgstr "OpenGLログを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:414
+#: src/gui/widgets/tabs/setup_misc.cpp:418
 msgid "Enable input log"
 msgstr "入力ログを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:420
+#: src/gui/widgets/tabs/setup_misc.cpp:424
 msgid "SDL logging level"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_misc.cpp:425 src/input/pages/other.cpp:408
+#: src/gui/widgets/tabs/setup_misc.cpp:429 src/input/pages/other.cpp:408
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:433
+#: src/gui/widgets/tabs/setup_misc.cpp:437
 msgid "Enable server side attack"
 msgstr "サーバーサイドアタックを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:437
+#: src/gui/widgets/tabs/setup_misc.cpp:441
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:441
+#: src/gui/widgets/tabs/setup_misc.cpp:445
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:445
+#: src/gui/widgets/tabs/setup_misc.cpp:449
 msgid "Enable bot checker"
 msgstr "ボットチェッカーを有効にする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:449
+#: src/gui/widgets/tabs/setup_misc.cpp:453
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "不安定なサーバー保護を有効にする(無効にしない)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:455
+#: src/gui/widgets/tabs/setup_misc.cpp:459
 msgid "Low traffic mode"
 msgstr "低トラフィックモード"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:460
+#: src/gui/widgets/tabs/setup_misc.cpp:464
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "スクリーンショットにFBOを使う (OpenGLのみ)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:466
+#: src/gui/widgets/tabs/setup_misc.cpp:470
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:473
+#: src/gui/widgets/tabs/setup_misc.cpp:477
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:477
+#: src/gui/widgets/tabs/setup_misc.cpp:481
 msgid "Show background"
 msgstr "背景を表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_misc.cpp:482
+#: src/gui/widgets/tabs/setup_misc.cpp:486
 msgid "Screen density override"
 msgstr ""
 
@@ -4884,8 +4889,8 @@ msgstr "いいえ"
 
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:536
-#: src/progs/manaplus/client.cpp:896
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:534
+#: src/progs/manaplus/client.cpp:894
 msgid "Performance"
 msgstr ""
 
@@ -5301,8 +5306,8 @@ msgstr "i"
 
 #. TRANSLATORS: theme settings tab name
 #. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:542
-#: src/progs/manaplus/client.cpp:902
+#: src/gui/widgets/tabs/setup_theme.cpp:121 src/progs/dyecmd/client.cpp:540
+#: src/progs/manaplus/client.cpp:900
 msgid "Theme"
 msgstr "テーマ"
 
@@ -5460,8 +5465,8 @@ msgstr "フレームなし"
 
 #. TRANSLATORS: video settings tab name
 #. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:539
-#: src/progs/manaplus/client.cpp:899
+#: src/gui/widgets/tabs/setup_video.cpp:114 src/progs/dyecmd/client.cpp:537
+#: src/progs/manaplus/client.cpp:897
 msgid "Video"
 msgstr "ビデオ"
 
@@ -5861,7 +5866,7 @@ msgstr "ヘルプ"
 #. TRANSLATORS: help window name
 #. TRANSLATORS: theme tab quick button
 #: src/gui/windowmenu.cpp:76 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:548 src/progs/manaplus/client.cpp:908
+#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:906
 msgid "Help"
 msgstr "ヘルプ"
 
@@ -6056,7 +6061,7 @@ msgstr "SET"
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: setup tab quick button
 #: src/gui/windowmenu.cpp:198 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:533 src/progs/manaplus/client.cpp:893
+#: src/progs/dyecmd/client.cpp:531 src/progs/manaplus/client.cpp:891
 msgid "Setup"
 msgstr "設定"
 
@@ -6098,7 +6103,7 @@ msgstr "量:"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/buydialog.cpp:336 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:617
+#: src/gui/windows/charselectdialog.cpp:618
 msgid "Create"
 msgstr "作成"
 
@@ -6159,14 +6164,14 @@ msgstr "メールアドレスが一致しません."
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:303
+#: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:204
 #: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:394
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:294
-#: src/progs/manaplus/client.cpp:1388 src/progs/manaplus/client.cpp:1407
-#: src/progs/manaplus/client.cpp:1612
+#: src/net/eathena/charserverrecv.cpp:403
+#: src/net/eathena/charserverrecv.cpp:407
+#: src/net/eathena/charserverrecv.cpp:489 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1386 src/progs/manaplus/client.cpp:1405
+#: src/progs/manaplus/client.cpp:1610
 msgid "Error"
 msgstr "エラー"
 
@@ -6354,7 +6359,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:607
+#: src/gui/windows/charselectdialog.cpp:608
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "プレイ"
@@ -6376,38 +6381,38 @@ msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:246
+#: src/gui/windows/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
 "Mp: %u/%u\n"
 "Level: %u\n"
-"Experience: %u\n"
+"Experience: %s\n"
 "Money: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:305
+#: src/gui/windows/charselectdialog.cpp:306
 msgid "Incorrect password"
 msgstr "パスワードが違います"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:456
+#: src/gui/windows/charselectdialog.cpp:457
 msgid "Enter your email for deleting character"
 msgstr ""
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:458
+#: src/gui/windows/charselectdialog.cpp:459
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:465
+#: src/gui/windows/charselectdialog.cpp:466
 msgid "Enter password for deleting character"
 msgstr "キャラクターを削除するにはパスワードを入力して下さい"
 
 #. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:467
+#: src/gui/windows/charselectdialog.cpp:468
 msgid "Enter password:"
 msgstr "パスワードを入力して下さい:"
 
@@ -6418,23 +6423,23 @@ msgid "Present: %s; %d players are present."
 msgstr "現在: %s; %d プレイヤーがいます."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1171
+#: src/gui/windows/chatwindow.cpp:1169
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%sにささやき中:%s"
 
 #. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1601
+#: src/gui/windows/chatwindow.cpp:1599
 msgid "Moved: "
 msgstr ""
 
 #. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1609
+#: src/gui/windows/chatwindow.cpp:1607
 msgid "Your message was moved to trade tab"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1634
+#: src/gui/windows/chatwindow.cpp:1632
 msgid "Broken nick detected: "
 msgstr ""
 
@@ -6697,39 +6702,39 @@ msgid "Reset timer"
 msgstr "タイマーをリセット"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
-#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "キル: %s, 合計exp: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
-#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
-#: src/gui/windows/killstats.cpp:432
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:463
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "平均 Exp: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
-#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
-#: src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
+#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
+#: src/gui/windows/killstats.cpp:466
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "次のレベルまでに必要なモブ数　約: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
-#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
+#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "キル/分: %s, Exp/分: %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
-#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
+#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
@@ -6743,33 +6748,33 @@ msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "次のレベルアップ %d 分ごと: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
 msgid "Last kill exp:"
 msgstr "最後のExp:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
+#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "レベル: %d と %f%%"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
-#, c-format
-msgid "Exp: %d/%d Left: %d"
+#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#, fuzzy, c-format
+msgid "Exp: %s/%s Left: %s"
 msgstr "Exp: %d/%d 残り: %d"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
-#: src/gui/windows/killstats.cpp:261
-#, c-format
-msgid "1%% = %d exp, avg mob for 1%%: %s"
+#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
+#: src/gui/windows/killstats.cpp:278
+#, fuzzy, c-format
+msgid "1%% = %s exp, avg mob for 1%%: %s"
 msgstr "1%% = %d exp, 平均の敵 1%%: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
-#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
-#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
+#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  次のレベル達成までの時間: %s"
@@ -6979,13 +6984,13 @@ msgid "Level: %d (GM %d)"
 msgstr "レベル: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:382
-#: src/gui/windows/ministatuswindow.cpp:419
+#: src/gui/windows/ministatuswindow.cpp:390
+#: src/gui/windows/ministatuswindow.cpp:438
 msgid "Need"
 msgstr "必要"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:406
+#: src/gui/windows/ministatuswindow.cpp:421
 #, c-format
 msgid "Job level: %d"
 msgstr ""
@@ -7441,33 +7446,33 @@ msgid "Accept Party Invite"
 msgstr "パーティ招待を受け入れます"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:79
+#: src/gui/windows/statuswindow.cpp:78
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:82
+#: src/gui/windows/statuswindow.cpp:81
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:145
+#: src/gui/windows/statuswindow.cpp:146
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:183 src/gui/windows/statuswindow.cpp:330
+#: src/gui/windows/statuswindow.cpp:184 src/gui/windows/statuswindow.cpp:373
 #, c-format
 msgid "Job: %d"
 msgstr "ジョブ: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:185
+#: src/gui/windows/statuswindow.cpp:186
 msgid "Job:"
 msgstr "ジョブポイント:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:271
+#: src/gui/windows/statuswindow.cpp:272
 #, c-format
 msgid "Level: %d (%s %d)"
 msgstr ""
@@ -9050,33 +9055,33 @@ msgstr "サーバーへの接続が切断されました. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:453
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:444
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:448
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:448
+#: src/net/eathena/charserverrecv.cpp:457
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/eathena/charserverrecv.cpp:491 src/net/tmwa/charserverrecv.cpp:293
 msgid "Failed to delete character."
 msgstr "キャラクター削除に失敗しました."
 
@@ -9585,22 +9590,22 @@ msgid "Poison had no effect..."
 msgstr "毒の影響はなかった..."
 
 #. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:545 src/progs/manaplus/client.cpp:905
+#: src/progs/dyecmd/client.cpp:543 src/progs/manaplus/client.cpp:903
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:58
+#: src/progs/dyecmd/dyemain.cpp:57
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:60
+#: src/progs/dyecmd/dyemain.cpp:59
 msgid "or"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/progs/dyecmd/dyemain.cpp:62
+#: src/progs/dyecmd/dyemain.cpp:61
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
@@ -9922,57 +9927,57 @@ msgid "Accepting incoming trade requests"
 msgstr "トレードリクエストを有効にしました"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1107
+#: src/progs/manaplus/client.cpp:1105
 msgid "Connecting to server"
 msgstr "サーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1165 src/unittests/gui/windowmanager.cc:808
+#: src/progs/manaplus/client.cpp:1163 src/unittests/gui/windowmanager.cc:808
 msgid "Logging in"
 msgstr "ログインしています"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1215
+#: src/progs/manaplus/client.cpp:1213
 msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1276
+#: src/progs/manaplus/client.cpp:1274
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1319
+#: src/progs/manaplus/client.cpp:1317
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1331
+#: src/progs/manaplus/client.cpp:1329
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1426
+#: src/progs/manaplus/client.cpp:1424
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
 #. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1473
+#: src/progs/manaplus/client.cpp:1471
 msgid "Password Change"
 msgstr "パスワード変更"
 
 #. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1475
+#: src/progs/manaplus/client.cpp:1473
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました!"
 
 #. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1508
+#: src/progs/manaplus/client.cpp:1506
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
 #. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1510
+#: src/progs/manaplus/client.cpp:1508
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました!"