update and rebuild translations.

1 files changed, 308 insertions, 299 deletions

diff --git a/po/ja.po b/po/ja.po
index 4a992fbd6..cd729ce8c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@
 #
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
-#   <HarajukuCupcakes@gmail.com>, 2011, 2012.
+#   <HarajukuCupcakes@gmail.com>, 2011-2013.
 # Necromonger <Necromong@inbox.ru>, 2011.
 #   <Necromong@inbox.ru>, 2011.
 # sn0w75 <ibenrunnin@gmail.com>, 2011.
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
 "language/ja/)\n"
@@ -31,7 +31,7 @@ msgstr "トレードリクエストを無効にしています"
 msgid "Accepting incoming trade requests"
 msgstr "トレードリクエストを有効にしました"
 
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
 msgid "Visible on map"
 msgstr "マップに表示させる"
 
@@ -57,54 +57,54 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "パフォーマンス"
 
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
 msgid "Video"
 msgstr "ビデオ"
 
-#: src/client.cpp:1111
+#: src/client.cpp:1122
 msgid "Themes"
 msgstr "テーマ"
 
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
 #: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
 #: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
 msgid "Close"
 msgstr "閉じる"
 
-#: src/client.cpp:1204
+#: src/client.cpp:1215
 msgid "Connecting to server"
 msgstr "サーバーに接続しています"
 
-#: src/client.cpp:1246
+#: src/client.cpp:1257
 msgid "Logging in"
 msgstr "ログインしています"
 
-#: src/client.cpp:1284
+#: src/client.cpp:1295
 msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1408
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
-#: src/client.cpp:1435
+#: src/client.cpp:1446
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
-#: src/client.cpp:1447
+#: src/client.cpp:1458
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
 #: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
 #: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -113,50 +113,50 @@ msgstr "ゲームサーバーを変更しています"
 msgid "Error"
 msgstr "エラー"
 
-#: src/client.cpp:1525
+#: src/client.cpp:1536
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
-#: src/client.cpp:1561
+#: src/client.cpp:1572
 msgid "Password Change"
 msgstr "パスワード変更"
 
-#: src/client.cpp:1562
+#: src/client.cpp:1573
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました"
 
-#: src/client.cpp:1582
+#: src/client.cpp:1593
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
-#: src/client.cpp:1583
+#: src/client.cpp:1594
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました"
 
-#: src/client.cpp:1603
+#: src/client.cpp:1614
 msgid "Unregister Successful"
 msgstr "登録を解除しました"
 
-#: src/client.cpp:1604
+#: src/client.cpp:1615
 msgid "Farewell, come back any time..."
 msgstr "さようなら　また会いましょう"
 
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%sは存在しない為、作成できません"
 
-#: src/client.cpp:2065
+#: src/client.cpp:2076
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "無効なアップデートホスト:%s"
 
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー: %s は存在しない為、作成できません"
@@ -397,22 +397,22 @@ msgstr "リセット"
 msgid "Name"
 msgstr "名前"
 
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "Attack"
 msgstr "攻撃"
 
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
 #: src/gui/setupactiondata.h:86
 msgid "Talk"
 msgstr "話す"
 
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
 msgid "Move"
 msgstr "動く"
 
@@ -421,8 +421,8 @@ msgid "Result"
 msgstr "結果"
 
 #: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
 msgid "Buy"
 msgstr "買う"
 
@@ -440,7 +440,7 @@ msgstr "量:"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
 #: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr "+"
 
@@ -448,7 +448,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
 #: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
 msgid "-"
 msgstr "-"
 
@@ -460,8 +460,8 @@ msgid "Quit"
 msgstr "終了"
 
 #: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
 msgid "Max"
 msgstr "最大"
 
@@ -471,8 +471,8 @@ msgstr "最大"
 msgid "Shop"
 msgstr "店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
 msgid "Sell"
 msgstr "売る"
@@ -481,21 +481,22 @@ msgstr "売る"
 #: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
 #: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -770,7 +771,7 @@ msgstr "チャット"
 msgid "Present: %s; %d players are present."
 msgstr "現在: %s; %d プレイヤーがいます"
 
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%sにささやき中:%s"
@@ -783,9 +784,9 @@ msgstr "はい"
 msgid "No"
 msgstr "いいえ"
 
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
 msgid "Ignore"
 msgstr "無視"
 
