Update and rebuild translations.

Fix translation bug "Ok" -> "OK".

1 files changed, 401 insertions, 381 deletions

diff --git a/po/ja.po b/po/ja.po
index b4b7bb429..0fd12ff43 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-25 20:17+0300\n"
-"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"POT-Creation-Date: 2012-02-02 16:43+0300\n"
+"PO-Revision-Date: 2012-02-02 13:44+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
 "ja/)\n"
@@ -36,122 +36,122 @@ msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539
+#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:952 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:959 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "パフォーマンス"
 
-#: src/client.cpp:959 src/gui/setup_video.cpp:315
+#: src/client.cpp:964 src/gui/setup_video.cpp:317
 msgid "Video"
 msgstr "ビデオ"
 
-#: src/client.cpp:964
+#: src/client.cpp:969
 msgid "Themes"
 msgstr "テーマ"
 
-#: src/client.cpp:1046
+#: src/client.cpp:1051
 msgid "Connecting to server"
 msgstr "サーバーに接続しています"
 
-#: src/client.cpp:1077
+#: src/client.cpp:1082
 msgid "Logging in"
 msgstr "ログインしています"
 
-#: src/client.cpp:1110
+#: src/client.cpp:1115
 msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
-#: src/client.cpp:1211
+#: src/client.cpp:1216
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1251
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1261
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
-#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
+#: src/client.cpp:1304 src/client.cpp:1311 src/client.cpp:1445
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "エラー"
 
-#: src/client.cpp:1311
+#: src/client.cpp:1320
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
-#: src/client.cpp:1337
+#: src/client.cpp:1346
 msgid "Password Change"
 msgstr "パスワード変更"
 
-#: src/client.cpp:1338
+#: src/client.cpp:1347
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました"
 
-#: src/client.cpp:1357
+#: src/client.cpp:1366
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
-#: src/client.cpp:1358
+#: src/client.cpp:1367
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました"
 
-#: src/client.cpp:1378
+#: src/client.cpp:1387
 msgid "Unregister Successful"
 msgstr "登録を解除しました"
 
-#: src/client.cpp:1379
+#: src/client.cpp:1388
 msgid "Farewell, come back any time..."
 msgstr "さようなら　また会いましょう"
 
-#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
-#: src/client.cpp:2064 src/client.cpp:2071
+#: src/client.cpp:1593 src/client.cpp:1626 src/client.cpp:1641
+#: src/client.cpp:2073 src/client.cpp:2080
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%sは存在しない為、作成できません"
 
-#: src/client.cpp:1770
+#: src/client.cpp:1779
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "無効なアップデートホスト:%s"
 
-#: src/client.cpp:1804 src/client.cpp:1810
+#: src/client.cpp:1813 src/client.cpp:1819
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/client.cpp:1831
+#: src/client.cpp:1840
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー: %s は存在しない為、作成できません"
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Unknown command."
 msgstr "不明なコマンドです"
 
-#: src/commandhandler.cpp:332
+#: src/commandhandler.cpp:333
 msgid "Cannot send empty whispers!"
 msgstr "空のささやきを送信することはできません"
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,155 +160,155 @@ msgstr ""
 "%sへのささやきタブの作成に失敗しました。そのタブは既に開いている、もしくは自"
 "分宛てです"
 
-#: src/commandhandler.cpp:366
+#: src/commandhandler.cpp:367
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "%sチャンネルへの参加をリクエスト中"
 
-#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "パーティ名がありません"
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Guild name is missing."
 msgstr "ギルド名がありません"
 
-#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
-#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
+#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
+#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
 msgid "Please specify a name."
 msgstr "名前を入力してください"
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Return toggles chat."
 msgstr "改行キーでチャット入力ができます"
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Message closes chat."
 msgstr "チャットを閉じます"
 
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
 msgid "Return now toggles chat."
 msgstr "改行キーでチャット入力ができます"
 
-#: src/commandhandler.cpp:474
+#: src/commandhandler.cpp:475
 msgid "Message now closes chat."
 msgstr "チャットを閉じます"
 
-#: src/commandhandler.cpp:502
+#: src/commandhandler.cpp:503
 msgid "friend"
 msgstr "友達"
 
-#: src/commandhandler.cpp:507
+#: src/commandhandler.cpp:508
 msgid "disregarded"
 msgstr "無視"
 
-#: src/commandhandler.cpp:512
+#: src/commandhandler.cpp:513
 msgid "neutral"
 msgstr "中性"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:532
 #, c-format
 msgid "Player already %s!"
 msgstr "プレイヤーは既に%s"
 
-#: src/commandhandler.cpp:545
+#: src/commandhandler.cpp:546
 #, c-format
 msgid "Player successfully %s!"
 msgstr "プレイヤーの%sに成功しました"
 
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:554
 #, c-format
 msgid "Player could not be %s!"
 msgstr "プレイヤーを%sできなかった"
 
-#: src/commandhandler.cpp:576
+#: src/commandhandler.cpp:577
 msgid "Player wasn't ignored!"
