Update translations.

1 files changed, 800 insertions, 762 deletions

diff --git a/po/ja.po b/po/ja.po
index e3efcc50e..bc257cf95 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: 2014-09-23 16:06+0300\n"
-"PO-Revision-Date: 2014-09-23 09:59+0000\n"
+"POT-Creation-Date: 2014-09-27 13:23+0300\n"
+"PO-Revision-Date: 2014-09-24 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
 "language/ja/)\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:130
+#: src/actions/actions.cpp:129
 msgid "File uploaded"
 msgstr ""
 
@@ -39,131 +39,131 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:132 src/client.cpp:1460 src/client.cpp:1487
-#: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
+#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
 #: src/gui/widgets/tabs/setup_video.cpp:248
 #: src/gui/widgets/tabs/setup_video.cpp:272
 #: src/gui/widgets/tabs/setup_video.cpp:387
 #: src/gui/widgets/tabs/setup_video.cpp:399
-#: src/gui/windows/changeemaildialog.cpp:171
-#: src/gui/windows/changepassworddialog.cpp:161
+#: src/gui/windows/changeemaildialog.cpp:170
+#: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:256
-#: src/gui/windows/charselectdialog.cpp:292 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:255
+#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:208
-#: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
-#: src/gui/windows/registerdialog.cpp:246 src/gui/windows/socialwindow.cpp:504
-#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:150
-#: src/net/ea/charserverhandler.cpp:147 src/net/ea/charserverhandler.cpp:166
-#: src/net/ea/charserverhandler.cpp:179 src/net/ea/gamehandler.cpp:79
+#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/socialwindow.cpp:503
+#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
+#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
+#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
 #: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:664 src/actions/actions.cpp:676
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:804 src/actions/actions.cpp:860
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr "クライアントの稼働時間: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr "%d週"
 
-#: src/actions/actions.cpp:815
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr "%d日"
 
-#: src/actions/actions.cpp:826
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr "%d時"
 
-#: src/actions/actions.cpp:836
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr "%d分"
 
-#: src/actions/actions.cpp:846
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr "%d秒"
 
-#: src/actions/actions.cpp:856
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:917 src/actions/actions.cpp:926
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr "リソースイメージ:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:920 src/actions/actions.cpp:929
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr "リソース孤児イメージ:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1017
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1136
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1145
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1154
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:219
+#: src/actions/chat.cpp:218
 msgid "Cannot send empty whispers!"
 msgstr "空のささやきを送信することはできません!"
 
 #. TRANSLATORS: new whisper query
-#: src/actions/chat.cpp:239
+#: src/actions/chat.cpp:238
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -174,7 +174,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:264 src/net/ea/gui/partytab.cpp:80
+#: src/actions/chat.cpp:263 src/net/ea/gui/partytab.cpp:79
 msgid "Party name is missing."
 msgstr "パーティ名がありません."
 
@@ -185,25 +185,25 @@ msgstr "ギルド名がありません."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:302 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
 msgid "Please specify a name."
 msgstr "名前を入力してください."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Return toggles chat."
 msgstr "改行キーでチャット入力ができます."
 
-#: src/actions/chat.cpp:321
+#: src/actions/chat.cpp:323
 msgid "Message closes chat."
 msgstr "チャットを閉じます."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:332
+#: src/actions/chat.cpp:334
 msgid "Return now toggles chat."
 msgstr "改行キーでチャット入力ができます."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:341
+#: src/actions/chat.cpp:343
 msgid "Message now closes chat."
 msgstr "チャットを閉じます."
 
@@ -291,77 +291,77 @@ msgid "Accepting incoming trade requests"
 msgstr "トレードリクエストを有効にしました"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1308
+#: src/actormanager.cpp:1306
 msgid "Visible on map"
 msgstr "マップに表示させる"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:367
+#: src/being/being.cpp:389
 msgid "Human"
 msgstr "人間"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "dodge"
 msgstr "ドッジ"
 
-#: src/being/being.cpp:534
+#: src/being/being.cpp:556
 msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1842 src/gui/windows/whoisonline.cpp:856
+#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1847 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:381
+#: src/being/localplayer.cpp:379
 #, c-format
 msgid "You were killed by %s"
 msgstr "%sによって殺されました"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:822
+#: src/being/localplayer.cpp:824
 msgid "Tried to pick up nonexistent item."
 msgstr "存在しないアイテムは拾えません."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:826
+#: src/being/localplayer.cpp:828
 msgid "Item is too heavy."
 msgstr "アイテムが重過ぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:830
+#: src/being/localplayer.cpp:832
 msgid "Item is too far away."
 msgstr "アイテムが遠すぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:834
+#: src/being/localplayer.cpp:836
 msgid "Inventory is full."
 msgstr "インベントリーが満杯です."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:838
+#: src/being/localplayer.cpp:840
 msgid "Stack is too big."
 msgstr "量が多すぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:842
+#: src/being/localplayer.cpp:844
 msgid "Item belongs to someone else."
 msgstr "これは他のプレイヤーのアイテムです."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:846
+#: src/being/localplayer.cpp:848
 msgid "Unknown problem picking up item."
 msgstr "不明なエラーの為拾えません."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:870
+#: src/being/localplayer.cpp:872
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -369,43 +369,43 @@ msgstr[0] "%d [@@%d|%s@@]を手に入れました."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1052 src/being/localplayer.cpp:1053
-#: src/being/localplayer.cpp:1089
+#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
+#: src/being/localplayer.cpp:1091
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1057 src/being/localplayer.cpp:1063
-#: src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
+#: src/being/localplayer.cpp:1071
 msgid "job"
 msgstr "ジョブ"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2792
+#: src/being/localplayer.cpp:2794
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2798 src/being/localplayer.cpp:2823
+#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
 msgid "Follow canceled"
 msgstr "フォローを止める"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2808
+#: src/being/localplayer.cpp:2810
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2814 src/being/localplayer.cpp:2828
+#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
 msgid "Imitation canceled"
 msgstr "真似をやめる"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3178
+#: src/being/localplayer.cpp:3180
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -415,8 +415,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2638
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2672
+#: src/gui/popups/popupmenu.cpp:2714
 msgid "Completely ignore"
 msgstr "完全無視"
 
@@ -443,37 +443,37 @@ msgstr "吹出し"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:918 src/gui/windowmenu.cpp:162
+#: src/client.cpp:920 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "ビデオ"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "テーマ"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:930
+#: src/client.cpp:932
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:933 src/gui/windowmenu.cpp:74
+#: src/client.cpp:935 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "ヘルプ"
@@ -489,42 +489,42 @@ msgstr "ヘルプ"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:937 src/client.cpp:1388 src/client.cpp:1402
-#: src/gui/dialogsmanager.cpp:85 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:905 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
-#: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:85
+#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
+#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
+#: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "閉じる"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1063
+#: src/client.cpp:1065
 msgid "Connecting to server"
 msgstr "サーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1111
+#: src/client.cpp:1113
 msgid "Logging in"
 msgstr "ログインしています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154
+#: src/client.cpp:1156
 msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1279
+#: src/client.cpp:1282
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1319
+#: src/client.cpp:1322
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1331
+#: src/client.cpp:1334
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
@@ -538,50 +538,50 @@ msgstr "ゲームサーバーを変更しています"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1386 src/client.cpp:1400 src/client.cpp:1595
-#: src/gui/windows/changeemaildialog.cpp:168
-#: src/gui/windows/changepassworddialog.cpp:158
+#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#: src/gui/windows/changeemaildialog.cpp:167
+#: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 #: src/gui/windows/editserverdialog.cpp:203
-#: src/gui/windows/registerdialog.cpp:246
-#: src/gui/windows/unregisterdialog.cpp:147
-#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:177
+#: src/gui/windows/registerdialog.cpp:245
+#: src/gui/windows/unregisterdialog.cpp:146
+#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
 msgid "Error"
 msgstr "エラー"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1418
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1456
+#: src/client.cpp:1459
 msgid "Password Change"
 msgstr "パスワード変更"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1458
+#: src/client.cpp:1461
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1483
+#: src/client.cpp:1486
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1485
+#: src/client.cpp:1488
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1512
+#: src/client.cpp:1515
 msgid "Unregister Successful"
 msgstr "登録を解除しました"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1514
+#: src/client.cpp:1517
 msgid "Farewell, come back any time..."
 msgstr "さようなら　また会いましょう..."
 
@@ -621,416 +621,416 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:237 src/gui/widgets/tabs/chattab.cpp:483
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
 msgid "General"
 msgstr "一般"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:254 src/gui/widgets/tabs/chattab.cpp:485
+#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "デバッグ"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:542
+#: src/game.cpp:541
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:552
+#: src/game.cpp:551
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存できませんでした!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:635
+#: src/game.cpp:634
 msgid "The connection to the server was lost."
 msgstr "サーバーへの接続が切断されました."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:638
+#: src/game.cpp:637
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:141
+#: src/gamemodifiers.cpp:142
 msgid "(D) default moves"
 msgstr "(D) デフォルトムーブ"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:143