@@ -868,7 +869,7 @@ msgstr "%d FPS (古い OpenGL)"
 #: src/gui/debugwindow.cpp:182
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
-msgstr ""
+msgstr "%d FPS (モバイルOpenGL)"
 
 #: src/gui/debugwindow.cpp:204 src/gui/debugwindow.cpp:260
 msgid "Textures count:"
@@ -1009,8 +1010,8 @@ msgid "Equipment"
 msgstr "装着品"
 
 #: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
 msgid "Unequip"
 msgstr "取外す"
 
@@ -1044,47 +1045,47 @@ msgid "Inventory"
 msgstr "インベントリー"
 
 #: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
 msgid "Equip"
 msgstr "装着"
 
 #: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
 #: src/gui/skilldialog.cpp:267
 msgid "Use"
 msgstr "使用"
 
 #: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
 msgid "Drop..."
 msgstr "落とす..."
 
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
 msgid "Split"
 msgstr "分割"
 
 #: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
 #: src/gui/windowmenu.cpp:162
 msgid "Outfits"
 msgstr "服装"
 
 #: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
 msgid "Store"
 msgstr "保管"
 
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
 msgid "Retrieve"
 msgstr "取出す"
 
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
 #: src/gui/windowmenu.cpp:152
 msgid "Drop"
 msgstr "落とす"
@@ -1157,14 +1158,14 @@ msgstr "キル: %s, 合計exp: %s"
 #: src/gui/killstats.cpp:474
 #, c-format
 msgid "Avg Exp: %s"
-msgstr ""
+msgstr "平均 Exp: %s"
 
 #: src/gui/killstats.cpp:54 src/gui/killstats.cpp:156
 #: src/gui/killstats.cpp:232 src/gui/killstats.cpp:243
 #: src/gui/killstats.cpp:476
 #, c-format
 msgid "No. of avg mob to next level: %s"
-msgstr ""
+msgstr "次のレベルまでに必要なモブ数　約: %s"
 
 #: src/gui/killstats.cpp:56 src/gui/killstats.cpp:166
 #: src/gui/killstats.cpp:250 src/gui/killstats.cpp:478
@@ -1318,18 +1319,18 @@ msgstr "情勢"
 msgid "job bar"
 msgstr "職"
 
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "レベル: %d (GM %d)"
 
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
 
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
 msgid "Need"
 msgstr "必要"
 
@@ -1350,7 +1351,7 @@ msgstr "決定"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
 msgid "Clear"
 msgstr "クリア"
 