-msgstr "プレイヤーを無視できませんでした"
+msgstr "プレイヤーを完全無視できませんでした"
 
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:584
 msgid "Player no longer ignored!"
-msgstr "プレイヤーを無視解除しました"
+msgstr "プレイヤーを完全無視解除しました"
 
-#: src/commandhandler.cpp:585
+#: src/commandhandler.cpp:586
 msgid "Player could not be unignored!"
-msgstr "プレイヤーを無視解除できませんでした"
+msgstr "プレイヤーを完全無視解除できませんでした"
 
-#: src/commandhandler.cpp:591
+#: src/commandhandler.cpp:592
 msgid "blacklisted"
 msgstr "ブラックリスト化されています"
 
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
 msgid "enemy"
 msgstr "敵"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:612
 msgid "Player already erased!"
 msgstr "プレイヤーは削除されています"
 
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
 msgid "Player successfully erased!"
 msgstr "プレイヤーを削除しました"
 
-#: src/commandhandler.cpp:624
+#: src/commandhandler.cpp:625
 msgid "Player could not be erased!"
 msgstr "プレイヤーを削除できませんでした"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
 #, c-format
 msgid "Client uptime: %s"
 msgstr "クライアントの稼働時間: %s"
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:948
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d週"
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:957
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d日"
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:965
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d時"
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:973
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d分"
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:981
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d秒"
 
-#: src/commandhandler.cpp:1053
+#: src/commandhandler.cpp:1060
 msgid "font cache size"
 msgstr "フォントキャッシュサイズ"
 
-#: src/commandhandler.cpp:1065
+#: src/commandhandler.cpp:1072
 msgid "Cache size:"
 msgstr "キャッシュサイズ:"
 
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1076
 msgid "Created:"
 msgstr "作成:"
 
-#: src/commandhandler.cpp:1071
+#: src/commandhandler.cpp:1078
 msgid "Deleted:"
 msgstr "削除:"
 
-#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
+#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
 msgid "Resource images:"
 msgstr "リソースイメージ:"
 
-#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
+#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
 msgid "Resource orphaned images:"
 msgstr "リソース孤児イメージ:"
 
@@ -318,43 +318,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\""
 
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "デバッグ"
 
-#: src/game.cpp:508
+#: src/game.cpp:510
 msgid "Screenshot saved as "
 msgstr " としてスクリーンショットを保存しました"
 
-#: src/game.cpp:516
+#: src/game.cpp:518
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存できませんでした"
 
-#: src/game.cpp:558
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "サーバーへの接続が切断されました"
 
-#: src/game.cpp:559
+#: src/game.cpp:561
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
-#: src/game.cpp:1270
+#: src/game.cpp:1273
 msgid "Ignoring incoming trade requests"
 msgstr "トレードリクエストを無効にしています"
 
-#: src/game.cpp:1280
+#: src/game.cpp:1283
 msgid "Accepting incoming trade requests"
 msgstr "トレードリクエストを有効にしました"
 
-#: src/game.cpp:1786
+#: src/game.cpp:1797
 msgid "Could Not Load Map"
 msgstr "マップの読み込みに失敗しました"
 
-#: src/game.cpp:1787
+#: src/game.cpp:1798
 #, c-format
 msgid "Error while loading %s"
 msgstr "%sの読み込み中にエラーが起きました"
@@ -430,23 +430,23 @@ msgstr "量:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
 #: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
 #: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
 #: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "終了"
@@ -470,21 +470,21 @@ msgid "Sell"
 msgstr "売る"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:348
-#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:522
-#: src/gui/popupmenu.cpp:550 src/gui/popupmenu.cpp:576
-#: src/gui/popupmenu.cpp:592 src/gui/popupmenu.cpp:613
-#: src/gui/popupmenu.cpp:841 src/gui/popupmenu.cpp:867
-#: src/gui/popupmenu.cpp:1850 src/gui/popupmenu.cpp:1880
-#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1985
-#: src/gui/popupmenu.cpp:2022 src/gui/popupmenu.cpp:2063
-#: src/gui/popupmenu.cpp:2117 src/gui/popupmenu.cpp:2139
-#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:168
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:348 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:522 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:576 src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:841
+#: src/gui/popupmenu.cpp:867 src/gui/popupmenu.cpp:1850
+#: src/gui/popupmenu.cpp:1880 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1985 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2063 src/gui/popupmenu.cpp:2117
+#: src/gui/popupmenu.cpp:2139 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1198
+#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -520,7 +520,7 @@ msgstr "メールアドレスが一致しません"
 msgid "Change Password"
 msgstr "パスワードの変更"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "パスワード:"
@@ -547,68 +547,73 @@ msgstr "パスワードは%d文字以下でなくてはいけません"
 msgid "The new password entries mismatch."
 msgstr "新しいパスワードが一致しません"
 
-#: src/gui/charcreatedialog.cpp:59
-msgid "Create Character"
-msgstr "キャラクター作成"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "名前:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
-#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
-#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr "髪色:"
 
-#: src/gui/charcreatedialog.cpp:95
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr "ヘアスタイル"
 