+#: src/gamemodifiers.cpp:144
 msgid "(I) invert moves"
 msgstr "(I) 逆ムーブ"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:145
+#: src/gamemodifiers.cpp:146
 msgid "(c) moves with some crazy moves"
 msgstr "(c) クレイジームーブを含んだムーブ"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:147
+#: src/gamemodifiers.cpp:148
 msgid "(C) moves with crazy moves"
 msgstr "(C) クレイジームーブ"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:149
+#: src/gamemodifiers.cpp:150
 msgid "(d) double normal + crazy"
 msgstr "(d) ダブルノーマル + クレイジー"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:151
+#: src/gamemodifiers.cpp:152
 msgid "(?) unknown move"
 msgstr "(?) 不明なムーブ"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:176
+#: src/gamemodifiers.cpp:177
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:182
+#: src/gamemodifiers.cpp:183
 msgid "(a) custom crazy move"
 msgstr "(a) カスタムクレイジームーブ"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:187
+#: src/gamemodifiers.cpp:188
 msgid "(?) crazy move"
 msgstr "(?) クレイジームーブ"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(0) default moves to target"
 msgstr "(0) ターゲットへデフォルト接近"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:196
+#: src/gamemodifiers.cpp:197
 msgid "(1) moves to target in distance 1"
 msgstr "(1) 距離1でターゲットへ接近"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:198
+#: src/gamemodifiers.cpp:199
 msgid "(2) moves to target in distance 2"
 msgstr "(2) 距離2でターゲットに近付く"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:200
+#: src/gamemodifiers.cpp:201
 msgid "(3) moves to target in distance 3"
 msgstr "(3) 距離3でターゲットへ接近"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:202
+#: src/gamemodifiers.cpp:203
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:204
+#: src/gamemodifiers.cpp:205
 msgid "(5) moves to target in distance 5"
 msgstr "(5) 距離5でターゲットに近付く"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:206
+#: src/gamemodifiers.cpp:207
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:208
+#: src/gamemodifiers.cpp:209
 msgid "(7) moves to target in distance 7"
 msgstr "(7) 距離7でターゲットに近付く"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:210
+#: src/gamemodifiers.cpp:211
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:212
+#: src/gamemodifiers.cpp:213
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:214
+#: src/gamemodifiers.cpp:215
 msgid "(A) moves to target in attack range"
 msgstr "(A) 攻撃範囲内のターゲットに近付く"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:216
+#: src/gamemodifiers.cpp:217
 msgid "(a) archer attack range"
 msgstr "(a) 弓師攻撃範囲"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:218
+#: src/gamemodifiers.cpp:219
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) 攻撃範囲 - 1のターゲットまで移動"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:220
+#: src/gamemodifiers.cpp:221
 msgid "(?) move to target"
 msgstr "(?) ターゲットに近付く"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:226
+#: src/gamemodifiers.cpp:227
 msgid "(D) default follow"
 msgstr "(D) デフォルトフォロー"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:228
+#: src/gamemodifiers.cpp:229
 msgid "(R) relative follow"
 msgstr "(R) 友達フォロー"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:230
+#: src/gamemodifiers.cpp:231
 msgid "(M) mirror follow"
 msgstr "(M) ミラーフォロー"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:232
+#: src/gamemodifiers.cpp:233
 msgid "(P) pet follow"
 msgstr "(P) ペットフォロー"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:234
+#: src/gamemodifiers.cpp:235
 msgid "(?) unknown follow"
 msgstr "(?) 不明なフォロー"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:240 src/gamemodifiers.cpp:248
-#: src/gamemodifiers.cpp:262
+#: src/gamemodifiers.cpp:241 src/gamemodifiers.cpp:249
+#: src/gamemodifiers.cpp:263
 msgid "(?) attack"
 msgstr "(?) 攻撃"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:242 src/gamemodifiers.cpp:254
+#: src/gamemodifiers.cpp:243 src/gamemodifiers.cpp:255
 msgid "(D) default attack"
 msgstr "(D) デフォルト攻撃"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:244
+#: src/gamemodifiers.cpp:245
 msgid "(s) switch attack without shield"
 msgstr "(s) 盾なし攻撃"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:246
+#: src/gamemodifiers.cpp:247
 msgid "(S) switch attack with shield"
 msgstr "(S) 盾あり攻撃"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:257
 msgid "(G) go and attack"
 msgstr "(G) 接近、攻撃"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:258
+#: src/gamemodifiers.cpp:259
 msgid "(A) go, attack, pickup"
 msgstr "(A) 接近、攻撃、拾う"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:260
+#: src/gamemodifiers.cpp:261
 msgid "(d) without auto attack"
 msgstr "(d) 自動攻撃なし"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:295
+#: src/gamemodifiers.cpp:296
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) 小範囲で拾う 1x1セル"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:297
+#: src/gamemodifiers.cpp:298
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) デフォルト範囲で拾う 2x1セル"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:299
+#: src/gamemodifiers.cpp:300
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) 広範囲で拾う 2x3セル"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:301
+#: src/gamemodifiers.cpp:302
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) 3x3セルの範囲で拾う"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:304
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) 距離4の範囲で拾う"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:306
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) 距離8で拾う"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:308
 msgid "(A) go and pick up in max distance"
 msgstr "(A) 最大範囲で拾う"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:310
 msgid "(?) pick up"
 msgstr "(?) 拾う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:316
 msgid "(f) use #flar for magic attack"
 msgstr "(f) 魔法攻撃は #flarを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:318
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) 魔法攻撃は #chizaを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:319
+#: src/gamemodifiers.cpp:320
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) 魔法攻撃は #ingravを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:321
+#: src/gamemodifiers.cpp:322
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) 魔法攻撃は #frillyarを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:324
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) 魔法攻撃は #upmarmuを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:326
 msgid "(?) magic attack"
 msgstr "(?) 魔法攻撃"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:332
 msgid "(a) attack all players"
 msgstr "(a) 全てのプレイヤーを攻撃"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:334
 msgid "(f) attack all except friends"
 msgstr "(f) 友達以外を攻撃"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:335
+#: src/gamemodifiers.cpp:336
 msgid "(b) attack bad relations"
 msgstr "(b) 敵を攻撃"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:337
+#: src/gamemodifiers.cpp:338
 msgid "(d) don't attack players"
 msgstr "(d) 他のプレイヤーを攻撃しない"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:340
 msgid "(?) pvp attack"
 msgstr "(?) PvP攻撃"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:346
 msgid "(D) default imitation"
 msgstr "(D) デフォルト真似"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:348
 msgid "(O) outfits imitation"
 msgstr "(O) 服装真似"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:349
+#: src/gamemodifiers.cpp:350
 msgid "(?) imitation"
 msgstr "(?) 真似をする"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:356
 msgid "Game modifiers are enabled"
 msgstr "ゲームモディファイアは有効になってます"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:358
 msgid "Game modifiers are disabled"
 msgstr "ゲームモディファイアは無効になってます"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:359
+#: src/gamemodifiers.cpp:360
 msgid "Game modifiers are unknown"
 msgstr "不明なゲームモディファイア"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:372
+#: src/gamemodifiers.cpp:373
 msgid "(N) normal map view"
 msgstr "(N) 通常マップビュー"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:374
+#: src/gamemodifiers.cpp:375
 msgid "(D) debug map view"
 msgstr "(D) デバッグマップビュー"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:376
+#: src/gamemodifiers.cpp:377
 msgid "(u) ultra map view"
 msgstr "(u) ウルトラマップビュー"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:378
+#: src/gamemodifiers.cpp:379
 msgid "(U) ultra map view 2"
 msgstr "(U) ウルトラマップビュー2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:380
+#: src/gamemodifiers.cpp:381
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:382
+#: src/gamemodifiers.cpp:383
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:384
+#: src/gamemodifiers.cpp:385
 msgid "(b) black & white map view"
 msgstr "(b) 白黒マップビュー"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:386
+#: src/gamemodifiers.cpp:387
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:392
+#: src/gamemodifiers.cpp:393
 msgid "(O) on keyboard"
 msgstr "(O) キーボード"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:394
+#: src/gamemodifiers.cpp:395
 msgid "(A) away"
 msgstr "(A) アウェイ"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:396 src/gamemodifiers.cpp:449
+#: src/gamemodifiers.cpp:397 src/gamemodifiers.cpp:450
 msgid "(?) away"
 msgstr "(?) アウェイ"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:419
+#: src/gamemodifiers.cpp:420
 msgid "Away"
 msgstr "アウェイ"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:445
+#: src/gamemodifiers.cpp:446
 msgid "(G) game camera mode"
 msgstr "(G) ゲームカメラモード"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:447
+#: src/gamemodifiers.cpp:448
 msgid "(F) free camera mode"
 msgstr "(F) フリーカメラモード"
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:94
+#: src/gui/dialogsmanager.cpp:93
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -1201,8 +1201,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2341
-#: src/gui/popups/popupmenu.cpp:2419 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2453 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(デフォルト)"
 