@@ -1385,352 +1386,356 @@ msgstr "AFK中の服装"
 msgid "Key: %s"
 msgstr "鍵: %s"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
 #: src/gui/widgets/tradetab.cpp:39
 msgid "Trade"
 msgstr "トレード"
 
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
 msgid "Whisper"
 msgstr "ささやく"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
 msgid "Heal"
 msgstr "HP回復"
 
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
 msgid "Kick from guild"
 msgstr "ギルドから一時的に追い出す"
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
 msgid "Change pos in guild"
 msgstr "ギルドでの役割を変更"
 
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
 msgid "Invite to guild"
 msgstr "ギルドへ招待"
 
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
 msgid "Kick player"
 msgstr "プレイヤーを一時的に追い出す"
 
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
 msgid "Nuke"
 msgstr "消す"
 
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
 msgid "Add comment"
 msgstr "コメントをする"
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
 msgid "Kick"
 msgstr "追い出す"
 
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
 msgid "Remove from attack list"
 msgstr "攻撃リストから削除する"
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
 msgid "Add to priority attack list"
 msgstr "攻撃優先リストへ追加する"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
 msgid "Add to attack list"
 msgstr "攻撃リストへ追加する"
 
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
 msgid "Add to ignore list"
 msgstr "攻撃無視リストへ追加する"
 
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
 msgid "Add name to chat"
 msgstr "名前をチャットへ追加する"
 
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "プレイヤー"
 
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
 msgid "Kick from party"
 msgstr "パーティから一時的に追い出す"
 
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
 msgid "Pick up"
 msgstr "拾う"
 
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
 msgid "Add to chat"
 msgstr "チャットに追加"
 
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
 msgid "Map Item"
 msgstr "マップアイテム"
 
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
 msgid "Rename"
 msgstr "名前を変更する"
 
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
 msgid "Remove"
 msgstr "削除"
 
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
 msgid "Warp"
 msgstr "ワープ"
 
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
 msgid "Move camera"
 msgstr "カメラを動かす"
 
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
 msgid "Clear outfit"
 msgstr "服装を削除する"
 
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
 msgid "Spells"
 msgstr "呪文"
 
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
 msgid "Edit spell"
 msgstr "呪文を編集する"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
 msgid "Disable highlight"
 msgstr "強調表示を無効"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
 msgid "Enable highlight"
 msgstr "強調表示を有効"
 
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
 msgid "Don't remove name"
 msgstr "名前を消さない"
 
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
 msgid "Remove name"
 msgstr "名前を削除する"
 
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
 msgid "Enable away"
 msgstr "AFKを有効にする"
 
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
 msgid "Disable away"
 msgstr "AFKを無効にする"
 
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
 msgid "Leave"
 msgstr "退会"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
 msgid "Copy to clipboard"
 msgstr "クリップボードにコピー"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
 msgid "Invite to party"
 msgstr "パーティへ招待"
 
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
 msgid "Change guild position"
 msgstr "ギルドポジションを変更"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
 msgid "Rename map sign          "
 msgstr "          マップサインの名前を変更"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
 msgid "Name:                    "
 msgstr "名前:                    "
 
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
 msgid "Player comment            "
 msgstr "プレイヤーコメント            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
 msgid "Comment:                      "
 msgstr "コメント:                      "
 
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
 msgid "Add to trade"
 msgstr "トレードウィンドウに追加"
 
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
 msgid "Add to trade 10"
 msgstr "トレードウィンドウに10追加する"
 
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
 msgid "Add to trade half"
 msgstr "トレードウィンドウに半分追加する"
 
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
 msgid "Add to trade all"
 msgstr "トレードウィンドウに全て追加する"
 
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
 msgid "Store 10"
 msgstr "10 保存"
 
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
 msgid "Store half"
 msgstr "半分保存"
 
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
 msgid "Store all-1"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
 msgid "Store all"
 msgstr "全部保存"
 
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
 msgid "Drop all"
 msgstr "全て落とす"
 
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
 msgid "Retrieve 10"
 msgstr "10 取出す"
 
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
 msgid "Retrieve half"
 msgstr "半分取出す"
 
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
 msgid "Retrieve all-1"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
 msgid "Retrieve all"
 msgstr "全部取出す"
 
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
 msgid "Clear drop window"
-msgstr ""
+msgstr "ドロップ窓を消す"
 
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
 msgid "Hide"
 msgstr " 非表示"
 
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
 msgid "Show"
 msgstr "表示"
 
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
 msgid "Reset yellow bar"
 msgstr "黄色バーをリセットする"
 
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
 msgid "Copy to chat"
 msgstr "チャットへコピーする"
 
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
 #: src/gui/socialwindow.cpp:925
 msgid "(default)"
 msgstr "(デフォルト)"
 
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
 msgid "Move up"
 msgstr "上へ移動"
 
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
 msgid "Move down"
 msgstr "下へ移動"
 
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
 msgid "Undress"
 msgstr "脱ぐ"
 
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
 msgid "Copy"
-msgstr ""
+msgstr "コピー"
 
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
 msgid "Paste"
+msgstr "ペースト"
+
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2132
 msgid "Be friend"
 msgstr "友達になる"
 
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
 msgid "Disregard"
 msgstr "無視する"
 
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
 msgid "Black list"
 msgstr "ブラックリスト"
 
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
 msgid "Set as enemy"
 msgstr "敵に設定する"
 
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
 #: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
 msgid "Erase"
 msgstr "消す"
 
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
 msgid "Unignore"
 msgstr "完全無視解除"
 
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
 #: src/playerrelations.cpp:473
 msgid "Completely ignore"
 msgstr "完全無視"
 
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
 msgid "Follow"
 msgstr "フォロー"
 
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
 msgid "Imitation"
 msgstr "真似"
 
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
 msgid "Buy (?)"
 msgstr "買う (?)"
 
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
 msgid "Sell (?)"
 msgstr "売る (?)"
 
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
 msgid "Show Items"
 msgstr "アイテムを表示する"
 
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
 msgid "Remove from pickup list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
 msgid "Add to pickup list"
 msgstr ""
 
 #: src/gui/questswindow.cpp:95 src/gui/windowmenu.cpp:92
 msgid "Quests"
-msgstr ""
+msgstr "クエスト"
 
 #: src/gui/questswindow.cpp:204 src/gui/setup_input.cpp:354
 msgid "unknown"