-#: src/gui/charcreatedialog.cpp:101
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr "人種:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
 #: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "作成"
 
-#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "男性"
 
-#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "女性"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "%d ポイントを振り分けてください"
 
-#: src/gui/charcreatedialog.cpp:231
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "名前は４文字以上必要です"
 
-#: src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "能力ポイント配分量は問題ありません"
 
-#: src/gui/charcreatedialog.cpp:317
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "%dポイントを取り除いてください"
@@ -650,9 +655,9 @@ msgstr "キャラクターを削除するにはパスワードを入力して下
 msgid "Enter password:"
 msgstr "パスワードを入力して下さい:"
 
-#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "削除"
 
@@ -727,7 +732,7 @@ msgstr "虹 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
@@ -739,12 +744,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "チャット"
 
-#: src/gui/chatwindow.cpp:650
+#: src/gui/chatwindow.cpp:653
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "現在: %s; %d プレイヤーがいます"
 
-#: src/gui/chatwindow.cpp:1037
+#: src/gui/chatwindow.cpp:1040
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%sにささやき中:%s"
@@ -765,7 +770,7 @@ msgstr "いいえ"
 #: src/gui/popupmenu.cpp:692 src/gui/popupmenu.cpp:701
 #: src/gui/popupmenu.cpp:715
 msgid "Ignore"
-msgstr "無視"
+msgstr "完全無視"
 
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
 #: src/gui/setup_other.cpp:64
@@ -886,7 +891,7 @@ msgstr "最高ヒット:"
 #: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
 #: src/gui/debugwindow.cpp:353
 msgid "Critical hit:"
-msgstr "致命的ヒット:"
+msgstr "クリティカルヒット:"
 
 #: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
 #, c-format
@@ -909,7 +914,7 @@ msgstr "豆知識"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "閉じる"
 
@@ -925,11 +930,36 @@ msgstr "次へ >"
 msgid "Auto open this window"
 msgstr "この窓を自動で開ける"
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "ポート:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr "サーバータイプ:"
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "装着品"
@@ -1027,39 +1057,39 @@ msgstr "取出す"
 msgid "Drop"
 msgstr "落とす"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "全て"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "トレードするアイテムの数量を入力してください"
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "落とすアイテムの数量を入力してください"
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "保管するアイテムの数量を入力してください"
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "取出すアイテムの数量を入力してください"
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "分割するアイテムの量を選択してください"
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "購入リストに追加"
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "販売リストに追加"
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "不明"
 
@@ -1174,32 +1204,31 @@ msgstr "自動で閉じる"
 msgid "Skip"
 msgstr "スキップ"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
 msgid "Login"
 msgstr "ログイン"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "サーバー:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:97
 msgid "Custom update host"
 msgstr "カスタムアップデートホスト"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Remember username"
 msgstr "ユーザー名を記憶する"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Update:"
 msgstr "アップデート:"
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "登録"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:123
 msgid "Change Server"
 msgstr "サーバー変更"
 
@@ -1276,12 +1305,12 @@ msgstr "送信する"
 msgid "Failed to send as sender or letter invalid."
 msgstr "文字か差出人が無効の為送信に失敗しました"
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr "服装: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
 #: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
@@ -1361,7 +1390,7 @@ msgstr "消す"
 #: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721
 #: src/gui/popupmenu.cpp:726
 msgid "Unignore"
-msgstr "無視解除"
+msgstr "完全無視解除"
 
 #: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194
 #: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457
@@ -1456,7 +1485,7 @@ msgstr "攻撃リストへ追加する"
 
 #: src/gui/popupmenu.cpp:332
 msgid "Add to ignore list"
-msgstr "無視リストへ追加する"
+msgstr "完全無視リストへ追加する"
 
 #: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
 msgid "Add name to chat"
@@ -1687,64 +1716,58 @@ msgstr "パスワードは%d文字以下でなくてはいけません"
 msgid "Passwords do not match."
 msgstr "パスワードが一致しません"
 
-#: src/gui/serverdialog.cpp:237
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr "サーバーを選択してください"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:239
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "サーバーを選んで下さい  *** セーフモード ***"
 
-#: src/gui/serverdialog.cpp:253
-msgid "Port:"
-msgstr "ポート:"
-
-#: src/gui/serverdialog.cpp:257
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr "同じIPをゲームサブサーバーでも使用する"
 
-#: src/gui/serverdialog.cpp:271
-msgid "Server type:"
-msgstr "サーバータイプ:"
-
-#: src/gui/serverdialog.cpp:295
+#: src/gui/serverdialog.cpp:262
 msgid "Load"
 msgstr "読込み"
 
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr "ログイン"
 
-#: src/gui/serverdialog.cpp:297
-msgid "Custom Server"
-msgstr "カスタムサーバー"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "追加"
 
-#: src/gui/serverdialog.cpp:402
-msgid "Please type both the address and the port of a server."
-msgstr "サーバのアドレスとポートを入力してください"
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
+#: src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "編集"
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:448
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "サーバーリストをダウンロード中...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:565
+#: src/gui/serverdialog.cpp:453
 msgid "Waiting for server..."
 msgstr "サーバーからの応答を待っています"
 