@@ -1453,7 +1453,7 @@ msgstr "コメント: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:501
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:500
 msgid "Create Party"
 msgstr "パーティを作る"
 
@@ -1476,36 +1476,36 @@ msgstr "パーティを作る"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:345
-#: src/gui/popups/popupmenu.cpp:393 src/gui/popups/popupmenu.cpp:489
-#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:571
-#: src/gui/popups/popupmenu.cpp:602 src/gui/popups/popupmenu.cpp:627
-#: src/gui/popups/popupmenu.cpp:652 src/gui/popups/popupmenu.cpp:834
-#: src/gui/popups/popupmenu.cpp:861 src/gui/popups/popupmenu.cpp:894
-#: src/gui/popups/popupmenu.cpp:2083 src/gui/popups/popupmenu.cpp:2119
-#: src/gui/popups/popupmenu.cpp:2169 src/gui/popups/popupmenu.cpp:2211
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2320
-#: src/gui/popups/popupmenu.cpp:2398 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2458 src/gui/popups/popupmenu.cpp:2479
-#: src/gui/popups/popupmenu.cpp:2500 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2852
-#: src/gui/popups/popupmenu.cpp:2978 src/gui/windows/buyselldialog.cpp:76
-#: src/gui/windows/changeemaildialog.cpp:59
-#: src/gui/windows/changepassworddialog.cpp:61
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:554 src/gui/popups/popupmenu.cpp:589
+#: src/gui/popups/popupmenu.cpp:620 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:670 src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:879 src/gui/popups/popupmenu.cpp:912
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2153
+#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2245
+#: src/gui/popups/popupmenu.cpp:2286 src/gui/popups/popupmenu.cpp:2354
+#: src/gui/popups/popupmenu.cpp:2432 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2492 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:3012 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:58
+#: src/gui/windows/changepassworddialog.cpp:60
 #: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:63
-#: src/gui/windows/itemamountwindow.cpp:161
-#: src/gui/windows/npcpostdialog.cpp:73 src/gui/windows/quitdialog.cpp:73
-#: src/gui/windows/registerdialog.cpp:68 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/npcpostdialog.cpp:72 src/gui/windows/quitdialog.cpp:72
+#: src/gui/windows/registerdialog.cpp:67 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
-#: src/gui/windows/unregisterdialog.cpp:58
+#: src/gui/windows/unregisterdialog.cpp:57
 #: src/gui/windows/updaterwindow.cpp:193 src/input/pages/gui.cpp:105
 msgid "Cancel"
 msgstr "キャンセル"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:203
 #, c-format
 msgid "Weight: %s"
 msgstr "重力: %s"
@@ -1513,7 +1513,7 @@ msgstr "重力: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:764
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "トレード"
@@ -1529,42 +1529,42 @@ msgstr "トレード"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:749 src/gui/widgets/skillinfo.cpp:112
+#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack"
 msgstr "攻撃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:414
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:432
 msgid "Whisper"
 msgstr "ささやく"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:753
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:771
 msgid "Heal"
 msgstr "HP回復"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
 #: src/gui/popups/popupmenu.cpp:196 src/gui/popups/popupmenu.cpp:212
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:779
+#: src/gui/popups/popupmenu.cpp:478 src/gui/popups/popupmenu.cpp:797
 msgid "Kick from guild"
 msgstr "ギルドから一時的に追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
 #: src/gui/popups/popupmenu.cpp:203 src/gui/popups/popupmenu.cpp:219
-#: src/gui/popups/popupmenu.cpp:467 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:485 src/gui/popups/popupmenu.cpp:804
 msgid "Change pos in guild"
 msgstr "ギルドでの役割を変更"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:477
-#: src/gui/popups/popupmenu.cpp:797
+#: src/gui/popups/popupmenu.cpp:229 src/gui/popups/popupmenu.cpp:495
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Invite to guild"
 msgstr "ギルドへ招待"
 
@@ -1589,8 +1589,8 @@ msgstr "消す"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:239 src/gui/popups/popupmenu.cpp:261
-#: src/gui/popups/popupmenu.cpp:444 src/gui/popups/popupmenu.cpp:595
-#: src/gui/popups/popupmenu.cpp:760 src/gui/popups/popupmenu.cpp:820
+#: src/gui/popups/popupmenu.cpp:462 src/gui/popups/popupmenu.cpp:613
+#: src/gui/popups/popupmenu.cpp:778 src/gui/popups/popupmenu.cpp:838
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "動く"
@@ -1610,9 +1610,9 @@ msgstr "話す"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2711
-#: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2745
+#: src/gui/windows/buydialog.cpp:183 src/gui/windows/buydialog.cpp:199
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buyselldialog.cpp:71
 msgid "Buy"
 msgstr "買う"
 
@@ -1623,9 +1623,9 @@ msgstr "買う"
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/widgets/selldialog.cpp:60 src/gui/widgets/selldialog.cpp:105
-#: src/gui/windows/buyselldialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:257 src/gui/popups/popupmenu.cpp:2748
+#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
+#: src/gui/windows/buyselldialog.cpp:73
 msgid "Sell"
 msgstr "売る"
 
@@ -1633,8 +1633,8 @@ msgstr "売る"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:424
-#: src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:264 src/gui/popups/popupmenu.cpp:442
+#: src/gui/popups/popupmenu.cpp:2848
 msgid "Add comment"
 msgstr "コメントをする"
 
@@ -1660,35 +1660,49 @@ msgstr "攻撃リストへ追加する"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2834
+#: src/gui/popups/popupmenu.cpp:300 src/gui/popups/popupmenu.cpp:2868
 msgid "Add to ignore list"
 msgstr "攻撃無視リストへ追加する"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: Mercenary move to master
+#: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
+#, fuzzy
+msgid "Move to master"
+msgstr "ターゲットまで移動"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:309
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Fire"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed homunculus
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:323 src/gui/popups/popupmenu.cpp:334
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: delete homunculus
+#: src/gui/popups/popupmenu.cpp:327
+msgid "Kill"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:319
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:337
 msgid "Drop loot"
-msgstr "全て落とす"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:322 src/gui/windows/equipmentwindow.cpp:70
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
 #: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1700,53 +1714,52 @@ msgstr "取外す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:326
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:344
 msgid "Return to egg"
-msgstr "改行キーでチャット入力ができます."
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:340 src/gui/popups/popupmenu.cpp:485
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:503
 msgid "Add name to chat"
 msgstr "名前をチャットへ追加する"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:370 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:388 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "プレイヤー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:436 src/gui/popups/popupmenu.cpp:2759
-#: src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:454 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2817
 msgid "Kick from party"
 msgstr "パーティから一時的に追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:545
 msgid "Pick up"
 msgstr "拾う"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:532 src/gui/popups/popupmenu.cpp:2079
-#: src/gui/popups/popupmenu.cpp:2155 src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:550 src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/popups/popupmenu.cpp:2231
 msgid "Add to chat"
 msgstr "チャットに追加"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:553 src/gui/popups/popupmenu.cpp:585
+#: src/gui/popups/popupmenu.cpp:571 src/gui/popups/popupmenu.cpp:603
 msgid "Map Item"
 msgstr "マップアイテム"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:574
 msgid "Rename"
 msgstr "名前を変更する"
 
@@ -1756,20 +1769,20 @@ msgstr "名前を変更する"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2462
 msgid "Remove"
 msgstr "削除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:591
+#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:609
 msgid "Warp"
 msgstr "ワープ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:616
 msgid "Move camera"
 msgstr "カメラを動かす"
 
@@ -1778,77 +1791,77 @@ msgstr "カメラを動かす"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:634 src/gui/setupinputpages.cpp:53
+#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "服装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:637
 msgid "Clear outfit"
 msgstr "服装を削除する"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:645 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:663 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "呪文"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:666
 msgid "Edit spell"
 msgstr "呪文を編集する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:678 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:696 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr "クリア"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:685
+#: src/gui/popups/popupmenu.cpp:703
 msgid "Disable highlight"
 msgstr "強調表示を無効"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:709
 msgid "Enable highlight"
 msgstr "強調表示を有効"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:697
+#: src/gui/popups/popupmenu.cpp:715
 msgid "Don't remove name"
 msgstr "名前を消さない"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:721
 msgid "Remove name"
 msgstr "名前を削除する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:709
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Enable away"
 msgstr "AFKを有効にする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:715
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Disable away"
 msgstr "AFKを無効にする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:722 src/gui/windows/socialwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:740 src/gui/windows/socialwindow.cpp:90
 msgid "Leave"
 msgstr "退会"
 
@@ -1858,79 +1871,79 @@ msgstr "退会"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:727 src/gui/popups/popupmenu.cpp:2496
-#: src/gui/popups/popupmenu.cpp:2538
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2530
+#: src/gui/popups/popupmenu.cpp:2572
 msgid "Copy to clipboard"
 msgstr "クリップボードにコピー"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:843
+#: src/gui/popups/popupmenu.cpp:861
 msgid "Change guild position"
 msgstr "ギルドポジションを変更"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:906
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:914
+#: src/gui/popups/popupmenu.cpp:932
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:920
+#: src/gui/popups/popupmenu.cpp:938
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1415
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Rename map sign          "
 msgstr "マップサインの名前を変更 "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1417