@@ -1830,7 +1835,7 @@ msgstr "v%sが必要"
 
 #: src/gui/setupactiondata.h:46
 msgid "Target and attack keys"
-msgstr ""
+msgstr "ターゲット・攻撃キー"
 
 #: src/gui/setupactiondata.h:56
 msgid "Target & Attack"
@@ -1866,7 +1871,7 @@ msgstr "ターゲットから外す"
 
 #: src/gui/setupactiondata.h:101
 msgid "Target monster"
-msgstr ""
+msgstr "モブをターゲット"
 
 #: src/gui/setupactiondata.h:106
 msgid "Target NPC"
@@ -1910,15 +1915,15 @@ msgstr "OKを選択する"
 
 #: src/gui/setupactiondata.h:161
 msgid "Stop or sit"
-msgstr ""
+msgstr "止まる・座る"
 
 #: src/gui/setupactiondata.h:166
 msgid "Return to safe video mode"
-msgstr ""
+msgstr "セーフビデオモードへ戻る"
 
 #: src/gui/setupactiondata.h:180
 msgid "Shortcuts modifiers keys"
-msgstr ""
+msgstr "ショートカット編集キー"
 
 #: src/gui/setupactiondata.h:185
 msgid "Item Shortcuts Key"
@@ -1926,7 +1931,7 @@ msgstr "アイテムショートカットキー"
 
 #: src/gui/setupactiondata.h:190
 msgid "Shortcuts keys"
-msgstr ""
+msgstr "ショートカットキー"
 
 #: src/gui/setupactiondata.h:195 src/gui/setupactiondata.h:200
 #: src/gui/setupactiondata.h:205 src/gui/setupactiondata.h:210
@@ -2028,7 +2033,7 @@ msgstr "豆知識窓"
 
 #: src/gui/setupactiondata.h:409
 msgid "Quests Window"
-msgstr ""
+msgstr "クエスト窓"
 
 #: src/gui/setupactiondata.h:414
 msgid "Previous Social Tab"
@@ -2040,15 +2045,15 @@ msgstr "次ソーシャルタブ"
 
 #: src/gui/setupactiondata.h:433
 msgid "Emote modifiers keys"
-msgstr ""
+msgstr "スマイリー編集キー"
 
 #: src/gui/setupactiondata.h:438
 msgid "Emote modifier key"
-msgstr ""
+msgstr "スマイリー編集キー"
 
 #: src/gui/setupactiondata.h:443
 msgid "Emote shortcuts"
-msgstr ""
+msgstr "スマイリーショートカット"
 
 #: src/gui/setupactiondata.h:448 src/gui/setupactiondata.h:453
 #: src/gui/setupactiondata.h:458 src/gui/setupactiondata.h:463
@@ -2080,7 +2085,7 @@ msgstr "スマイリーショートカット: %d"
 
 #: src/gui/setupactiondata.h:697
 msgid "Outfits keys"
-msgstr ""
+msgstr "服装キー"
 
 #: src/gui/setupactiondata.h:702
 msgid "Wear Outfit"
@@ -2096,7 +2101,7 @@ msgstr "装着品を服装にコピー"
 
 #: src/gui/setupactiondata.h:717
 msgid "Outfits shortcuts"
-msgstr ""
+msgstr "服装ショートカット"
 
 #: src/gui/setupactiondata.h:722 src/gui/setupactiondata.h:727
 #: src/gui/setupactiondata.h:732 src/gui/setupactiondata.h:737
@@ -2124,7 +2129,7 @@ msgstr ""
 #: src/gui/setupactiondata.h:952 src/gui/setupactiondata.h:957
 #, c-format
 msgid "Outfit Shortcut %d"
-msgstr ""
+msgstr "服装ショートカット %d"
 
 #: src/gui/setupactiondata.h:971
 msgid "Toggle Chat"
@@ -2268,11 +2273,11 @@ msgstr "モディファイアキー"
 
 #: src/gui/setupactiondata.h:1155
 msgid "Show onscreen keyboard"
-msgstr ""
+msgstr "オンスクリーンキーボード"
 
 #: src/gui/setupactiondata.h:1169
 msgid "Move Keys"
-msgstr ""
+msgstr "キーを移動"
 
 #: src/gui/setupactiondata.h:1174 src/gui/setupactiondata.h:1453
 msgid "Move Up"
@@ -2292,7 +2297,7 @@ msgstr "右へ移動"
 
 #: src/gui/setupactiondata.h:1194
 msgid "Move to navigation point shortcuts"