-#: src/gui/serverdialog.cpp:569
+#: src/gui/serverdialog.cpp:457
 msgid "Preparing download"
 msgstr "ダウンロード準備中..."
 
-#: src/gui/serverdialog.cpp:573
+#: src/gui/serverdialog.cpp:461
 msgid "Error retreiving server list!"
 msgstr "サーバーリストの読み込みに失敗"
 
-#: src/gui/serverdialog.cpp:681
+#: src/gui/serverdialog.cpp:545
 msgid "requires a newer version"
 msgstr "アップデートが必要です"
 
-#: src/gui/serverdialog.cpp:683
+#: src/gui/serverdialog.cpp:547
 #, c-format
 msgid "requires v%s"
 msgstr "v%sが必要"
@@ -2294,11 +2317,11 @@ msgstr "友達"
 
 #: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
-msgstr "無視"
+msgstr "無視している"
 
 #: src/gui/setup_relations.cpp:73
 msgid "Ignored"
-msgstr "無視する"
+msgstr "完全無視している"
 
 #: src/gui/setup_relations.cpp:74
 msgid "Erased"
@@ -2312,25 +2335,25 @@ msgstr "ブラックリスト化されています"
 msgid "Enemy"
 msgstr "敵"
 
-#: src/gui/setup_relations.cpp:240
+#: src/gui/setup_relations.cpp:242
 msgid "Allow trading"
 msgstr "トレードを受付ける"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:244
 msgid "Allow whispers"
 msgstr "全てのささやきを受け取る"
 
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:247
 msgid "Old"
 msgstr "古い"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:249
 msgid "Relations"
 msgstr "関係"
 
-#: src/gui/setup_relations.cpp:272
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
-msgstr "無視の際には:"
+msgstr "完全無視の際には:"
 
 #: src/gui/setup_theme.cpp:108
 msgid "Tiny (10)"
@@ -2456,8 +2479,8 @@ msgstr "フォントサイズ"
 msgid "Theme Changed"
 msgstr "テーマを変更しました"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:628
+#: src/gui/setup_video.cpp:633
 msgid "Restart your client for the change to take effect."
 msgstr "設定変更の為アプリケーションを再起動してください"
 
@@ -2509,148 +2532,147 @@ msgstr "中"
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:288
+#: src/gui/setup_video.cpp:289
 msgid "Full screen"
 msgstr "フールスクリーン"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:290
 msgid "Custom cursor"
 msgstr "カスタムカーソル"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:292
 msgid "Particle effects"
 msgstr "パーティクル効果"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Show pickup notification"
 msgstr "収集通知表示"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:296
 msgid "in chat"
 msgstr "チャットで"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:298
 msgid "as particle"
 msgstr "画面内で"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:300
+msgid "Enable resize"
+msgstr ""
+
+#: src/gui/setup_video.cpp:304
 msgid "FPS limit:"
 msgstr "FPSリミット:"
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
+#: src/gui/setup_video.cpp:308 src/gui/setup_video.cpp:343
+#: src/gui/setup_video.cpp:568 src/gui/setup_video.cpp:722
 msgid "Alt FPS limit: "
 msgstr "Alt FPS リミット: "
 
-#: src/gui/setup_video.cpp:321
+#: src/gui/setup_video.cpp:323
 msgid "Overhead text"
 msgstr "ヘッダーテキスト"
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_video.cpp:324
 msgid "Gui opacity"
 msgstr "GUI不透明"
 
-#: src/gui/setup_video.cpp:323
+#: src/gui/setup_video.cpp:325
 msgid "Ambient FX"
 msgstr "環境FX"
 
-#: src/gui/setup_video.cpp:324
+#: src/gui/setup_video.cpp:326
 msgid "Particle detail"
 msgstr "パーティクルの詳細"
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:341 src/gui/setup_video.cpp:344
+#: src/gui/setup_video.cpp:567 src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:720
 msgid "None"
 msgstr "なし"
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:489
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "ウインドウモード、また前モードの復元にも失敗しました"
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:495
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "フルスクリーンモード、また前モードの復元にも失敗しました"
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:506
 msgid "Switching to Full Screen"
 msgstr "フルスクリーンに変更"
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:507
 msgid "Restart needed for changes to take effect."
 msgstr "設定変更の為、再起動をしてください"
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:519
 msgid "Changing to OpenGL"
 msgstr "OpenGLに変更"
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:520
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGLの設定を変更するため、再起動をしてください。"
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:610
 msgid "Custom resolution (example: 1024x768)"
 msgstr "カスタム解像度 (例: 1024x768)"
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:611
 msgid "Enter new resolution:                "
 msgstr "解像度を入力して下さい:                "
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:627 src/gui/setup_video.cpp:632
 msgid "Screen Resolution Changed"
 msgstr "スクリーンの解像度を変更しました"
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:630
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "解像度の変更に合わせ、いくつかのウィンドウが移動する可能性があります"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:666
 msgid "Particle Effect Settings Changed."
 msgstr "パーティクル効果の設定を変更しました"
 