+#: src/gui/popups/popupmenu.cpp:1435
 msgid "Name:                    "
 msgstr "名前:                    "
 
-#: src/gui/popups/popupmenu.cpp:1441
+#: src/gui/popups/popupmenu.cpp:1459
 msgid "Player comment            "
 msgstr "プレイヤーコメント        "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1443
+#: src/gui/popups/popupmenu.cpp:1461
 msgid "Comment:                      "
 msgstr "コメント:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:2030
 msgid "Add to trade"
 msgstr "トレードウィンドウに追加"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2037
 msgid "Add to trade 10"
 msgstr "トレードウィンドウに10追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:2007
+#: src/gui/popups/popupmenu.cpp:2041
 msgid "Add to trade half"
 msgstr "トレードウィンドウに半分追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:2010
+#: src/gui/popups/popupmenu.cpp:2044
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2047
 msgid "Add to trade all"
 msgstr "トレードウィンドウに全て追加する"
 
@@ -1939,64 +1952,64 @@ msgstr "トレードウィンドウに全て追加する"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2151
-#: src/gui/popups/popupmenu.cpp:2192 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2226 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:718 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "保管"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2062
 msgid "Store 10"
 msgstr "10 保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:2032
+#: src/gui/popups/popupmenu.cpp:2066
 msgid "Store half"
 msgstr "半分保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:2069
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2038
+#: src/gui/popups/popupmenu.cpp:2072
 msgid "Store all"
 msgstr "全部保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2084 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2057
+#: src/gui/popups/popupmenu.cpp:2091
 msgid "Retrieve 10"
 msgstr "10 取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2061
+#: src/gui/popups/popupmenu.cpp:2095
 msgid "Retrieve half"
 msgstr "半分取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2064
+#: src/gui/popups/popupmenu.cpp:2098
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2067
+#: src/gui/popups/popupmenu.cpp:2101
 msgid "Retrieve all"
 msgstr "全部取出す"
 
@@ -2006,51 +2019,51 @@ msgstr "全部取出す"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2113 src/gui/popups/popupmenu.cpp:2902
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:81
-#: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:447 src/gui/windows/skilldialog.cpp:528
+#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2936
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:631 src/gui/windows/skilldialog.cpp:80
+#: src/gui/windows/skilldialog.cpp:152 src/gui/windows/skilldialog.cpp:322
+#: src/gui/windows/skilldialog.cpp:449 src/gui/windows/skilldialog.cpp:531
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2207
+#: src/gui/popups/popupmenu.cpp:2241
 msgid "Clear drop window"
 msgstr "ドロップ窓を消す"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2238 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2272 src/gui/popups/popupmenu.cpp:2333
 msgid "Hide"
 msgstr " 非表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2340
 msgid "Show"
 msgstr "表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2347
 msgid "Reset yellow bar"
 msgstr "黄色バーをリセットする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2317 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2351 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr "チャットへコピーする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2357 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2391 src/gui/popups/popupmenu.cpp:2410
 msgid "Move up"
 msgstr "上へ移動"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2363 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2416
 msgid "Move down"
 msgstr "下へ移動"
 
@@ -2058,155 +2071,155 @@ msgstr "下へ移動"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2845
 msgid "Undress"
 msgstr "脱ぐ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2472
+#: src/gui/popups/popupmenu.cpp:2506
 msgid "Copy"
 msgstr "コピー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Paste"
 msgstr "ペースト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2493
+#: src/gui/popups/popupmenu.cpp:2527
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2545
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2659 src/gui/popups/popupmenu.cpp:2677
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2711
 msgid "Disregard"
 msgstr "無視する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2623
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2621 src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2696 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "無視"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2590 src/gui/popups/popupmenu.cpp:2665
+#: src/gui/popups/popupmenu.cpp:2624 src/gui/popups/popupmenu.cpp:2699
 msgid "Black list"
 msgstr "ブラックリスト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2627 src/gui/popups/popupmenu.cpp:2660
 msgid "Set as enemy"
 msgstr "敵に設定する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2596 src/gui/popups/popupmenu.cpp:2629
-#: src/gui/popups/popupmenu.cpp:2641 src/gui/popups/popupmenu.cpp:2650
-#: src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2630 src/gui/popups/popupmenu.cpp:2663
+#: src/gui/popups/popupmenu.cpp:2675 src/gui/popups/popupmenu.cpp:2684
+#: src/gui/popups/popupmenu.cpp:2702
 msgid "Erase"
 msgstr "消す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2606
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Be friend"
 msgstr "友達になる"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2635
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/popups/popupmenu.cpp:2656
-#: src/gui/popups/popupmenu.cpp:2674
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/popups/popupmenu.cpp:2669
+#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2690
+#: src/gui/popups/popupmenu.cpp:2708
 msgid "Unignore"
 msgstr "完全無視解除"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2727
 msgid "Follow"
 msgstr "フォロー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2731
 msgid "Imitation"
 msgstr "真似"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2721 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2755 src/gui/popups/popupmenu.cpp:2770
 msgid "Buy (?)"
 msgstr "買う (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2724 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2758 src/gui/popups/popupmenu.cpp:2773
 msgid "Sell (?)"
 msgstr "売る (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2753 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2787 src/gui/popups/popupmenu.cpp:2811
 msgid "Invite to party"
 msgstr "パーティへ招待"
 
-#: src/gui/popups/popupmenu.cpp:2800
+#: src/gui/popups/popupmenu.cpp:2834
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2808
+#: src/gui/popups/popupmenu.cpp:2842
 msgid "Show Items"
 msgstr "アイテムを表示する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2825
+#: src/gui/popups/popupmenu.cpp:2859
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2830
+#: src/gui/popups/popupmenu.cpp:2864
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2913
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2922
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2917 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:727
+#: src/gui/popups/popupmenu.cpp:2951 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:726
 msgid "Drop..."
 msgstr "落とす..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2920
+#: src/gui/popups/popupmenu.cpp:2954
 msgid "Drop all"
 msgstr "全て落とす"
 
@@ -2214,57 +2227,57 @@ msgstr "全て落とす"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2926 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:732
+#: src/gui/popups/popupmenu.cpp:2960 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
 msgid "Drop"
 msgstr "落とす"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2934 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2968 src/gui/windows/inventorywindow.cpp:190
 msgid "Split"
 msgstr "分割"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2944
+#: src/gui/popups/popupmenu.cpp:2978
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2952
+#: src/gui/popups/popupmenu.cpp:2986
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2957
+#: src/gui/popups/popupmenu.cpp:2991
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2960
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2963
+#: src/gui/popups/popupmenu.cpp:2997
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2966 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2971
+#: src/gui/popups/popupmenu.cpp:3005
 msgid "Kick"
 msgstr "追い出す"
 
@@ -2299,7 +2312,7 @@ msgstr "スマイリー"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:90
+#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:89
 msgid "Chat"
 msgstr "チャット"
 
@@ -2313,7 +2326,7 @@ msgstr "チャット"
 #: src/gui/widgets/tabs/setup_other.cpp:341
 #: src/gui/widgets/tabs/setup_visual.cpp:192
 #: src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/registerdialog.cpp:107 src/input/pages/gui.cpp:87
+#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
 msgid "Other"
 msgstr "その他"
 
@@ -2536,8 +2549,8 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:557 src/gui/windows/statuswindow.cpp:75
-#: src/gui/windows/statuswindow.cpp:236 src/gui/windows/statuswindow.cpp:343
+#: src/gui/windows/inventorywindow.cpp:556 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
 msgstr "GP: %s"
@@ -2558,9 +2571,9 @@ msgstr "URLを開く"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:263
-#: src/gui/windows/quitdialog.cpp:55 src/gui/windows/quitdialog.cpp:60
-#: src/gui/windows/quitdialog.cpp:62 src/gui/windows/serverdialog.cpp:119
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:262
+#: src/gui/windows/quitdialog.cpp:54 src/gui/windows/quitdialog.cpp:59
+#: src/gui/windows/quitdialog.cpp:61 src/gui/windows/serverdialog.cpp:117
 #: src/input/pages/basic.cpp:216
 msgid "Quit"
 msgstr "終了"
@@ -2571,10 +2584,10 @@ msgstr "終了"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:125 src/gui/windows/buydialog.cpp:255
-#: src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/npcdialog.cpp:106
-#: src/gui/windows/statuswindow.cpp:747
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:254
+#: src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:105
+#: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
 
@@ -2584,10 +2597,10 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:127 src/gui/windows/buydialog.cpp:258
-#: src/gui/windows/itemamountwindow.cpp:155
-#: src/gui/windows/itemamountwindow.cpp:189 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:760
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:154
+#: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/statuswindow.cpp:759
 msgid "-"
 msgstr "-"
 