-msgstr ""
+msgstr "ナビポイントショートカットまで移動"
 
 #: src/gui/setupactiondata.h:1199 src/gui/setupactiondata.h:1204
 #: src/gui/setupactiondata.h:1209 src/gui/setupactiondata.h:1214
@@ -2320,7 +2325,7 @@ msgstr ""
 #: src/gui/setupactiondata.h:1429 src/gui/setupactiondata.h:1434
 #, c-format
 msgid "Move to point Shortcut %d"
-msgstr ""
+msgstr "ショートカット %dまで移動"
 
 #: src/gui/setupactiondata.h:1448
 msgid "Move & selection"
@@ -2328,47 +2333,47 @@ msgstr ""
 
 #: src/gui/setupactiondata.h:1473
 msgid "Move Home"
-msgstr ""
+msgstr "ホームへ移動"
 
 #: src/gui/setupactiondata.h:1478
 msgid "Move End"
-msgstr ""
+msgstr "最後まで移動"
 
 #: src/gui/setupactiondata.h:1483
 msgid "Page up"
-msgstr ""
+msgstr "ページ上へ"
 
 #: src/gui/setupactiondata.h:1488
 msgid "Page down"
-msgstr ""
+msgstr "ページ下へ"
 
 #: src/gui/setupactiondata.h:1498
 msgid "Select"
-msgstr ""
+msgstr "選択"
 
 #: src/gui/setupactiondata.h:1503
 msgid "Select2"
-msgstr ""
+msgstr "選択2"
 
 #: src/gui/setupactiondata.h:1518
 msgid "Backspace"
-msgstr ""
+msgstr "バックスペース"
 
 #: src/gui/setupactiondata.h:1523
 msgid "Insert"
-msgstr ""
+msgstr "挿入"
 
 #: src/gui/setupactiondata.h:1528
 msgid "Tab"
-msgstr ""
+msgstr "タブ"
 
 #: src/gui/setupactiondata.h:1533
 msgid "Mod"
-msgstr ""
+msgstr "モッド"
 
 #: src/gui/setupactiondata.h:1559
 msgid "Basic"
-msgstr ""
+msgstr "基本"
 
 #: src/gui/setupactiondata.h:1561 src/gui/windowmenu.cpp:146
 msgid "Shortcuts"
@@ -2380,11 +2385,11 @@ msgstr "ウィンドウ"
 
 #: src/gui/setupactiondata.h:1563
 msgid "Emotes"
-msgstr ""
+msgstr "スマイリー"
 
 #: src/gui/setupactiondata.h:1567
 msgid "Gui"
-msgstr ""
+msgstr "GUI"
 
 #: src/gui/setup_audio.cpp:46
 msgid "(no sound)"
@@ -2423,24 +2428,24 @@ msgid "Music volume"
 msgstr "音楽の音量"
 
 #: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
 msgstr ""
 
 #: src/gui/setup_audio.cpp:89
 msgid "Audio frequency"
-msgstr ""
+msgstr "周波数を自動設定"
 
 #: src/gui/setup_audio.cpp:92
 msgid "mono"
-msgstr ""
+msgstr "モノ"
 
 #: src/gui/setup_audio.cpp:93
 msgid "stereo"
-msgstr ""
+msgstr "ステレオ"
 
 #: src/gui/setup_audio.cpp:94
 msgid "surround"
-msgstr ""
+msgstr "サラウンド"
 
 #: src/gui/setup_audio.cpp:95
 msgid "surround+center+lfe"
@@ -2448,7 +2453,7 @@ msgstr ""
 
 #: src/gui/setup_audio.cpp:96
 msgid "Audio channels"
-msgstr ""
+msgstr "自動チャンネル"
 
 #: src/gui/setup_audio.cpp:100
 msgid "Sound effects"
@@ -2488,11 +2493,11 @@ msgstr "トレードリクエスト音"
 
 #: src/gui/setup_audio.cpp:126
 msgid "Show window sound"
-msgstr ""
+msgstr "窓の音を有効"
 
 #: src/gui/setup_audio.cpp:129
 msgid "Hide window sound"
-msgstr ""
+msgstr "窓の音を無効"
 
 #: src/gui/setup_audio.cpp:135
 msgid "Enable mumble voice chat"
@@ -2683,11 +2688,11 @@ msgstr "標準に戻す"
 
 #: src/gui/setup_input.cpp:101
 msgid "Reset all keys"