-#: src/gui/setup_video.cpp:655
+#: src/gui/setup_video.cpp:667
 msgid "Changes will take effect on map change."
 msgstr "変更はマップが変わった時に有効になります"
 
-#: src/gui/shopwindow.cpp:75
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr "最大 (15)"
 
-#: src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr "購入"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr "販売"
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
-#: src/gui/tradewindow.cpp:89
-msgid "Add"
-msgstr "追加"
-
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr "アナウンス"
 
-#: src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr "アナウンスにリンクを表示する"
 
-#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
 msgstr "オークション"
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "トレードをリクエスト"
 
-#: src/gui/shopwindow.cpp:749
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%sが%s %sを希望しています。承認しますか？"
@@ -2759,7 +2781,7 @@ msgstr "ナビ"
 
 #: src/gui/socialwindow.cpp:927
 msgid "Atk"
-msgstr "Atk"
+msgstr "攻撃"
 
 #: src/gui/socialwindow.cpp:968
 msgid "Priority mobs"
@@ -2771,7 +2793,7 @@ msgstr "敵を攻撃する"
 
 #: src/gui/socialwindow.cpp:1035
 msgid "Ignore mobs"
-msgstr "敵を無視する"
+msgstr "敵を完全無視する"
 
 #: src/gui/socialwindow.cpp:1195
 msgid "Create Guild"
@@ -2792,12 +2814,12 @@ msgstr "招待"
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/socialwindow.cpp:1277
 msgid "P"
-msgstr ""
+msgstr "周囲"
 
 #. TRANSLATORS: here F is title for friends tab in social window
 #: src/gui/socialwindow.cpp:1281
 msgid "F"
-msgstr ""
+msgstr "フレ"
 
 #: src/gui/socialwindow.cpp:1414
 #, c-format
@@ -3109,7 +3131,7 @@ msgstr "完了"
 
 #: src/gui/userpalette.cpp:116
 msgid "Being"
-msgstr "人"
+msgstr "プレイヤー"
 
 #: src/gui/userpalette.cpp:117
 msgid "Friend Names"
@@ -3121,7 +3143,7 @@ msgstr "無視している名前"
 
 #: src/gui/userpalette.cpp:119
 msgid "Ignored Names"
-msgstr "無視している名前"
+msgstr "完全無視している名前"
 
 #: src/gui/userpalette.cpp:120
 msgid "Erased Names"
@@ -3181,15 +3203,15 @@ msgstr "プレイヤーのHPバー（二番目の色）"
 
 #: src/gui/userpalette.cpp:137
 msgid "Player Hits Monster"
-msgstr "プレイヤーはモンスターをヒット"
+msgstr "プレイヤーがモンスターをヒットした時"
 
 #: src/gui/userpalette.cpp:138
 msgid "Monster Hits Player"
-msgstr "モンスターはプレイヤーをヒット"
+msgstr "モンスターがプレイヤーをヒットした時"
 
 #: src/gui/userpalette.cpp:140
 msgid "Other Player Hits Local Player"
-msgstr "他のプレイヤーがローカルプレイヤーを攻撃しました"
+msgstr "他のプレイヤーがローカルプレイヤーを攻撃した時"
 
 #: src/gui/userpalette.cpp:141
 msgid "Critical Hit"
@@ -3197,11 +3219,11 @@ msgstr "クリティカルヒット"
 
 #: src/gui/userpalette.cpp:143
 msgid "Local Player Hits Monster"
-msgstr "ローカルプレイヤーがモンスターを攻撃しました"
+msgstr "ローカルプレイヤーがモンスターを攻撃した時"
 
 #: src/gui/userpalette.cpp:145
 msgid "Local Player Critical Hit"
-msgstr "ローカルプレイヤー　会心の一撃"
+msgstr "ローカルプレイヤー　クリティカルヒットした時"
 
 #: src/gui/userpalette.cpp:147
 msgid "Local Player Miss"
@@ -3255,23 +3277,23 @@ msgstr "ホームボーダー"
 msgid "Road Point"
 msgstr "ロードポイント"
 
-#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
 msgid "Who Is Online - Updating"
 msgstr "オンラインリスト - アップデート中"
 
-#: src/gui/whoisonline.cpp:113
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr "アップデート"
 
-#: src/gui/whoisonline.cpp:196
+#: src/gui/whoisonline.cpp:194
 msgid "Who Is Online - "
 msgstr "オンラインリスト - "
 
-#: src/gui/whoisonline.cpp:586
+#: src/gui/whoisonline.cpp:622
 msgid "Who Is Online - error"
 msgstr "オンラインリスト - エラー"
 
-#: src/gui/whoisonline.cpp:625
+#: src/gui/whoisonline.cpp:661
 msgid "Who Is Online - Update"
 msgstr "オンラインリスト - アップデート"
 
@@ -3414,13 +3436,9 @@ msgstr "/leave > ギルドから退会する"
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > プレイヤーをギルドから追い出します"
 