@@ -2596,16 +2609,16 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:265
-#: src/gui/windows/statuswindow.cpp:490 src/gui/windows/statuswindow.cpp:545
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:776
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:264
+#: src/gui/windows/statuswindow.cpp:489 src/gui/windows/statuswindow.cpp:544
+#: src/gui/windows/statuswindow.cpp:743 src/gui/windows/statuswindow.cpp:775
 msgid "Max"
 msgstr "最大"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:136 src/gui/widgets/selldialog.cpp:320
-#: src/gui/windows/buydialog.cpp:241 src/gui/windows/buydialog.cpp:526
+#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:311
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buydialog.cpp:525
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "価格:%s /合計:%s"
@@ -2613,64 +2626,64 @@ msgstr "価格:%s /合計:%s"
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
 #: src/gui/widgets/setupitem.cpp:366 src/gui/widgets/setupitem.cpp:502
-#: src/gui/windows/serverdialog.cpp:125
+#: src/gui/windows/serverdialog.cpp:123
 msgid "Edit"
 msgstr "編集"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:98 src/gui/windows/skilldialog.cpp:443
+#: src/gui/widgets/skillinfo.cpp:99 src/gui/windows/skilldialog.cpp:445
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #. TRANSLATORS: skill type
-#: src/gui/widgets/skillinfo.cpp:102
+#: src/gui/widgets/skillinfo.cpp:103
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:107
+#: src/gui/widgets/skillinfo.cpp:108
 msgid "Unknown"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:117
+#: src/gui/widgets/skillinfo.cpp:118
 msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:122
+#: src/gui/widgets/skillinfo.cpp:123
 msgid "Self"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:127
+#: src/gui/widgets/skillinfo.cpp:128
 msgid "Unused"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:132
+#: src/gui/widgets/skillinfo.cpp:133
 msgid "Support"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:137
+#: src/gui/widgets/skillinfo.cpp:138
 msgid "Target trap"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:141
+#: src/gui/widgets/skillinfo.cpp:142
 msgid "Unknown:"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:147
+#: src/gui/widgets/skillinfo.cpp:148
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
-#: src/gui/widgets/skillinfo.cpp:153
+#: src/gui/widgets/skillinfo.cpp:154
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -2681,30 +2694,30 @@ msgid "Battle"
 msgstr "バトル"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:165
+#: src/gui/widgets/tabs/chattab.cpp:164
 msgid "Global announcement:"
 msgstr "グローバルアナウンス:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:171
+#: src/gui/widgets/tabs/chattab.cpp:170
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%sからのアナウンス:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:197
+#: src/gui/widgets/tabs/chattab.cpp:196
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s ささやく: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:558
+#: src/gui/widgets/tabs/chattab.cpp:557
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:563
+#: src/gui/widgets/tabs/chattab.cpp:562
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -2949,7 +2962,7 @@ msgstr ""
 #. TRANSLATORS: guild chat tab name
 #: src/gui/widgets/tabs/guildchattab.cpp:39
 #: src/gui/widgets/tabs/socialguildtab2.h:48
-#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:46
+#: src/gui/widgets/tabs/socialguildtab.h:50 src/net/ea/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "ギルド"
 
@@ -3725,8 +3738,8 @@ msgstr ""
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
-#: src/gui/windows/buyselldialog.cpp:41 src/gui/windows/buyselldialog.cpp:52
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "店"
 
@@ -3743,8 +3756,8 @@ msgstr "ショップモードを有効にする"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
-#: src/gui/windows/npcpostdialog.cpp:46
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:85
+#: src/gui/windows/npcpostdialog.cpp:45
 msgid "NPC"
 msgstr "NPC"
 
@@ -4126,9 +4139,9 @@ msgstr "全てのささやきを受け取る"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:83
-#: src/gui/windows/serverdialog.cpp:127 src/gui/windows/shopwindow.cpp:102
-#: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
+#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
 msgstr "削除"
@@ -4656,7 +4669,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
 msgid "Party"
 msgstr "パーティー"
 
@@ -4783,7 +4796,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "装着品"
 
@@ -4794,7 +4807,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:132
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "インベントリー"
@@ -4810,7 +4823,7 @@ msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:72
 msgid "Skills"
 msgstr "スキル"
 
@@ -4821,7 +4834,7 @@ msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:64
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:63
 msgid "Social"
 msgstr "ソーシャル"
 
@@ -4900,7 +4913,7 @@ msgstr "ボットチェッカー"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:116
 msgid "Reset"
 msgstr "リセット"
 
@@ -4910,67 +4923,67 @@ msgid "Result"
 msgstr "結果"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:168
+#: src/gui/windows/buydialog.cpp:167
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:250
+#: src/gui/windows/buydialog.cpp:249
 msgid "Amount:"
 msgstr "量:"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:579
-#: src/gui/windows/socialwindow.cpp:87
+#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/socialwindow.cpp:86
 msgid "Create"
 msgstr "作成"
 
 #. TRANSLATORS: change email dialog header
 #. TRANSLATORS: button in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:51
-#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changeemaildialog.cpp:50
+#: src/gui/windows/changeemaildialog.cpp:55
 msgid "Change Email Address"
 msgstr "メールアドレスの変更"
 
 #. TRANSLATORS: label in change email dialog
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changeemaildialog.cpp:64
-#: src/gui/windows/changepassworddialog.cpp:67
+#: src/gui/windows/changeemaildialog.cpp:63
+#: src/gui/windows/changepassworddialog.cpp:66
 #, c-format
 msgid "Account: %s"
 msgstr "アカウント: %s"
 
 #. TRANSLATORS: label in change email dialog
-#: src/gui/windows/changeemaildialog.cpp:68
+#: src/gui/windows/changeemaildialog.cpp:67
 msgid "Type new email address twice:"
 msgstr "新しいメールアドレスを二回入力してください:"
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:140
+#: src/gui/windows/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:148
+#: src/gui/windows/changeemaildialog.cpp:147
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change email error
-#: src/gui/windows/changeemaildialog.cpp:156
+#: src/gui/windows/changeemaildialog.cpp:155
 msgid "The email address entries mismatch."
 msgstr "メールアドレスが一致しません."
 
 #. TRANSLATORS: change password window name
 #. TRANSLATORS: change password dialog button
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/changepassworddialog.cpp:52
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:51
+#: src/gui/windows/changepassworddialog.cpp:57
+#: src/gui/windows/charselectdialog.cpp:73
 msgid "Change Password"
 msgstr "パスワードの変更"
 
@@ -4978,36 +4991,36 @@ msgstr "パスワードの変更"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/changepassworddialog.cpp:71
-#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:82
-#: src/gui/windows/unregisterdialog.cpp:69
+#: src/gui/windows/changepassworddialog.cpp:70
+#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:81
+#: src/gui/windows/unregisterdialog.cpp:68
 msgid "Password:"
 msgstr "パスワード:"
 
 #. TRANSLATORS: change password dialog label
-#: src/gui/windows/changepassworddialog.cpp:74
+#: src/gui/windows/changepassworddialog.cpp:73
 msgid "Type new password twice:"
 msgstr "新しいパスワードを二回入力してください:"
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:121
+#: src/gui/windows/changepassworddialog.cpp:120
 msgid "Enter the old password first."
 msgstr "元のパスワードを入力してください."
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:128
+#: src/gui/windows/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:136
+#: src/gui/windows/changepassworddialog.cpp:135
 #, c-format
 msgid "The new password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: change password error
-#: src/gui/windows/changepassworddialog.cpp:144
+#: src/gui/windows/changepassworddialog.cpp:143
 msgid "The new password entries mismatch."
 msgstr "新しいパスワードが一致しません."
 
@@ -5021,8 +5034,8 @@ msgstr "新しいキャラクター"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:83
-#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:107
-#: src/gui/windows/registerdialog.cpp:80
+#: src/gui/windows/editserverdialog.cpp:76 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:79
 msgid "Name:"
 msgstr "名前:"
 
@@ -5069,14 +5082,14 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/registerdialog.cpp:101
+#: src/gui/windows/registerdialog.cpp:100
 msgid "Male"
 msgstr "男性"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/registerdialog.cpp:103
+#: src/gui/windows/registerdialog.cpp:102
 msgid "Female"
 msgstr "女性"
 
@@ -5124,57 +5137,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "このキャラクターを削除しますか?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:65
+#: src/gui/windows/charselectdialog.cpp:64
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:72
+#: src/gui/windows/charselectdialog.cpp:71
 msgid "Switch Login"
 msgstr "別アカウントでログイン"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:79
-#: src/gui/windows/charselectdialog.cpp:574
+#: src/gui/windows/charselectdialog.cpp:78
+#: src/gui/windows/charselectdialog.cpp:573
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "プレイ"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:81
-#: src/net/ea/charserverhandler.cpp:164
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Info"
 msgstr "情報"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/unregisterdialog.cpp:51
-#: src/gui/windows/unregisterdialog.cpp:56
+#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/unregisterdialog.cpp:50
+#: src/gui/windows/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "登録解除"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:118
 msgid "Change Email"
 msgstr "メールアドレス変更"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:157
+#: src/gui/windows/charselectdialog.cpp:156
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:185
+#: src/gui/windows/charselectdialog.cpp:184
 msgid "Please set new pincode"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:238