-msgstr ""
+msgstr "全てのキーをリセット"
 
 #: src/gui/setup_input.cpp:107
 msgid "Input"
-msgstr ""
+msgstr "入力"
 
 #: src/gui/setup_input.cpp:195
 msgid "Key Conflict(s) Detected."
@@ -2702,60 +2707,64 @@ msgstr ""
 "\"%s\"と\"%s\"キーが重複しています。 ゲームプレイに悪い影響が出るかもしれませ"
 "ん"
 
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
 msgid "Press the button to start calibration"
 msgstr "ボタンを押してカリブレーションを開始"
 
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
 msgid "Calibrate"
 msgstr "カリブレーション"
 
 #: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
 msgid "Enable joystick"
 msgstr "ジョイスティックを使用可能にする"
 
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
 msgid "Use joystick if client window inactive"
 msgstr "クライアントが無効の場合ジョイスティックを使用"
 
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
 msgid "Joystick"
 msgstr "ジョイスティック"
 
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
 msgid "Stop"
 msgstr "停止"
 
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
 msgid "Rotate the stick and don't press buttons"
 msgstr "ボタンは押さないでスティックを回転する"
 
 #: src/gui/setup_other.cpp:39
 msgid "Always show"
-msgstr ""
+msgstr "常に表示"
 
 #: src/gui/setup_other.cpp:40
 msgid "Auto hide in small resolution"
-msgstr ""
+msgstr "細かい解像度で隠す"
 
 #: src/gui/setup_other.cpp:41
 msgid "Always auto hide"
-msgstr ""
+msgstr "常に自動で隠す"
 
 #. TRANSLATORS: Proxy type selection
 #: src/gui/setup_other.cpp:49
 msgid "System proxy"
-msgstr ""
+msgstr "システムプロキシ"
 
 #. TRANSLATORS: Proxy type selection
 #: src/gui/setup_other.cpp:51
 msgid "Direct connection"
-msgstr ""
+msgstr "直接接続"
 
 #. TRANSLATORS: Proxy type selection
 #: src/gui/setup_other.cpp:58
 msgid "SOCKS5 hostname"
-msgstr ""
+msgstr "SOCKS5 ホスト名"
 
 #: src/gui/setup_other.cpp:66
 msgid "Misc"
@@ -2907,7 +2916,7 @@ msgstr "ショップモードを有効にする"
 
 #: src/gui/setup_other.cpp:189
 msgid "Cycle npc targets"
-msgstr ""
+msgstr "NPCターゲットを回転"
 
 #: src/gui/setup_other.cpp:192
 msgid "Log NPC dialogue"
@@ -2939,19 +2948,19 @@ msgstr ""
 
 #: src/gui/setup_other.cpp:218
 msgid "Shortcut buttons"
-msgstr ""
+msgstr "ショートカットボタン"
 
 #: src/gui/setup_other.cpp:222
 msgid "Proxy server"
-msgstr ""
+msgstr "プロキシサーバー"
 
 #: src/gui/setup_other.cpp:225
 msgid "Proxy type"
-msgstr ""
+msgstr "プロキシタイプ"
 
 #: src/gui/setup_other.cpp:228
 msgid "Proxy address:port"
-msgstr ""
+msgstr "プロキシアドレス:ポート"
 
 #: src/gui/setup_other.cpp:234
 msgid "Enable server side attack"
@@ -2971,11 +2980,11 @@ msgstr "デバッグログを有効にする"
 
 #: src/gui/setup_other.cpp:247
 msgid "Enable OpenGL log"
-msgstr ""
+msgstr "OpenGLログを有効にする"
 
 #: src/gui/setup_other.cpp:250
 msgid "Enable input log"
-msgstr ""
+msgstr "入力ログを有効にする"
 
 #: src/gui/setup_other.cpp:253
 msgid "Low traffic mode"
@@ -3030,7 +3039,7 @@ msgstr ""
 
 #: src/gui/setup_perfomance.cpp:75
 msgid "Enable texture sampler (OpenGL)"
-msgstr ""
+msgstr "テクスチャサンプラーを有効にする (OpenGL)"
 
 #: src/gui/setup_perfomance.cpp:79
 msgid "Better quality (disable for better perfomance)"
@@ -3254,7 +3263,7 @@ msgstr "インドネシア語"
 
 #: src/gui/setup_theme.cpp:135
 msgid "Italian"
-msgstr ""
+msgstr "イタリア語"
 
 #: src/gui/setup_theme.cpp:136
 msgid "Polish"