-#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
-msgid "Edit"
-msgstr "編集"
-
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
-msgstr "/ignore > 他のプレイヤーを無視する"
+msgstr "/ignore > 他のプレイヤーを完全無視する"
 
 #: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
@@ -3444,7 +3462,7 @@ msgstr "コマンド: /ignore"
 
 #: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
-msgstr "このコマンドは全てのプレイヤーを無視します"
+msgstr "このコマンドは全てのプレイヤーを完全無視します"
 
 #: src/gui/widgets/whispertab.cpp:130
 msgid "Command: /unignore <player>"
@@ -3452,7 +3470,7 @@ msgstr "コマンド: /unignore <プレイヤー名>"
 
 #: src/gui/widgets/whispertab.cpp:131
 msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "このコマンドはプレイヤー無視を解除します"
+msgstr "このコマンドはプレイヤー完全無視を解除します"
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
@@ -3668,7 +3686,7 @@ msgstr "アイテムショートカットキー"
 #: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
 #: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
 #: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:371
+#: src/keyboardconfig.cpp:379
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "アイテムショートカット: %d"
@@ -3795,184 +3813,186 @@ msgstr "スマイリー"
 #: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
 #: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
 #: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:366
+#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:374
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "スマイリーショートカット: %d"
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:278
 msgid "Outfits Keys"
 msgstr "服装キー"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:279
 msgid "Wear Outfit"
 msgstr "服を着る"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:281
 msgid "Copy Outfit"
 msgstr "服をコピーする"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:283
 msgid "Copy equipped to Outfit"
 msgstr "装着品を服装にコピー"
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:285
 msgid "Chat Keys"
 msgstr "チャットキー"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:286
 msgid "Toggle Chat"
 msgstr "トグルチャット"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:288
 msgid "Scroll Chat Up"
 msgstr "チャットを上へスクロールする"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Down"
 msgstr "チャットを下へスクロールする"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:292
 msgid "Previous Chat Tab"
 msgstr "前のチャットタブ"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:294
 msgid "Next Chat Tab"
 msgstr "次のチャットタブ"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:297
 msgid "Close current Chat Tab"
 msgstr "このチャットタブを閉じる"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:299
 msgid "Previous chat line"
 msgstr "前チャット文"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:301
 msgid "Next chat line"
 msgstr "次チャット文"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:303
 msgid "Chat Auto Complete"
 msgstr "チャットオートコンプリート"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:305
 msgid "Deactivate Chat Input"
 msgstr "チャット入力無効"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:307
 msgid "Other Keys"
 msgstr "その他のキー"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:308
 msgid "Ignore input 1"
-msgstr "インプット１無視"
+msgstr "インプット１完全無視"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 2"
-msgstr "インプット２無視"
+msgstr "インプット２完全無視"
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:312
 msgid "Direct Up"
 msgstr "上方向"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:313
 msgid "Direct Down"
 msgstr "下方向"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:315
 msgid "Direct Left"
 msgstr "左方向"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:316
 msgid "Direct Right"
 msgstr "右方向"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:318
 msgid "Crazy moves"
 msgstr "クレイジームーブ"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:320
 msgid "Change Crazy Move mode"
 msgstr "クレイジームーブモード変更"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:322
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Nアイテムを 0スロットからクイックドロップ"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items"
 msgstr "Nアイテムをクイックドロップ"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:326
 msgid "Switch Quick Drop Counter"
 msgstr "クイックドロップカウンター変更"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:328
 msgid "Quick heal target or self"
 msgstr "ターゲット又は自分をHP回復させる"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:330
 msgid "Use #itenplz spell"
 msgstr "呪文 #itenplz を唱える"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:332
 msgid "Use magic attack"
 msgstr "魔法攻撃を使用"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:334
 msgid "Switch magic attack"
 msgstr "マジックアタック変更"
 
-#: src/keyboardconfig.cpp:329
+#: src/keyboardconfig.cpp:337
 msgid "Switch pvp attack"
 msgstr "PvP攻撃変更"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:338
 msgid "Change move type"
 msgstr "ムーブタイプ変更"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:340
 msgid "Change Attack Weapon Type"
 msgstr "武器変更"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Type"
 msgstr "攻撃方法変更"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:344
 msgid "Change Follow mode"
 msgstr "フォローモード変更"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:346
 msgid "Change Imitation mode"
 msgstr "真似モード変更"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboardconfig.cpp:349
 msgid "Disable / Enable Game modifier keys"
 msgstr "ゲームモディファイアキーを無効 / 有効にする"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:350
 msgid "On / Off audio"
 msgstr "オーディオ　オン/オフ"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:352
 msgid "Enable / Disable away mode"
 msgstr "AFKモードを有効 / 無効にする"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:354
 msgid "Emulate right click from keyboard"
 msgstr "右クリックをエミュレートする"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:356
 msgid "Toggle camera mode"
 msgstr "カメラモード変更"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:358
 msgid "Modifier key"
 msgstr "モディファイアーキー"
 