+#: src/gui/windows/charselectdialog.cpp:237
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5184,33 +5197,33 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:290
+#: src/gui/windows/charselectdialog.cpp:289
 msgid "Incorrect password"
 msgstr "パスワードが違います"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password for deleting character"
 msgstr "キャラクターを削除するにはパスワードを入力して下さい"
 
-#: src/gui/windows/charselectdialog.cpp:430
+#: src/gui/windows/charselectdialog.cpp:429
 msgid "Enter password:"
 msgstr "パスワードを入力して下さい:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:637
+#: src/gui/windows/chatwindow.cpp:636
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "現在: %s; %d プレイヤーがいます."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1080
+#: src/gui/windows/chatwindow.cpp:1079
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%sにささやき中:%s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1525 src/net/eathena/pethandler.cpp:168
+#: src/gui/windows/chatwindow.cpp:1524 src/net/eathena/pethandler.cpp:167
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5258,7 +5271,7 @@ msgstr "サーバー編集"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/serverdialog.cpp:119
 msgid "Connect"
 msgstr "接続"
 
@@ -5298,14 +5311,14 @@ msgid "Please at least type both the address and the port of the server."
 msgstr "サーバーアドレスとポートを入力して下さい."
 
 #. TRANSLATORS: egg selection dialog name
-#: src/gui/windows/eggselectiondialog.cpp:55
-#: src/gui/windows/eggselectiondialog.cpp:57
+#: src/gui/windows/eggselectiondialog.cpp:42
+#: src/gui/windows/eggselectiondialog.cpp:44
 msgid "Select egg"
 msgstr ""
 
 #. TRANSLATORS: egg selection dialog button
 #. TRANSLATORS: input action name
-#: src/gui/windows/eggselectiondialog.cpp:64 src/input/pages/gui.cpp:93
+#: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:93
 msgid "Select"
 msgstr "選択"
 
@@ -5327,7 +5340,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:172 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:171 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
 #: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
 #: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5339,47 +5352,47 @@ msgid "Equip"
 msgstr "装着"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
 msgstr "全て"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:219
+#: src/gui/windows/itemamountwindow.cpp:218
 msgid "Select amount of items to trade."
 msgstr "トレードするアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:223
+#: src/gui/windows/itemamountwindow.cpp:222
 msgid "Select amount of items to drop."
 msgstr "落とすアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:227
+#: src/gui/windows/itemamountwindow.cpp:226
 msgid "Select amount of items to store."
 msgstr "保管するアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:231
+#: src/gui/windows/itemamountwindow.cpp:230
 msgid "Select amount of items to retrieve."
 msgstr "取出すアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:235
+#: src/gui/windows/itemamountwindow.cpp:234
 msgid "Select amount of items to split."
 msgstr "分割するアイテムの量を選択してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:238
 msgid "Add to buy shop."
 msgstr "購入リストに追加."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:242
 msgid "Add to sell shop."
 msgstr "販売リストに追加."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:246
 msgid "Unknown."
 msgstr "不明."
 
@@ -5490,137 +5503,137 @@ msgstr "JackOが出現中"
 
 #. TRANSLATORS: login dialog name
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:67 src/gui/windows/logindialog.cpp:84
+#: src/gui/windows/logindialog.cpp:66 src/gui/windows/logindialog.cpp:83
 msgid "Login"
 msgstr "ログイン"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:74
+#: src/gui/windows/logindialog.cpp:73
 msgid "Remember username"
 msgstr "ユーザー名を記憶する"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:77
+#: src/gui/windows/logindialog.cpp:76
 msgid "Update:"
 msgstr "アップデート:"
 
 #. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:82
+#: src/gui/windows/logindialog.cpp:81
 msgid "Change Server"
 msgstr "サーバー変更"
 
 #. TRANSLATORS: login dialog button
 #. TRANSLATORS: register dialog name
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/logindialog.cpp:86 src/gui/windows/registerdialog.cpp:57
-#: src/gui/windows/registerdialog.cpp:66
+#: src/gui/windows/logindialog.cpp:85 src/gui/windows/registerdialog.cpp:56
+#: src/gui/windows/registerdialog.cpp:65
 msgid "Register"
 msgstr "登録"
 
 #. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:87
 msgid "Custom update host"
 msgstr "カスタムアップデートホスト"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:103
+#: src/gui/windows/logindialog.cpp:102
 msgid "Server:"
 msgstr "サーバー:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:113
+#: src/gui/windows/logindialog.cpp:112
 #, c-format
 msgid "Update host: %s"
 msgstr "アップデートホスト: %s"
 
-#: src/gui/windows/logindialog.cpp:232
+#: src/gui/windows/logindialog.cpp:231
 msgid "Open register url"
 msgstr ""
 
-#: src/gui/windows/ministatuswindow.cpp:72
+#: src/gui/windows/ministatuswindow.cpp:71
 msgid "health bar"
 msgstr "健康"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:83
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "マナ"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:87
+#: src/gui/windows/ministatuswindow.cpp:86
 msgid "experience bar"
 msgstr "Expバー"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:91
 msgid "weight bar"
 msgstr "重量"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:97
 msgid "inventory slots bar"
 msgstr "インベントリースロットバー"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:102
+#: src/gui/windows/ministatuswindow.cpp:101
 msgid "money bar"
 msgstr "金銭"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:106
+#: src/gui/windows/ministatuswindow.cpp:105
 msgid "arrows bar"
 msgstr "矢"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:111
+#: src/gui/windows/ministatuswindow.cpp:110
 msgid "status bar"
 msgstr "情勢"
 
-#: src/gui/windows/ministatuswindow.cpp:135
+#: src/gui/windows/ministatuswindow.cpp:134
 msgid "job bar"
 msgstr "職"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:342
-#: src/gui/windows/statuswindow.cpp:247
+#: src/gui/windows/ministatuswindow.cpp:341
+#: src/gui/windows/statuswindow.cpp:246
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "レベル: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:349
-#: src/gui/windows/statuswindow.cpp:73 src/gui/windows/statuswindow.cpp:254
-#: src/gui/windows/statuswindow.cpp:379
+#: src/gui/windows/ministatuswindow.cpp:348
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:253
+#: src/gui/windows/statuswindow.cpp:378
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:365
-#: src/gui/windows/ministatuswindow.cpp:403
+#: src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/windows/ministatuswindow.cpp:402
 msgid "Need"
 msgstr "必要"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:389
+#: src/gui/windows/ministatuswindow.cpp:388
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/npcdialog.cpp:70
 msgid "Stop waiting"
 msgstr "キャンセル"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:72
 msgid "Next"
 msgstr "次"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:77
+#: src/gui/windows/npcdialog.cpp:76
 msgid "Submit"
 msgstr "決定"
 
@@ -5629,34 +5642,34 @@ msgstr "決定"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:115 src/gui/windows/serverdialog.cpp:123
-#: src/gui/windows/shopwindow.cpp:100 src/gui/windows/shopwindow.cpp:107
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
+#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/tradewindow.cpp:83
 msgid "Add"
 msgstr "追加"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:62
+#: src/gui/windows/npcpostdialog.cpp:61
 msgid "To:"
 msgstr "宛先:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68
 msgid "Send"
 msgstr "送信する"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:116
+#: src/gui/windows/npcpostdialog.cpp:115
 msgid "Failed to send as sender or letter invalid."
 msgstr "文字か差出人が無効の為送信に失敗しました."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/windows/npcselldialog.cpp:79
+#: src/gui/windows/npcselldialog.cpp:68
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/windows/npcselldialog.cpp:81
+#: src/gui/windows/npcselldialog.cpp:70
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -5678,106 +5691,106 @@ msgid "Away outfit"
 msgstr "AFK中の服装"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:65
+#: src/gui/windows/quitdialog.cpp:64
 msgid "Switch server"
 msgstr "サーバーを変更する"
 
 #. TRANSLATORS: quit dialog button
-#: src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/quitdialog.cpp:67
 msgid "Switch character"
 msgstr "キャラクターを変更する"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:84
+#: src/gui/windows/registerdialog.cpp:83
 msgid "Confirm:"
 msgstr "確認:"
 
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:124
+#: src/gui/windows/registerdialog.cpp:123
 msgid "Email:"
 msgstr "Eメール:"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:190
 #, c-format
 msgid "The username needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:199
 #, c-format
 msgid "The username needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:209
-#: src/gui/windows/unregisterdialog.cpp:130
+#: src/gui/windows/registerdialog.cpp:208
+#: src/gui/windows/unregisterdialog.cpp:129
 #, c-format
 msgid "The password needs to be at least %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
-#: src/gui/windows/registerdialog.cpp:218
-#: src/gui/windows/unregisterdialog.cpp:137
+#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/unregisterdialog.cpp:136
 #, c-format
 msgid "The password needs to be less than %u characters long."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:226
+#: src/gui/windows/registerdialog.cpp:225
 msgid "Passwords do not match."
 msgstr "パスワードが一致しません."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:110