@@ -3327,7 +3336,7 @@ msgstr ""
 #. TRANSLATORS: button name with information about selected theme
 #: src/gui/setup_theme.cpp:227
 msgid "i"
-msgstr ""
+msgstr "i"
 
 #: src/gui/setup_theme.cpp:229
 msgid "Theme"
@@ -3335,7 +3344,7 @@ msgstr "テーマ"
 
 #: src/gui/setup_theme.cpp:394
 msgid "Theme info"
-msgstr ""
+msgstr "テーマ情報"
 
 #: src/gui/setup_theme.cpp:415
 msgid "Theme Changed"
@@ -3348,23 +3357,23 @@ msgstr "設定変更の為アプリケーションを再起動してください
 
 #: src/gui/setup_touch.cpp:34
 msgid "Small"
-msgstr ""
+msgstr "小"
 
 #: src/gui/setup_touch.cpp:36
 msgid "Medium"
-msgstr ""
+msgstr "中"
 
 #: src/gui/setup_touch.cpp:37
 msgid "Large"
-msgstr ""
+msgstr "大"
 
 #: src/gui/setup_touch.cpp:54
 msgid "Touch"
-msgstr ""
+msgstr "タッチ"
 
 #: src/gui/setup_touch.cpp:62
 msgid "Onscreen keyboard"
-msgstr ""
+msgstr "オンスクリーンキーボード"
 
 #: src/gui/setup_touch.cpp:64
 msgid "Show onscreen keyboard icon"
@@ -3376,36 +3385,36 @@ msgstr ""
 
 #: src/gui/setup_touch.cpp:72
 msgid "Onscreen joystick"
-msgstr ""
+msgstr "オンスクリーンジョイスティック"
 
 #: src/gui/setup_touch.cpp:74
 msgid "Show onscreen joystick"
-msgstr ""
+msgstr "オンスクリーンジョイスティックを表示"
 
 #: src/gui/setup_touch.cpp:77
 msgid "Joystick size"
-msgstr ""
+msgstr "ジョイスティックのサイズ"
 
 #: src/gui/setup_touch.cpp:81
 msgid "Onscreen buttons"
-msgstr ""
+msgstr "オンスクリーンボタン"
 
 #: src/gui/setup_touch.cpp:83
 msgid "Show onscreen buttons"
-msgstr ""
+msgstr "オンスクリーンボタンを表示"
 
 #: src/gui/setup_touch.cpp:86
 msgid "Buttons format"
-msgstr ""
+msgstr "ボタンフォーマット"
 
 #: src/gui/setup_touch.cpp:89
 msgid "Buttons size"
-msgstr ""
+msgstr "ボタンのサイズ"
 
 #: src/gui/setup_touch.cpp:92 src/gui/setup_touch.cpp:96
 #, c-format
 msgid "Button %u action"
-msgstr ""
+msgstr "ボタン %u アクション"
 
 #: src/gui/setup_video.cpp:180
 msgid "Software"
@@ -3421,7 +3430,7 @@ msgstr "セーフ OpenGL"
 
 #: src/gui/setup_video.cpp:185
 msgid "Mobile OpenGL"
-msgstr ""
+msgstr "モバイルOpenGL"
 
 #: src/gui/setup_video.cpp:222
 msgid "Full screen"
@@ -3429,7 +3438,7 @@ msgstr "フルスクリーン"
 
 #: src/gui/setup_video.cpp:225
 msgid "Show cursor"
-msgstr ""
+msgstr "カーソルを表示"
 
 #: src/gui/setup_video.cpp:227
 msgid "Custom cursor"
@@ -3574,7 +3583,7 @@ msgstr "マウスとキーボード入力をグラブ"
 
 #: src/gui/setup_visual.cpp:102
 msgid "Blurring textures (OpenGL)"
-msgstr ""
+msgstr "テクスチャーをぼかす (OpenGL)"
 
 #: src/gui/setup_visual.cpp:105
 msgid "Gui opacity"
@@ -3614,7 +3623,7 @@ msgstr "ガンマ"
 
 #: src/gui/setup_visual.cpp:135
 msgid "Enable gamma control"
-msgstr ""
+msgstr "ガンマコントロールを有効にする"
 
 #: src/gui/setup_visual.cpp:145
 msgid "Vsync"
@@ -3626,7 +3635,7 @@ msgstr ""
 
 #: src/gui/setup_visual.cpp:153
 msgid "Allow screensaver to run"