-#: src/keyboardconfig.cpp:429
+#: src/keyboardconfig.cpp:437
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3981,333 +4001,333 @@ msgstr ""
 "\"%s\"と\"%s\"キーが重複しています。 ゲームプレイに悪い影響が出るかもしれませ"
 "ん。"
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:385
 #, c-format
 msgid "You were killed by %s"
 msgstr "%sによって殺されました"
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1440
 msgid "Tried to pick up nonexistent item."
 msgstr "存在しないアイテムは拾えません"
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1443
 msgid "Item is too heavy."
 msgstr "アイテムが重過ぎます"
 
-#: src/localplayer.cpp:1445
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "アイテムが遠すぎます."
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1449
 msgid "Inventory is full."
 msgstr "インベントリーが満杯です"
 
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1452
 msgid "Stack is too big."
 msgstr "量が多すぎます"
 
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1455
 msgid "Item belongs to someone else."
 msgstr "これは他のプレイヤーのアイテムです"
 
-#: src/localplayer.cpp:1457
+#: src/localplayer.cpp:1458
 msgid "Unknown problem picking up item."
 msgstr "不明なエラーの為拾えません"
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1481
+#: src/localplayer.cpp:1482
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "%d [@@%d|%s@@]を手に入れました"
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 msgid "(D) default moves"
 msgstr "(D) デフォルトムーブ"
 
-#: src/localplayer.cpp:1899
+#: src/localplayer.cpp:1903
 msgid "(I) invert moves"
 msgstr "(I) 逆ムーブ"
 
-#: src/localplayer.cpp:1900
+#: src/localplayer.cpp:1904
 msgid "(c) moves with some crazy moves"
 msgstr "(c) クレイジームーブを含んだムーブ"
 
-#: src/localplayer.cpp:1901
+#: src/localplayer.cpp:1905
 msgid "(C) moves with crazy moves"
 msgstr "(C) クレイジームーブ"
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1906
 msgid "(d) double normal + crazy"
 msgstr "(d) ダブルノーマル + クレイジー"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1907
 msgid "(?) unknown move"
 msgstr "(?) 不明なムーブ"
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) クレイジームーブ %d"
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1934
 msgid "(a) custom crazy move"
 msgstr "(a) カスタムクレイジームーブ"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1938
 msgid "(?) crazy move"
 msgstr "(?) クレイジームーブ"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(0) default moves to target"
 msgstr "(0) ターゲットへデフォルト接近"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(1) moves to target in distance 1"
 msgstr "(1) 距離1でターゲットへ接近"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(2) moves to target in distance 2"
 msgstr "(2) 距離2でターゲットに近付く"
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(3) moves to target in distance 3"
 msgstr "(3) 距離3でターゲットへ接近"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1956
 msgid "(5) moves to target in distance 5"
 msgstr "(5) 距離5でターゲットに近付く"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1957
 msgid "(7) moves to target in distance 7"
 msgstr "(7) 距離7でターゲットに近付く"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1958
 msgid "(A) moves to target in attack range"
 msgstr "(A) 攻撃範囲内のターゲットに近付く"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1959
 msgid "(a) archer attack range"
 msgstr "(a) 弓師攻撃範囲"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1960
 msgid "(?) move to target"
 msgstr "(?) ターゲットに近付く"
 
-#: src/localplayer.cpp:1975
+#: src/localplayer.cpp:1979
 msgid "(D) default follow"
 msgstr "(D) デフォルトフォロー"
 
-#: src/localplayer.cpp:1976
+#: src/localplayer.cpp:1980
 msgid "(R) relative follow"
 msgstr "(R) 友達フォロー"
 
-#: src/localplayer.cpp:1977
+#: src/localplayer.cpp:1981
 msgid "(M) mirror follow"
 msgstr "(M) ミラーフォロー"
 
-#: src/localplayer.cpp:1978
+#: src/localplayer.cpp:1982
 msgid "(P) pet follow"
 msgstr "(P) ペットフォロー"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1983
 msgid "(?) unknown follow"
 msgstr "(?) 不明なフォロー"
 
-#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
 msgid "(?) attack"
 msgstr "(?) 攻撃"
 
-#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
+#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
 msgid "(D) default attack"
 msgstr "(D) デフォルト攻撃"
 
-#: src/localplayer.cpp:2000
+#: src/localplayer.cpp:2004
 msgid "(s) switch attack without shield"
 msgstr "(s) 盾なし攻撃"
 
-#: src/localplayer.cpp:2001
+#: src/localplayer.cpp:2005
 msgid "(S) switch attack with shield"
 msgstr "(S) 盾あり攻撃"
 
-#: src/localplayer.cpp:2022
+#: src/localplayer.cpp:2026
 msgid "(G) go and attack"
 msgstr "(G) 接近、攻撃"
 
-#: src/localplayer.cpp:2023
+#: src/localplayer.cpp:2027
 msgid "(A) go, attack, pickup"
 msgstr "(A) 接近、攻撃、拾う"
 