+#: src/gui/windows/serverdialog.cpp:108
 msgid "Choose Your Server"
 msgstr "サーバーを選択してください"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:129
+#: src/gui/windows/serverdialog.cpp:127
 msgid "Load"
 msgstr "読込み"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:143
+#: src/gui/windows/serverdialog.cpp:141
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "サーバーを選んで下さい  *** セーフモード ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:152
+#: src/gui/windows/serverdialog.cpp:150
 msgid "Use same ip for game sub servers"
 msgstr "同じIPをゲームサブサーバーでも使用する"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:404
+#: src/gui/windows/serverdialog.cpp:402
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "サーバーリストをダウンロード中...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:410
+#: src/gui/windows/serverdialog.cpp:408
 msgid "Waiting for server..."
 msgstr "サーバーからの応答を待っています..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:415
+#: src/gui/windows/serverdialog.cpp:413
 msgid "Preparing download"
 msgstr "ダウンロード準備中"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:420
+#: src/gui/windows/serverdialog.cpp:418
 msgid "Error retreiving server list!"
 msgstr "サーバーリストの読み込みに失敗!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:510
+#: src/gui/windows/serverdialog.cpp:508
 msgid "requires a newer version"
 msgstr "アップデートが必要です"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:515
+#: src/gui/windows/serverdialog.cpp:513
 #, c-format
 msgid "requires v%s"
 msgstr "v%sが必要"
@@ -5793,228 +5806,233 @@ msgid "Reset Windows"
 msgstr "ウィンドウをリセットする"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:81
+#: src/gui/windows/shopwindow.cpp:80
 msgid "Personal Shop"
 msgstr "最大 (15)"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:96
+#: src/gui/windows/shopwindow.cpp:95
 msgid "Buy items"
 msgstr "購入"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:98
+#: src/gui/windows/shopwindow.cpp:97
 msgid "Sell items"
 msgstr "販売"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:111
+#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
 msgid "Announce"
 msgstr "アナウンス"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:115
+#: src/gui/windows/shopwindow.cpp:114
 msgid "Show links in announce"
 msgstr "アナウンスにリンクを表示する"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:177 src/gui/windows/shopwindow.cpp:180
+#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
 msgid "Auction"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:792 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "トレードをリクエスト"
 
-#: src/gui/windows/shopwindow.cpp:792
+#: src/gui/windows/shopwindow.cpp:791
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%sが%s %sを希望しています。承認しますか?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:83
+#: src/gui/windows/skilldialog.cpp:82
 msgid "Up"
 msgstr "上"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:193
+#: src/gui/windows/skilldialog.cpp:192
 #, c-format
 msgid "Skill points available: %d"
 msgstr "スキルポイント: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr "スキルセット %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:328
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr "スキル %d"
 
+#: src/gui/windows/skilldialog.cpp:450
+#, fuzzy, c-format
+msgid "Failed skill: %s"
+msgstr "ギルド城: %s"
+
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:78
+#: src/gui/windows/socialwindow.cpp:77
 msgid "P"
 msgstr "周囲"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:83
+#: src/gui/windows/socialwindow.cpp:82
 msgid "F"
 msgstr "友達"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:89
+#: src/gui/windows/socialwindow.cpp:88
 msgid "Invite"
 msgstr "招待"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:277
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "%sからのパーティ招待を承認しました."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:288
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "%sからのパーティ招待を拒否しました."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:305
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "%sからのギルド招待を承認しました."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "%sからのギルド招待を拒否しました."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:359
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr "ギルド %sを作成しました."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:380
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr "パーティ %sを作成しました."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr "ギルド名"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:397
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr "ギルド名を選んでください."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:413
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr "ギルド招待を承認したが既に入会しています."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:421
+#: src/gui/windows/socialwindow.cpp:420
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%sがギルド %sへ招待しています."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:428
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr "ギルド招待を受け入れる"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:443
 msgid "Received party request, but one already exists."
 msgstr "パーティ招待を承認したが既に入会しています."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:456
+#: src/gui/windows/socialwindow.cpp:455
 msgid "You have been invited you to join a party."
 msgstr "パーティに招待されました."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:461
+#: src/gui/windows/socialwindow.cpp:460
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "パーティ %sに招待されました."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:469
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%sはあなたをパーティに招待しました."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:475
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%sはあなたを%sというパーティに招待しました."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:486
+#: src/gui/windows/socialwindow.cpp:485
 msgid "Accept Party Invite"
 msgstr "パーティ招待を受け入れます"
 
-#: src/gui/windows/socialwindow.cpp:502
+#: src/gui/windows/socialwindow.cpp:501
 msgid "Cannot create party. You are already in a party"
 msgstr "パーティーを作成することはできません。もうパーティーに入っています"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:510
 msgid "Party Name"
 msgstr "パーティ名"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:513
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Choose your party's name."
 msgstr "パーティ名を選んでください."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:77
+#: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:80
+#: src/gui/windows/statuswindow.cpp:79
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:139
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:182 src/gui/windows/statuswindow.cpp:305
+#: src/gui/windows/statuswindow.cpp:181 src/gui/windows/statuswindow.cpp:304
 #, c-format
 msgid "Job: %d"
 msgstr "ジョブ: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:184
+#: src/gui/windows/statuswindow.cpp:183
 msgid "Job:"
 msgstr "ジョブポイント:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:351
+#: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:350
 #, c-format
 msgid "Character points: %d"
 msgstr "キャラクターポイント: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:366
+#: src/gui/windows/statuswindow.cpp:365
 #, c-format
 msgid "Correction points: %d"
 msgstr "修正点: %d"
@@ -6085,60 +6103,60 @@ msgid "Save"
 msgstr "セーブ"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Propose trade"
 msgstr "トレードを申請する"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:65
 msgid "Confirmed. Waiting..."
 msgstr "確認中..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Agree trade"
 msgstr "トレードを了承する"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:69
 msgid "Agreed. Waiting..."
 msgstr "了承しました..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:73
 msgid "Trade: You"
 msgstr "トレード: 自分"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:189
+#: src/gui/windows/tradewindow.cpp:81 src/gui/windows/tradewindow.cpp:188
 #, c-format
 msgid "You get %s"
 msgstr "%sを手に入れた"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:86
 msgid "Change"
 msgstr "変更"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:131
 msgid "You give:"
 msgstr "トレードするアイテム:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:397
+#: src/gui/windows/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "GP不足です."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:483
+#: src/gui/windows/tradewindow.cpp:482
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "アイテムの追加に失敗しました。アイテム一種類を一つのウインドウ上で重複して追"
 "加することは出来ません."
 
 #. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/unregisterdialog.cpp:66
+#: src/gui/windows/unregisterdialog.cpp:65
 #, c-format
 msgid "Name: %s"
 msgstr "名前: %s"
@@ -6178,42 +6196,42 @@ msgid "Completed"
 msgstr "完了"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:634
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "オンラインリスト - アップデート中"
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:103
+#: src/gui/windows/whoisonline.cpp:102
 msgid "Update"
 msgstr "アップデート"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:229
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "オンラインリスト - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:649
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "オンラインリスト - エラー"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:691
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "オンラインリスト - アップデート"
 
 #. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:49
+#: src/gui/windows/worldselectdialog.cpp:48
 msgid "Select World"
 msgstr "世界を選ぶ"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:54
 msgid "Change Login"
 msgstr "ログインの変更"
 
 #. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:57
+#: src/gui/windows/worldselectdialog.cpp:56
 msgid "Choose World"
 msgstr "世界の選択"
 
@@ -6327,9 +6345,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:138
-#, fuzzy
 msgid "Target pet"
-msgstr "ターゲットタイプ:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:144
@@ -6402,6 +6419,11 @@ msgid "Return to safe video mode"
 msgstr "セーフビデオモードへ戻る"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:234
+msgid "Fire your homunculus"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/chat.cpp:33
 msgid "Toggle Chat"
 msgstr "トグルチャット"
@@ -7331,80 +7353,80 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:91
+#: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "アクセスできません。サーバーが混みあっています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:96
+#: src/net/ea/charserverhandler.cpp:92
 msgid "Cannot use this ID."
 msgstr "このIDは使用できません."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:100
+#: src/net/ea/charserverhandler.cpp:96
 msgid "Unknown char-server failure."
 msgstr "不明なキャラクターサーバーエラー."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:116
+#: src/net/ea/charserverhandler.cpp:112
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "キャラクター作成に失敗しました。既に使われている名前もしくは無効な文字が含ま"
 "れています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:121 src/net/ea/loginhandler.cpp:279
-#: src/net/eathena/loginhandler.cpp:204
+#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:203
 msgid "Wrong name."
 msgstr "名前が違います."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:125
+#: src/net/ea/charserverhandler.cpp:121
 msgid "Incorrect stats."
 msgstr "間違った統計."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:125
 msgid "Incorrect hair."
 msgstr "間違った髪型."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Incorrect slot."
 msgstr "間違ったスロット."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverhandler.cpp:133
 msgid "Incorrect race."
 msgstr "種別が間違っています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:141