-msgstr ""
+msgstr "スクリーンセーバーを有効にする"
 
 #: src/gui/shopwindow.cpp:75
 msgid "Personal Shop"
@@ -3922,39 +3931,39 @@ msgstr "パーティ名を選んでください"
 msgid "Specials"
 msgstr "スペシャル"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
 #, c-format
 msgid "Money: %s"
 msgstr "GP: %s"
 
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
 #, c-format
 msgid "Job: %d"
 msgstr "ジョブ: %d"
 
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
 msgid "Job:"
 msgstr "ジョブポイント:"
 
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
 #, c-format
 msgid "Character points: %d"
 msgstr "キャラクターポイント: %d"
 
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
 #, c-format
 msgid "Correction points: %d"
 msgstr "修正点: %d"
@@ -4439,11 +4448,11 @@ msgstr "/kick > プレイヤーをギルドから追い出します"
 #. TRANSLATORS: Text under equipped items (should be small)
 #: src/gui/widgets/itemcontainer.cpp:310
 msgid "Eq."
-msgstr ""
+msgstr "装着"
 
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
 msgid "Open url"
-msgstr ""
+msgstr "URLを開く"
 
 #: src/gui/widgets/whispertab.cpp:103
 msgid "/ignore > Ignore the other player"
@@ -4493,12 +4502,12 @@ msgstr "オンラインリスト"
 #. TRANSLATORS: short button name for help window.
 #: src/gui/windowmenu.cpp:88
 msgid "HLP"
-msgstr ""
+msgstr "ヘルプ"
 
 #. TRANSLATORS: short button name for quests window.
 #: src/gui/windowmenu.cpp:91
 msgid "QE"
-msgstr ""
+msgstr "QE"
 
 #. TRANSLATORS: short button name for bot checker window.
 #: src/gui/windowmenu.cpp:94
@@ -4545,7 +4554,7 @@ msgstr "INV"
 #. TRANSLATORS: short button name for map window.
 #: src/gui/windowmenu.cpp:122
 msgid "MAP"
-msgstr ""
+msgstr "地図"
 
 #. TRANSLATORS: short button name for skills window.
 #: src/gui/windowmenu.cpp:128
@@ -4627,7 +4636,7 @@ msgstr "キー_%d"
 #: src/inputmanager.cpp:314
 #, c-format
 msgid "JButton%d"
-msgstr ""
+msgstr "ジョイスティックボタン%d"
 
 #: src/inputmanager.cpp:326
 msgid "unknown key"
@@ -4637,7 +4646,7 @@ msgstr "不明なキー"
 #: src/inputmanager.cpp:353
 #, c-format
 msgid "JB%d"
-msgstr ""
+msgstr "JB%d"
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
 #: src/inputmanager.cpp:365 src/keyboardconfig.cpp:97
@@ -4772,7 +4781,7 @@ msgstr "(a) 弓師攻撃範囲"
 
 #: src/localplayer.cpp:1970
 msgid "(B) moves to target in attack range - 1"
-msgstr ""
+msgstr "(B) 攻撃範囲 - 1のターゲットまで移動"
 
 #: src/localplayer.cpp:1971
 msgid "(?) move to target"
@@ -5504,7 +5513,7 @@ msgstr "ユーザ名は既に使用されています"
 
 #: src/net/ea/loginhandler.cpp:268
 msgid "Incorrect email."
-msgstr ""
+msgstr "メールアドレスが違います"
 
 #: src/net/ea/loginhandler.cpp:271
 msgid "Username permanently erased."
@@ -5904,54 +5913,54 @@ msgstr "防御力"
 msgid "Intelligence"
 msgstr "魔力"
 
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
 msgid "Dexterity"
 msgstr "命中率"
 
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
 msgid "Luck"
 msgstr "幸運"
 
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
 msgid "Defense"
 msgstr "Defense"
 
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
 msgid "M.Attack"
 msgstr "M.Attack"
 
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
 msgid "M.Defense"
 msgstr "M.Defense"
 
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evade"
 
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
 #, no-c-format
 msgid "% Critical"
 msgstr "% Critical"
 
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Delay"
 msgstr "攻撃遅延"
 
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
 msgid "Walk Delay"
 msgstr " 徒歩遅延"
 
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
 msgid "Attack Range"
 msgstr "攻撃距離"
 
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
 msgid "Damage per sec."
 msgstr "ダメージ/秒"