-#: src/localplayer.cpp:2024
+#: src/localplayer.cpp:2028
 msgid "(d) without auto attack"
 msgstr "(d) 自動攻撃なし"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) 小範囲で拾う 1x1セル"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) デフォルト範囲で拾う 2x1セル"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) 広範囲で拾う 2x3セル"
 
-#: src/localplayer.cpp:2061
+#: src/localplayer.cpp:2065
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) 3x3セルの範囲で拾う"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2066
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) 距離4の範囲で拾う"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2067
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) 距離8で拾う"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2068
 msgid "(A) go and pick up in max distance"
 msgstr "(A) 最大範囲で拾う"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2069
 msgid "(?) pick up"
 msgstr "(?) 拾う"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(N) normal map view"
 msgstr "(N) 通常マップビュー"
 
-#: src/localplayer.cpp:2079
+#: src/localplayer.cpp:2083
 msgid "(D) debug map view"
 msgstr "(D) デバッグマップビュー"
 
-#: src/localplayer.cpp:2080
+#: src/localplayer.cpp:2084
 msgid "(u) ultra map view"
 msgstr "(u) ウルトラマップビュー"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2085
 msgid "(U) ultra map view 2"
 msgstr "(U) ウルトラマップビュー2"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2086
 msgid "(e) empty map view"
 msgstr "(e) 空マップビュー"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2087
 msgid "(b) black & white map view"
 msgstr "(b) 白黒マップビュー"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(f) use #flar for magic attack"
 msgstr "(f) 魔法攻撃は #flarを使う"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2107
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) 魔法攻撃は #chizaを使う"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2108
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) 魔法攻撃は #ingravを使う"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2109
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) 魔法攻撃は #frillyarを使う"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2110
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) 魔法攻撃は #upmarmuを使う"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2111
 msgid "(?) magic attack"
 msgstr "(?) 魔法攻撃"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2130
 msgid "(a) attack all players"
 msgstr "(a) 全てのプレイヤーを攻撃"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2131
 msgid "(f) attack not friends"
 msgstr "(f) 友達以外を攻撃"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2132
 msgid "(b) attack bad relations"
 msgstr "(b) 敵を攻撃"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2133
 msgid "(d) dont attack players"
 msgstr "(d) 他のプレイヤーを攻撃しない"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2134
 msgid "(?) pvp attack"
 msgstr "(?) PvP攻撃"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2153
 msgid "(D) default imitation"
 msgstr "(D) デフォルト真似"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2154
 msgid "(O) outfits imitation"
 msgstr "(O) 服装真似"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2155
 msgid "(?) imitation"
 msgstr "(?) 真似をする"
 
-#: src/localplayer.cpp:2179
+#: src/localplayer.cpp:2183
 msgid "Away"
 msgstr "アウェイ"
 
-#: src/localplayer.cpp:2198
+#: src/localplayer.cpp:2202
 msgid "(O) on keyboard"
 msgstr "(O) キーボード"
 
-#: src/localplayer.cpp:2199
+#: src/localplayer.cpp:2203
 msgid "(A) away"
 msgstr "(A) アウェイ"
 
-#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
+#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
 msgid "(?) away"
 msgstr "(?) アウェイ"
 
-#: src/localplayer.cpp:2213
+#: src/localplayer.cpp:2217
 msgid "(G) game camera mode"
 msgstr "(G) ゲームカメラモード"
 
-#: src/localplayer.cpp:2214
+#: src/localplayer.cpp:2218
 msgid "(F) free camera mode"
 msgstr "(F) フリーカメラモード"
 
-#: src/localplayer.cpp:2239
+#: src/localplayer.cpp:2243
 msgid "Game modifiers are enabled"
 msgstr "ゲームモディファイアは有効になってます"
 
-#: src/localplayer.cpp:2240
+#: src/localplayer.cpp:2244
 msgid "Game modifiers are disabled"
 msgstr "ゲームモディファイアは無効になってます"
 
-#: src/localplayer.cpp:2241
+#: src/localplayer.cpp:2245
 msgid "Game modifiers are unknown"
 msgstr "不明なゲームモディファイアー"
 
-#: src/localplayer.cpp:3758
+#: src/localplayer.cpp:3763
 msgid "Follow: "
 msgstr "フォロー: "
 
-#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
+#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
 msgid "Follow canceled"
 msgstr "フォローを止める"
 
-#: src/localplayer.cpp:3767
+#: src/localplayer.cpp:3772
 msgid "Imitation: "
 msgstr "真似: "
 
-#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
 msgid "Imitation canceled"
 msgstr "真似をやめる"
 
-#: src/localplayer.cpp:4125
+#: src/localplayer.cpp:4130
 msgid "You see "
 msgstr " が見える"
 
@@ -4511,7 +4531,7 @@ msgstr "%sがオフラインの為ささやきは送れませんでした"
 #: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
-msgstr "%sが無視設定をしている為ささやきは送れませんでした"
+msgstr "%sが完全無視設定をしている為ささやきは送れませんでした"
 
 #: src/net/ea/chathandler.cpp:346
 msgid "MVP player."