+#: src/net/ea/charserverhandler.cpp:137
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:164
+#: src/net/ea/charserverhandler.cpp:160
 msgid "Character deleted."
 msgstr "キャラクターを削除しました."
 
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:173
 msgid "Failed to delete character."
 msgstr "キャラクター削除に失敗しました."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:109
+#: src/net/ea/chathandler.cpp:108
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "%sがオフラインの為ささやきは送れませんでした."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:119
+#: src/net/ea/chathandler.cpp:118
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "%sが完全無視設定をしている為ささやきは送れませんでした."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:129
+#: src/net/ea/chathandler.cpp:128
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
@@ -7473,47 +7495,47 @@ msgstr "ギルド城: %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "アイテム共有モード有効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "アイテム共有モード無効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "アイテム共有モード不可能."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:122
+#: src/net/ea/gui/partytab.cpp:121
 msgid "Item sharing unknown."
 msgstr "アイテム共有モード不明."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Expシェアモード有効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Expシェアモード無効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Expシェアモード不可能."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:172
+#: src/net/ea/gui/partytab.cpp:171
 msgid "Experience sharing unknown."
 msgstr "Expシェアモード不明."
 
@@ -7534,43 +7556,43 @@ msgstr "新しいパスワードは文字数が足りません."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
-#: src/net/eathena/loginhandler.cpp:218
+#: src/net/eathena/loginhandler.cpp:217
 msgid "Unknown error."
 msgstr "不明なエラー."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:158
 msgid "Unregistered ID."
 msgstr "未登録なID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:162
 msgid "Wrong password."
 msgstr "入力したパスワードは間違っています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:168
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:167
 msgid "Account expired."
 msgstr "アカウントの有効期限が切れました."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:172
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:171
 msgid "Rejected from server."
 msgstr "サーバーから拒否されました."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:176
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:175
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "ゲームから永久追放されました。詳細はGMチームへ連絡して下さい."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:181
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:180
 msgid "Client too old."
 msgstr "アップデートが必要です."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:185
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:184
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7580,22 +7602,22 @@ msgstr ""
 "GMにご連絡下さい."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:194
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:193
 msgid "Server overpopulated."
 msgstr "サーバーが混雑しています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:199
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:198
 msgid "This user name is already taken."
 msgstr "ユーザ名は既に使用されています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:208
 msgid "Incorrect email."
 msgstr "メールアドレスが違います."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:213
 msgid "Username permanently erased."
 msgstr "ユーザーネームは永久に削除されました."
 
@@ -7631,265 +7653,225 @@ msgstr "インベントリーが体重の半分以上の為、体力は回復で
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "インベントリーが体重の半分以下になった為、体力は回復します."
 
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:130
-msgid "Trade failed!"
-msgstr "トレード失敗!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:134
-msgid "Emote failed!"
-msgstr "スマイリー表示失敗!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:138
-msgid "Sit failed!"
-msgstr "座れません!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:142
-msgid "Chat creating failed!"
-msgstr "チャット作成失敗!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:146
-msgid "Could not join party!"
-msgstr "パーティに参加できませんでした!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:150
-msgid "Cannot shout!"
-msgstr "叫べません!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:164
-msgid "You have not yet reached a high enough lvl!"
-msgstr "あなたはまだ十分なlvlに達していません!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:168
-msgid "Insufficient HP!"
-msgstr "HP不足!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:172
-msgid "Insufficient SP!"
-msgstr "SP不足!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:176
-msgid "You have no memos!"
-msgstr "メモがありません!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr "今この行動はできません!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:184
-msgid "Seems you need more money... ;-)"
-msgstr "GPが足りません... ;-)"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:188
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "このスキルはこの武器と一緒に使えません!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
-msgid "You need another red gem!"
-msgstr "Red Gemが必要です!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
-msgid "You need another blue gem!"
-msgstr "Blue Gemが必要です!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
-msgid "You're carrying to much to do this!"
-msgstr "アイテムを持ちすぎています!"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
-msgid "Huh? What's that?"
-msgstr "うん？何それ?"
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:217
-msgid "Warp failed..."
-msgstr "ワープに失敗しました..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:221
-msgid "Could not steal anything..."
-msgstr "何も盗めませんでした..."
-
-#. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:225
-msgid "Poison had no effect..."
-msgstr "毒の影響はなかった..."
-
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:120 src/net/tmwa/generalhandler.cpp:121
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:121 src/net/tmwa/generalhandler.cpp:123
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:122 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:148 src/net/tmwa/generalhandler.cpp:157
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
 msgid "Authentication failed."
 msgstr "認証に失敗しました."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
 msgid "No servers available."
 msgstr "利用できるサーバーがありません."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
 msgid "Someone else is trying to use this account."
 msgstr "他からのログインがありました."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:173
+#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
 msgid "This account is already logged in."
 msgstr "このアカウントは既にログイン中です."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:178
+#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
 msgid "Speed hack detected."
 msgstr "スピードハックが探知されました."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
 msgid "Duplicated login."
 msgstr "重複ログイン."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
 msgid "Unknown connection error."
 msgstr "不明な接続エラーです."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
 msgid "Got disconnected from server!"
 msgstr "サーバーから切断されました!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:302
+#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
 msgid "Strength"
 msgstr "攻撃力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
 msgid "Agility"
 msgstr "機敏さ"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
 msgid "Vitality"
 msgstr "防御力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
 msgid "Intelligence"
 msgstr "魔力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
 msgid "Dexterity"
 msgstr "命中率"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
 msgid "Luck"
 msgstr "幸運"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
 msgid "Defense"
 msgstr "Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:319
+#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
 msgid "M.Attack"
 msgstr "M.Attack"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
 msgid "M.Defense"
 msgstr "M.Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
 #, no-c-format
 msgid "% Critical"
 msgstr "% Critical"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:293 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
 msgid "Attack Delay"
 msgstr "攻撃遅延"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:334
+#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
 msgid "Walk Delay"
 msgstr " 徒歩遅延"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
 msgid "Attack Range"
 msgstr "攻撃距離"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
 msgid "Damage per sec."
 msgstr "ダメージ/秒."
 
+#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#, fuzzy, c-format
+msgid "Unknown skill error: %d"
+msgstr "不明なエラー."
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+msgid "You have not yet reached a high enough lvl!"
+msgstr "あなたはまだ十分なlvlに達していません!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+msgid "Insufficient HP!"
+msgstr "HP不足!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+msgid "Insufficient SP!"
+msgstr "SP不足!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+msgid "You have no memos!"
+msgstr "メモがありません!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+msgid "You cannot do that right now!"
+msgstr "今この行動はできません!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+msgid "Seems you need more money... ;-)"
+msgstr "GPが足りません... ;-)"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "このスキルはこの武器と一緒に使えません!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+msgid "You need another red gem!"
+msgstr "Red Gemが必要です!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+msgid "You need another blue gem!"
+msgstr "Blue Gemが必要です!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+msgid "You're carrying to much to do this!"
+msgstr "アイテムを持ちすぎています!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+msgid "Huh? What's that?"
+msgstr "うん？何それ?"
+
 #. TRANSLATORS: trade header
 #: src/net/ea/tradehandler.cpp:100
 #, c-format
@@ -7903,35 +7885,80 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%sはあなたにトレードを申請しています?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:350
+#: src/net/tmwa/charserverhandler.cpp:349
 msgid "Strength:"
 msgstr "攻撃力:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:352
+#: src/net/tmwa/charserverhandler.cpp:351
 msgid "Agility:"
 msgstr "機敏さ:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:354
+#: src/net/tmwa/charserverhandler.cpp:353
 msgid "Vitality:"
 msgstr "防御力:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:356
+#: src/net/tmwa/charserverhandler.cpp:355
 msgid "Intelligence:"
 msgstr "魔力:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:358
+#: src/net/tmwa/charserverhandler.cpp:357
 msgid "Dexterity:"
 msgstr "命中率:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:360
+#: src/net/tmwa/charserverhandler.cpp:359
 msgid "Luck:"
 msgstr "幸運:"
 
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:190
+msgid "Trade failed!"
+msgstr "トレード失敗!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:194
+msgid "Emote failed!"
+msgstr "スマイリー表示失敗!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:198
+msgid "Sit failed!"
+msgstr "座れません!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:202
+msgid "Chat creating failed!"
+msgstr "チャット作成失敗!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:206
+msgid "Could not join party!"
+msgstr "パーティに参加できませんでした!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:210
+msgid "Cannot shout!"
+msgstr "叫べません!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:277
+msgid "Warp failed..."
+msgstr "ワープに失敗しました..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:281
+msgid "Could not steal anything..."
+msgstr "何も盗めませんでした..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:285
+msgid "Poison had no effect..."
+msgstr "毒の影響はなかった..."
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7972,85 +7999,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:325 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "名前なし"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:211
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "不明なアイテム"
 
@@ -8446,6 +8473,17 @@ msgstr ""
 msgid "Mercenary unknown state."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:359
+msgid "Your feed your homunculus."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:363
+#, c-format
+msgid "You cant feed homunculus, because not have %s."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format