summaryrefslogtreecommitdiff
path: root/po/ja.po
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-24 16:18:35 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-24 16:27:49 +0300
commit6a1900fb7f0d6f1ffbcb9847c46a16cbb3b20535 (patch)
tree6b2ba8aa582834113fca95db5cf952b843738c31 /po/ja.po
parent013889b7021cf5e7c564e5e28521a2bbf305cd9f (diff)
downloadplus-6a1900fb7f0d6f1ffbcb9847c46a16cbb3b20535.tar.gz
plus-6a1900fb7f0d6f1ffbcb9847c46a16cbb3b20535.tar.bz2
plus-6a1900fb7f0d6f1ffbcb9847c46a16cbb3b20535.tar.xz
plus-6a1900fb7f0d6f1ffbcb9847c46a16cbb3b20535.zip
Update translations.
Diffstat (limited to 'po/ja.po')
-rw-r--r--po/ja.po1426
1 files changed, 788 insertions, 638 deletions
diff --git a/po/ja.po b/po/ja.po
index 22cffb77f..1e3aec69f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR The ManaPlus Developers
# This file is distributed under the same license as the PACKAGE package.
-#
+#
# Translators:
# Andrei Karas <akaras@inbox.ru>, 2011
# Candy <HarajukuCupcakes@gmail.com>, 2013
@@ -14,18 +14,19 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-05-18 23:50+0300\n"
+"POT-Creation-Date: 2017-06-24 16:27+0300\n"
"PO-Revision-Date: 2017-05-19 01:32+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
+"ja/)\n"
+"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:166
+#: src/actions/actions.cpp:171
msgid "File uploaded"
msgstr ""
@@ -37,15 +38,15 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:169 src/client.cpp:1626 src/client.cpp:1661
+#: src/actions/actions.cpp:174 src/client.cpp:1643 src/client.cpp:1678
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:186
#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
#: src/gui/widgets/tabs/setup_theme.cpp:314
#: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:260
-#: src/gui/widgets/tabs/setup_video.cpp:289
-#: src/gui/widgets/tabs/setup_video.cpp:408
-#: src/gui/widgets/tabs/setup_video.cpp:424
+#: src/gui/widgets/tabs/setup_video.cpp:258
+#: src/gui/widgets/tabs/setup_video.cpp:287
+#: src/gui/widgets/tabs/setup_video.cpp:406
+#: src/gui/widgets/tabs/setup_video.cpp:422
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
@@ -54,69 +55,69 @@ msgstr ""
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:209
#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:244 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/registerdialog.cpp:245 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
-#: src/net/eathena/charserverrecv.cpp:458
-#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:421
+#: src/net/eathena/charserverrecv.cpp:456
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
msgid "OK"
msgstr "OK"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1052 src/actions/actions.cpp:1065
+#: src/actions/actions.cpp:1071 src/actions/actions.cpp:1084
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1237 src/actions/actions.cpp:1243
+#: src/actions/actions.cpp:1256 src/actions/actions.cpp:1262
#, c-format
msgid "Client uptime: %s"
msgstr "クライアントの稼働時間: %s"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1300 src/actions/actions.cpp:1309
+#: src/actions/actions.cpp:1319 src/actions/actions.cpp:1328
msgid "Resource images:"
msgstr "リソースイメージ:"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1303 src/actions/actions.cpp:1313
+#: src/actions/actions.cpp:1322 src/actions/actions.cpp:1332
msgid "Resource orphaned images:"
msgstr "リソース孤児イメージ:"
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1410
+#: src/actions/actions.cpp:1429
msgid "Environment variables dumped"
msgstr ""
#. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1545
+#: src/actions/actions.cpp:1564
msgid "Uploaded config into:"
msgstr ""
#. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1555
+#: src/actions/actions.cpp:1574
msgid "Uploaded server config into:"
msgstr ""
#. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1565
+#: src/actions/actions.cpp:1584
msgid "Uploaded log into:"
msgstr ""
#. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1786
+#: src/actions/actions.cpp:1826
msgid ""
"Last seen disabled. Enable in players / collect players id and seen log."
msgstr ""
#. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1805 src/actions/actions.cpp:1819
+#: src/actions/actions.cpp:1845 src/actions/actions.cpp:1859
msgid "You not saw this nick."
msgstr ""
#. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1811
+#: src/actions/actions.cpp:1851
#, c-format
msgid "Last seen for %s: %s"
msgstr ""
@@ -127,7 +128,7 @@ msgid "Cannot send empty whisper or channel message!"
msgstr ""
#. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:323
+#: src/actions/chat.cpp:326
#, c-format
msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
msgstr ""
@@ -135,14 +136,14 @@ msgstr ""
#. TRANSLATORS: dialog header
#. TRANSLATORS: popup menu item
#. TRANSLATORS: create party
-#: src/actions/chat.cpp:348 src/gui/popups/popupmenu.cpp:3248
+#: src/actions/chat.cpp:351 src/gui/popups/popupmenu.cpp:3195
msgid "Create party"
msgstr ""
#. TRANSLATORS: dialog header
#. TRANSLATORS: popup menu item
#. TRANSLATORS: create guild
-#: src/actions/chat.cpp:370 src/gui/popups/popupmenu.cpp:3264
+#: src/actions/chat.cpp:373 src/gui/popups/popupmenu.cpp:3211
msgid "Create guild"
msgstr ""
@@ -150,211 +151,211 @@ msgstr ""
#. TRANSLATORS: guild invite message
#. TRANSLATORS: party kick message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:393 src/actions/chat.cpp:427 src/actions/chat.cpp:433
-#: src/actions/chat.cpp:506 src/actions/chat.cpp:541
-#: src/actions/commands.cpp:97
+#: src/actions/chat.cpp:396 src/actions/chat.cpp:430 src/actions/chat.cpp:436
+#: src/actions/chat.cpp:509 src/actions/chat.cpp:544
+#: src/actions/commands.cpp:101
msgid "Please specify a name."
msgstr "名前を入力してください."
#. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:454
+#: src/actions/chat.cpp:457
msgid "Return toggles chat."
msgstr "改行キーでチャット入力ができます."
-#: src/actions/chat.cpp:454
+#: src/actions/chat.cpp:457
msgid "Message closes chat."
msgstr "チャットを閉じます."
#. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:466
+#: src/actions/chat.cpp:469
msgid "Return now toggles chat."
msgstr "改行キーでチャット入力ができます."
#. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:476
+#: src/actions/chat.cpp:479
msgid "Message now closes chat."
msgstr "チャットを閉じます."
#. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:629
+#: src/actions/chat.cpp:632
msgid "no hat equipped."
msgstr ""
#. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:635
+#: src/actions/chat.cpp:638
#, c-format
msgid "equipped hat %s."
msgstr ""
#. TRANSLATORS: dialog header
-#: src/actions/chat.cpp:663
+#: src/actions/chat.cpp:666
msgid "Guild notice"
msgstr ""
#. TRANSLATORS: translation error message
-#: src/actions/chat.cpp:712
+#: src/actions/chat.cpp:715
#, c-format
msgid "No translation found for string: %s"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:139
+#: src/actions/commands.cpp:143
#, c-format
msgid "Player already %s!"
msgstr "プレイヤーは既に%s!"
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:156
#, c-format
msgid "Player successfully %s!"
msgstr "プレイヤーの%sに成功しました!"
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:154
+#: src/actions/commands.cpp:158
#, c-format
msgid "Player could not be %s!"
msgstr "プレイヤーを%sできなかった!"
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:189
+#: src/actions/commands.cpp:193
msgid "Player wasn't ignored!"
msgstr "プレイヤーを完全無視できませんでした!"
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:202
msgid "Player no longer ignored!"
msgstr "プレイヤーを完全無視解除しました!"
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:200
+#: src/actions/commands.cpp:204
msgid "Player could not be unignored!"
msgstr "プレイヤーを完全無視解除できませんでした!"
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:219
msgid "Player already erased!"
msgstr "プレイヤーは削除されています!"
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:232
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:234
msgid "Player could not be erased!"
msgstr "プレイヤーを削除できませんでした!"
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:241
msgid "friend"
msgstr "友達"
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:248
msgid "disregarded"
msgstr "無視"
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:255
msgid "neutral"
msgstr "中性"
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:262
msgid "blacklisted"
msgstr "ブラックリスト化されています"
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:265
+#: src/actions/commands.cpp:269
msgid "enemy"
msgstr "敵"
#. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:557
+#: src/actions/commands.cpp:567
msgid "Quick message"
msgstr ""
#. TRANSLATORS: dialog header
-#: src/actions/commands.cpp:904
+#: src/actions/commands.cpp:913
msgid "Rename your homun"
msgstr ""
#. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1082
+#: src/actions/commands.cpp:1091
#, c-format
msgid "Config value: %s"
msgstr ""
#. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1095
+#: src/actions/commands.cpp:1104
#, c-format
msgid "Server config value: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/actions/commands.cpp:1710 src/resources/notifications.h:212
+#: src/actions/commands.cpp:1755 src/resources/notifications.h:212
msgid "Item sharing enabled."
msgstr "アイテム共有モード有効."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/actions/commands.cpp:1715 src/resources/notifications.h:216
+#: src/actions/commands.cpp:1760 src/resources/notifications.h:216
msgid "Item sharing disabled."
msgstr "アイテム共有モード無効."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/actions/commands.cpp:1720 src/resources/notifications.h:220
+#: src/actions/commands.cpp:1765 src/resources/notifications.h:220
msgid "Item sharing not possible."
msgstr "アイテム共有モード不可能."
#. TRANSLATORS: chat message
-#: src/actions/commands.cpp:1725
+#: src/actions/commands.cpp:1770
msgid "Item sharing unknown."
msgstr "アイテム共有モード不明."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/actions/commands.cpp:1776 src/resources/notifications.h:200
+#: src/actions/commands.cpp:1821 src/resources/notifications.h:200
msgid "Experience sharing enabled."
msgstr "Expシェアモード有効."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/actions/commands.cpp:1781 src/resources/notifications.h:204
+#: src/actions/commands.cpp:1826 src/resources/notifications.h:204
msgid "Experience sharing disabled."
msgstr "Expシェアモード無効."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/actions/commands.cpp:1786 src/resources/notifications.h:208
+#: src/actions/commands.cpp:1831 src/resources/notifications.h:208
msgid "Experience sharing not possible."
msgstr "Expシェアモード不可能."
#. TRANSLATORS: chat message
-#: src/actions/commands.cpp:1791
+#: src/actions/commands.cpp:1836
msgid "Experience sharing unknown."
msgstr "Expシェアモード不明."
#. TRANSLATORS: chat message
-#: src/actions/commands.cpp:1842
+#: src/actions/commands.cpp:1887
msgid "Auto item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
-#: src/actions/commands.cpp:1847
+#: src/actions/commands.cpp:1892
msgid "Auto item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
-#: src/actions/commands.cpp:1852
+#: src/actions/commands.cpp:1897
msgid "Auto item sharing not possible."
msgstr ""
#. TRANSLATORS: chat message
-#: src/actions/commands.cpp:1857
+#: src/actions/commands.cpp:1902
msgid "Auto item sharing unknown."
msgstr ""
@@ -364,47 +365,47 @@ msgid "Rename your pet"
msgstr ""
#. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:177
+#: src/actions/statusbar.cpp:180
msgid "Ignoring incoming trade requests"
msgstr "トレードリクエストを無効にしています"
#. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:187
+#: src/actions/statusbar.cpp:190
msgid "Accepting incoming trade requests"
msgstr "トレードリクエストを有効にしました"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:312 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:314 src/gui/widgets/tabs/setup_quick.cpp:45
msgid "Quick"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1584
+#: src/actormanager.cpp:1591
msgid "Visible on map"
msgstr "マップに表示させる"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:465
+#: src/being/being.cpp:469
msgid "Human"
msgstr "人間"
#. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:661
+#: src/being/being.cpp:665
msgid "dodge"
msgstr "ドッジ"
-#: src/being/being.cpp:661
+#: src/being/being.cpp:665
msgid "miss"
msgstr "ミス"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2439 src/gui/windows/whoisonline.cpp:894
+#: src/being/being.cpp:2448 src/gui/windows/whoisonline.cpp:896
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2444 src/gui/windows/whoisonline.cpp:899
+#: src/being/being.cpp:2453 src/gui/windows/whoisonline.cpp:901
msgid "I"
msgstr "I"
@@ -497,31 +498,31 @@ msgid "mana"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:2310
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2313 src/being/localplayer.cpp:2338
+#: src/being/localplayer.cpp:2316 src/being/localplayer.cpp:2341
msgid "Follow canceled"
msgstr "フォローを止める"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2323
+#: src/being/localplayer.cpp:2326
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2329 src/being/localplayer.cpp:2343
+#: src/being/localplayer.cpp:2332 src/being/localplayer.cpp:2346
msgid "Imitation canceled"
msgstr "真似をやめる"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2699
+#: src/being/localplayer.cpp:2704
#, c-format
msgid "You see %s"
msgstr ""
@@ -531,69 +532,69 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:477 src/gui/popups/popupmenu.cpp:2456
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/being/playerrelations.cpp:491 src/gui/popups/popupmenu.cpp:2403
+#: src/gui/popups/popupmenu.cpp:2445
msgid "Completely ignore"
msgstr "完全無視"
#. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:496
+#: src/being/playerrelations.cpp:510
msgid "Print '...'"
msgstr "'...'を表示する"
#. TRANSLATORS: ignore/unignore action
-#: src/being/playerrelations.cpp:521
+#: src/being/playerrelations.cpp:535
msgid "Blink name"
msgstr "名前を点灯させる"
#. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:572
+#: src/being/playerrelations.cpp:586
msgid "Floating '...' bubble"
msgstr "フローティング'...'吹出し"
#. TRANSLATORS: ignore strategi
-#: src/being/playerrelations.cpp:576
+#: src/being/playerrelations.cpp:590
msgid "Floating bubble"
msgstr "吹出し"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: long button name for setup window.
#. TRANSLATORS: setup window name
-#: src/client.cpp:919 src/dyetool/client.cpp:509 src/gui/windowmenu.cpp:192
+#: src/client.cpp:933 src/dyetool/client.cpp:521 src/gui/windowmenu.cpp:197
#: src/gui/windows/setupwindow.cpp:66
msgid "Setup"
msgstr "設定"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:922 src/dyetool/client.cpp:512
+#: src/client.cpp:936 src/dyetool/client.cpp:524
#: src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:925 src/dyetool/client.cpp:515
-#: src/gui/widgets/tabs/setup_video.cpp:111
+#: src/client.cpp:939 src/dyetool/client.cpp:527
+#: src/gui/widgets/tabs/setup_video.cpp:109
msgid "Video"
msgstr "ビデオ"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:928 src/dyetool/client.cpp:518
+#: src/client.cpp:942 src/dyetool/client.cpp:530
#: src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "テーマ"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:931 src/dyetool/client.cpp:521
+#: src/client.cpp:945 src/dyetool/client.cpp:533
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: long button name for help window.
#. TRANSLATORS: help window name
-#: src/client.cpp:934 src/dyetool/client.cpp:524 src/gui/windowmenu.cpp:75
+#: src/client.cpp:948 src/dyetool/client.cpp:536 src/gui/windowmenu.cpp:75
#: src/gui/windows/helpwindow.cpp:56
msgid "Help"
msgstr "ヘルプ"
@@ -614,10 +615,10 @@ msgstr "ヘルプ"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:938 src/client.cpp:1540 src/client.cpp:1559
-#: src/dyetool/client.cpp:528 src/gui/dialogsmanager.cpp:117
-#: src/gui/popups/popupmenu.cpp:765 src/gui/popups/popupmenu.cpp:850
-#: src/gui/popups/popupmenu.cpp:1104 src/gui/windows/didyouknowwindow.cpp:84
+#: src/client.cpp:952 src/client.cpp:1557 src/client.cpp:1576
+#: src/dyetool/client.cpp:540 src/gui/dialogsmanager.cpp:117
+#: src/gui/popups/popupmenu.cpp:766 src/gui/popups/popupmenu.cpp:855
+#: src/gui/popups/popupmenu.cpp:1110 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:272
#: src/gui/windows/inventorywindow.cpp:295
#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -627,32 +628,32 @@ msgid "Close"
msgstr "閉じる"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1163
+#: src/client.cpp:1180
msgid "Connecting to server"
msgstr "サーバーに接続しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221 src/gui/windowmanager_unittest.cc:701
+#: src/client.cpp:1238 src/gui/windowmanager_unittest.cc:795
msgid "Logging in"
msgstr "ログインしています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1271
+#: src/client.cpp:1288
msgid "Entering game world"
msgstr "ゲームの世界に移動しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1425
+#: src/client.cpp:1442
msgid "Requesting characters"
msgstr "キャラクターを呼び出しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1468
+#: src/client.cpp:1485
msgid "Connecting to the game server"
msgstr "ゲームサーバーに接続しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1480
+#: src/client.cpp:1497
msgid "Changing game servers"
msgstr "ゲームサーバーを変更しています"
@@ -668,41 +669,41 @@ msgstr "ゲームサーバーを変更しています"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1537 src/client.cpp:1556 src/client.cpp:1761
+#: src/client.cpp:1554 src/client.cpp:1573 src/client.cpp:1778
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
#: src/gui/windows/charselectdialog.cpp:301
#: src/gui/windows/editserverdialog.cpp:204
-#: src/gui/windows/registerdialog.cpp:244 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:396
-#: src/net/eathena/charserverrecv.cpp:400
-#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
+#: src/gui/windows/registerdialog.cpp:245 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:394
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:480 src/net/tmwa/charserverrecv.cpp:299
msgid "Error"
msgstr "エラー"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1575
+#: src/client.cpp:1592
msgid "Requesting registration details"
msgstr "登録内容を呼び出しています"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1622
+#: src/client.cpp:1639
msgid "Password Change"
msgstr "パスワード変更"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1624
+#: src/client.cpp:1641
msgid "Password changed successfully!"
msgstr "パスワードを変更しました!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1657
+#: src/client.cpp:1674
msgid "Email Change"
msgstr "メールアドレス変更"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1659
+#: src/client.cpp:1676
msgid "Email changed successfully!"
msgstr "メールアドレスを変更しました!"
@@ -794,7 +795,9 @@ msgstr ""
#. TRANSLATORS: command line help
#: src/commandline.cpp:90
msgid " -D --default : Choose default character server and character"
-msgstr " -D --default : デフォルトで使用するキャラクターサーバーとキャラクターを選択する"
+msgstr ""
+" -D --default : デフォルトで使用するキャラクターサーバーとキャラク"
+"ターを選択する"
#. TRANSLATORS: command line help
#: src/commandline.cpp:94
@@ -829,7 +832,8 @@ msgstr ""
#. TRANSLATORS: command line help
#: src/commandline.cpp:113
msgid " -T --tests : Start testing drivers and auto configuring"
-msgstr " -T --tests : ドライバーと自動コンフィグレーションのテストを始める"
+msgstr ""
+" -T --tests : ドライバーと自動コンフィグレーションのテストを始める"
#. TRANSLATORS: command line help
#: src/commandline.cpp:119
@@ -837,59 +841,59 @@ msgid " -O --no-opengl : Disable OpenGL for this session"
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/configmanager.cpp:61 src/dirs.cpp:357 src/dirs.cpp:372 src/dirs.cpp:422
+#: src/configmanager.cpp:61 src/dirs.cpp:366 src/dirs.cpp:381 src/dirs.cpp:431
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%sは存在しない為、作成できません."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:469
+#: src/dirs.cpp:478
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:502 src/dirs.cpp:511
+#: src/dirs.cpp:511 src/dirs.cpp:520
msgid "Error creating updates directory!"
msgstr "更新フォルダの作成エラ!"
#. TRANSLATORS: directory creation error
-#: src/dirs.cpp:533 src/dirs.cpp:554
+#: src/dirs.cpp:542 src/dirs.cpp:563
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "エラー: %s は存在しない為、作成できません."
#. TRANSLATORS: directory creation error
-#: src/dirs.cpp:585 src/dirs.cpp:593 src/dirs.cpp:601
+#: src/dirs.cpp:594 src/dirs.cpp:602 src/dirs.cpp:610
#, c-format
msgid "%s doesn't exist and can't be created!"
msgstr ""
#. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:54
+#: src/dyetool/dyemain.cpp:57
msgid "dyecmd srcfile dyestring dstfile"
msgstr ""
#. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:56
+#: src/dyetool/dyemain.cpp:59
msgid "or"
msgstr ""
#. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:58
+#: src/dyetool/dyemain.cpp:61
msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:265 src/gui/windows/chatwindow.cpp:2158
+#: src/game.cpp:265 src/gui/windows/chatwindow.cpp:2166
msgid "General"
msgstr "一般"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: long button name for debug window.
#. TRANSLATORS: debug window name
-#: src/game.cpp:272 src/gui/windowmenu.cpp:177
+#: src/game.cpp:272 src/gui/windowmenu.cpp:182
#: src/gui/windows/debugwindow.cpp:43
msgid "Debug"
msgstr "デバッグ"
@@ -1319,15 +1323,14 @@ msgstr "メッセージ"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2834
+#: src/gui/dialogsmanager.cpp:149 src/gui/popups/popupmenu.cpp:2781
msgid "Revive"
msgstr ""
#. TRANSLATORS: weight message
#: src/gui/dialogsmanager.cpp:182
msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
msgstr "インベントリーが体重の半分以上の為、体力は回復できません."
#. TRANSLATORS: weight message
@@ -1344,8 +1347,7 @@ msgstr "インベントリーが体重の半分以下になった為、体力は
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:665
-#: src/gui/windows/serverdialog.cpp:602
+#: src/gui/windows/equipmentwindow.cpp:665 src/gui/windows/serverdialog.cpp:669
msgid "default"
msgstr "デフォルト"
@@ -1506,8 +1508,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:47 src/gui/popups/popupmenu.cpp:1982
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:47 src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:2011 src/gui/widgets/tabs/socialtabbase.h:50
msgid "(default)"
msgstr "(デフォルト)"
@@ -1682,6 +1684,16 @@ msgstr "ブラックリスト化されています"
msgid "Enemy"
msgstr "敵"
+#. TRANSLATORS: server license comment
+#: src/gui/models/serverslistmodel.h:76
+msgid "(NON FREE)"
+msgstr ""
+
+#. TRANSLATORS: server license comment
+#: src/gui/models/serverslistmodel.h:82
+msgid "(UNKNOWN)"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
#: src/gui/models/sortlistmodelbuy.h:33
msgid "unsorted"
@@ -1818,7 +1830,7 @@ msgstr ""
#. TRANSLATORS: skill level
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2255
#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
#: src/gui/windows/statuswindow.cpp:73 src/gui/windows/statuswindow.cpp:271
#: src/gui/windows/statuswindow.cpp:366
@@ -1864,9 +1876,9 @@ msgstr ""
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
#. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:931
#: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:373
+#: src/resources/inventory/inventory.cpp:375
msgid "Trade"
msgstr "トレード"
@@ -1879,7 +1891,7 @@ msgstr "トレード"
#. TRANSLATORS: input action name
#. TRANSLATORS: Skill type
#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:299
-#: src/gui/popups/popupmenu.cpp:929 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:934 src/input/pages/basic.cpp:40
#: src/resources/skill/skilltypelist.h:35
msgid "Attack"
msgstr "攻撃"
@@ -1891,35 +1903,35 @@ msgstr "攻撃"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
#: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:273
-#: src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:553
msgid "Whisper"
msgstr "ささやく"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:187 src/gui/popups/popupmenu.cpp:934
-#: src/gui/popups/popupmenu.cpp:2899
+#: src/gui/popups/popupmenu.cpp:187 src/gui/popups/popupmenu.cpp:939
+#: src/gui/popups/popupmenu.cpp:2846
msgid "Heal"
msgstr "HP回復"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:207 src/gui/popups/popupmenu.cpp:223
-#: src/gui/popups/popupmenu.cpp:603 src/gui/popups/popupmenu.cpp:962
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:968
msgid "Kick from guild"
msgstr "ギルドから一時的に追い出す"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:214 src/gui/popups/popupmenu.cpp:230
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:969
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:975
msgid "Change pos in guild"
msgstr "ギルドでの役割を変更"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:622
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:623
+#: src/gui/popups/popupmenu.cpp:989
msgid "Invite to guild"
msgstr "ギルドへ招待"
@@ -1927,7 +1939,7 @@ msgstr "ギルドへ招待"
#. TRANSLATORS: set player invisible for self by id
#. TRANSLATORS: popup menu item
#. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2817
msgid "Nuke"
msgstr "消す"
@@ -1945,8 +1957,8 @@ msgstr "消す"
#. TRANSLATORS: move to player location
#. TRANSLATORS: input tab sub tab name
#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:287
-#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:751
-#: src/gui/popups/popupmenu.cpp:941 src/gui/popups/popupmenu.cpp:1010
+#: src/gui/popups/popupmenu.cpp:585 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:946 src/gui/popups/popupmenu.cpp:1016
#: src/gui/setupinputpages.cpp:48
msgid "Move"
msgstr "動く"
@@ -1970,7 +1982,7 @@ msgstr "話す"
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
#. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2476
#: src/gui/windows/buydialog.cpp:210 src/gui/windows/buydialog.cpp:233
#: src/gui/windows/buydialog.cpp:257 src/gui/windows/buydialog.cpp:335
#: src/gui/windows/buydialog.cpp:339 src/gui/windows/buyselldialog.cpp:73
@@ -1989,9 +2001,9 @@ msgstr "買う"
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
#. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2541
-#: src/gui/widgets/selldialog.cpp:57 src/gui/widgets/selldialog.cpp:113
-#: src/gui/widgets/selldialog.cpp:151 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/widgets/selldialog.cpp:57 src/gui/widgets/selldialog.cpp:114
+#: src/gui/widgets/selldialog.cpp:152 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/shopwindow.cpp:169 src/input/pages/basic.cpp:256
#: src/resources/db/npcdb.cpp:168
msgid "Sell"
@@ -2001,8 +2013,8 @@ msgstr "売る"
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:563
-#: src/gui/popups/popupmenu.cpp:2639
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:564
+#: src/gui/popups/popupmenu.cpp:2586
msgid "Add comment"
msgstr "コメントをする"
@@ -2028,12 +2040,14 @@ msgstr "攻撃リストへ追加する"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2608
msgid "Add to ignore list"
msgstr "攻撃無視リストへ追加する"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: Mercenary move to master
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: homunculus move to master
#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
msgid "Move to master"
msgstr ""
@@ -2059,7 +2073,7 @@ msgstr ""
#. TRANSLATORS: character rename button
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/charselectdialog.cpp:109
+#: src/gui/popups/popupmenu.cpp:709 src/gui/windows/charselectdialog.cpp:109
#: src/gui/windows/shopwindow.cpp:193
msgid "Rename"
msgstr "名前を変更する"
@@ -2068,7 +2082,7 @@ msgstr "名前を変更する"
#. TRANSLATORS: delete homunculus
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:2873
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:2820
msgid "Kill"
msgstr ""
@@ -2095,7 +2109,7 @@ msgstr "取外す"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:117
+#: src/gui/popups/popupmenu.cpp:403 src/resources/db/petdb.cpp:117
msgid "Return to egg"
msgstr ""
@@ -2103,7 +2117,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:631
msgid "Add name to chat"
msgstr "名前をチャットへ追加する"
@@ -2123,27 +2137,27 @@ msgstr "名前をチャットへ追加する"
#. TRANSLATORS: text dialog button
#. TRANSLATORS: updater window button
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:445 src/gui/popups/popupmenu.cpp:529
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:688
-#: src/gui/popups/popupmenu.cpp:723 src/gui/popups/popupmenu.cpp:770
-#: src/gui/popups/popupmenu.cpp:803 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1025 src/gui/popups/popupmenu.cpp:1052
-#: src/gui/popups/popupmenu.cpp:1090 src/gui/popups/popupmenu.cpp:1154
-#: src/gui/popups/popupmenu.cpp:1699 src/gui/popups/popupmenu.cpp:1739
-#: src/gui/popups/popupmenu.cpp:1797 src/gui/popups/popupmenu.cpp:1846
-#: src/gui/popups/popupmenu.cpp:1887 src/gui/popups/popupmenu.cpp:1958
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2077
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2131
-#: src/gui/popups/popupmenu.cpp:2153 src/gui/popups/popupmenu.cpp:2179
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2234
-#: src/gui/popups/popupmenu.cpp:2282 src/gui/popups/popupmenu.cpp:2317
-#: src/gui/popups/popupmenu.cpp:2359 src/gui/popups/popupmenu.cpp:2679
-#: src/gui/popups/popupmenu.cpp:2807 src/gui/popups/popupmenu.cpp:3009
-#: src/gui/popups/popupmenu.cpp:3168 src/gui/popups/popupmenu.cpp:3200
-#: src/gui/popups/popupmenu.cpp:3276 src/gui/popups/popupmenu.cpp:3290
-#: src/gui/popups/popupmenu.cpp:3300 src/gui/popups/popupmenu.cpp:3310
-#: src/gui/popups/popupmenu.cpp:3320 src/gui/popups/popupmenu.cpp:3330
-#: src/gui/popups/popupmenu.cpp:3340 src/gui/windows/buyselldialog.cpp:77
+#: src/gui/popups/popupmenu.cpp:446 src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:635 src/gui/popups/popupmenu.cpp:689
+#: src/gui/popups/popupmenu.cpp:724 src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:804 src/gui/popups/popupmenu.cpp:829
+#: src/gui/popups/popupmenu.cpp:1031 src/gui/popups/popupmenu.cpp:1058
+#: src/gui/popups/popupmenu.cpp:1096 src/gui/popups/popupmenu.cpp:1160
+#: src/gui/popups/popupmenu.cpp:1646 src/gui/popups/popupmenu.cpp:1686
+#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1793
+#: src/gui/popups/popupmenu.cpp:1834 src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1988 src/gui/popups/popupmenu.cpp:2024
+#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2078
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2126
+#: src/gui/popups/popupmenu.cpp:2144 src/gui/popups/popupmenu.cpp:2181
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2264
+#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/popups/popupmenu.cpp:2956
+#: src/gui/popups/popupmenu.cpp:3115 src/gui/popups/popupmenu.cpp:3147
+#: src/gui/popups/popupmenu.cpp:3223 src/gui/popups/popupmenu.cpp:3237
+#: src/gui/popups/popupmenu.cpp:3247 src/gui/popups/popupmenu.cpp:3257
+#: src/gui/popups/popupmenu.cpp:3267 src/gui/popups/popupmenu.cpp:3277
+#: src/gui/popups/popupmenu.cpp:3287 src/gui/windows/buyselldialog.cpp:77
#: src/gui/windows/changeemaildialog.cpp:56
#: src/gui/windows/changepassworddialog.cpp:58
#: src/gui/windows/charcreatedialog.cpp:114
@@ -2158,20 +2172,20 @@ msgstr "キャンセル"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:506 src/gui/widgets/tabs/setup_players.cpp:72
+#: src/gui/popups/popupmenu.cpp:507 src/gui/widgets/tabs/setup_players.cpp:72
msgid "Players"
msgstr "プレイヤー"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:575 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/popups/popupmenu.cpp:2607
+#: src/gui/popups/popupmenu.cpp:576 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2554
msgid "Kick from party"
msgstr "パーティから一時的に追い出す"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:669 src/gui/popups/popupmenu.cpp:678
msgid "Pick up"
msgstr "拾う"
@@ -2181,14 +2195,14 @@ msgstr "拾う"
#. TRANSLATORS: copy selected outfit to chat input
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:787
-#: src/gui/popups/popupmenu.cpp:1695 src/gui/popups/popupmenu.cpp:1782
-#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:2105
+#: src/gui/popups/popupmenu.cpp:683 src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:1642 src/gui/popups/popupmenu.cpp:1729
+#: src/gui/popups/popupmenu.cpp:1777 src/gui/popups/popupmenu.cpp:2052
msgid "Add to chat"
msgstr "チャットに追加"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:741
+#: src/gui/popups/popupmenu.cpp:706 src/gui/popups/popupmenu.cpp:742
msgid "Map Item"
msgstr "マップアイテム"
@@ -2198,28 +2212,28 @@ msgstr "マップアイテム"
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:711 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:712 src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:2020
msgid "Remove"
msgstr "削除"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
#. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:747
+#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:748
#: src/net/eathena/skillrecv.cpp:435
msgid "Warp"
msgstr "ワープ"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:755
msgid "Move camera"
msgstr "カメラを動かす"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:760
msgid "Restore camera"
msgstr ""
@@ -2228,7 +2242,7 @@ msgstr ""
#. TRANSLATORS: long button name for outfits window.
#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:784 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:785 src/gui/setupinputpages.cpp:58
#: src/gui/windowmenu.cpp:157 src/gui/windows/inventorywindow.cpp:236
#: src/gui/windows/outfitwindow.cpp:61
msgid "Outfits"
@@ -2236,74 +2250,75 @@ msgstr "服装"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy equipment from player to outfit
-#: src/gui/popups/popupmenu.cpp:791
+#: src/gui/popups/popupmenu.cpp:792
msgid "Copy from player"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:795
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:796 src/input/pages/outfits.cpp:47
msgid "Clear outfit"
msgstr "服装を削除する"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:821 src/gui/windowmenu.cpp:138
+#: src/gui/popups/popupmenu.cpp:822 src/gui/windowmenu.cpp:138
msgid "Spells"
msgstr "呪文"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:825
msgid "Edit spell"
msgstr "呪文を編集する"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:855 src/gui/windows/npcdialog.cpp:129
+#: src/gui/popups/popupmenu.cpp:860 src/gui/windows/npcdialog.cpp:129
msgid "Clear"
msgstr "クリア"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:862
+#: src/gui/popups/popupmenu.cpp:867
msgid "Disable highlight"
msgstr "強調表示を無効"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:868
+#: src/gui/popups/popupmenu.cpp:873
msgid "Enable highlight"
msgstr "強調表示を有効"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:879
msgid "Don't remove name"
msgstr "名前を消さない"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:880
+#: src/gui/popups/popupmenu.cpp:885
msgid "Remove name"
msgstr "名前を削除する"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:886
+#: src/gui/popups/popupmenu.cpp:891
msgid "Enable away"
msgstr "AFKを有効にする"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:897
msgid "Disable away"
msgstr "AFKを無効にする"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:899
+#: src/gui/popups/popupmenu.cpp:904
msgid "Leave"
msgstr "退会"
@@ -2313,116 +2328,116 @@ msgstr "退会"
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:2149
-#: src/gui/popups/popupmenu.cpp:2193
+#: src/gui/popups/popupmenu.cpp:909 src/gui/popups/popupmenu.cpp:2096
+#: src/gui/popups/popupmenu.cpp:2140
msgid "Copy to clipboard"
msgstr "クリップボードにコピー"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1034
+#: src/gui/popups/popupmenu.cpp:1040
msgid "Change guild position"
msgstr "ギルドポジションを変更"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1090
msgid "window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1113
+#: src/gui/popups/popupmenu.cpp:1119
msgid "Unlock"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1119
+#: src/gui/popups/popupmenu.cpp:1125
msgid "Lock"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1130
+#: src/gui/popups/popupmenu.cpp:1136
msgid "Show emotes for:"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show emotes for player
#. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1134 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1140 src/gui/widgets/tabs/setup_other.cpp:226
msgid "Player"
msgstr "プレイヤー"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1138
+#: src/gui/popups/popupmenu.cpp:1144
msgid "Pet"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show emotes for homuncules
#. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1144 src/gui/userpalette.cpp:209
+#: src/gui/popups/popupmenu.cpp:1150 src/gui/userpalette.cpp:209
msgid "Homunculus"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show emotes for mercenary
#. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1148 src/gui/userpalette.cpp:204
+#: src/gui/popups/popupmenu.cpp:1154 src/gui/userpalette.cpp:204
msgid "Mercenary"
msgstr ""
#. TRANSLATORS: dialog caption
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1208
msgid "Rename map sign "
msgstr "マップサインの名前を変更 "
#. TRANSLATORS: label
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1211
msgid "Name: "
msgstr "名前: "
#. TRANSLATORS: dialog caption
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1220
+#: src/gui/popups/popupmenu.cpp:1226
msgid "Player comment "
msgstr "プレイヤーコメント "
#. TRANSLATORS: label
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1223
+#: src/gui/popups/popupmenu.cpp:1229
msgid "Comment: "
msgstr "コメント: "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1575
+#: src/gui/popups/popupmenu.cpp:1522
msgid "Add to trade"
msgstr "トレードウィンドウに追加"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1583
+#: src/gui/popups/popupmenu.cpp:1530
msgid "Add to trade 10"
msgstr "トレードウィンドウに10追加する"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1588
+#: src/gui/popups/popupmenu.cpp:1535
msgid "Add to trade half"
msgstr "トレードウィンドウに半分追加する"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1592
+#: src/gui/popups/popupmenu.cpp:1539
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1596
+#: src/gui/popups/popupmenu.cpp:1543
msgid "Add to trade all"
msgstr "トレードウィンドウに全て追加する"
@@ -2431,72 +2446,72 @@ msgstr "トレードウィンドウに全て追加する"
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1604 src/gui/popups/popupmenu.cpp:1778
-#: src/gui/popups/popupmenu.cpp:1825 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/popups/popupmenu.cpp:1551 src/gui/popups/popupmenu.cpp:1725
+#: src/gui/popups/popupmenu.cpp:1772 src/gui/windows/inventorywindow.cpp:267
#: src/gui/windows/inventorywindow.cpp:290
-#: src/gui/windows/inventorywindow.cpp:890 src/gui/windows/setupwindow.cpp:107
+#: src/gui/windows/inventorywindow.cpp:895 src/gui/windows/setupwindow.cpp:107
msgid "Store"
msgstr "保管"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1612
+#: src/gui/popups/popupmenu.cpp:1559
msgid "Store 10"
msgstr "10 保存"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1617
+#: src/gui/popups/popupmenu.cpp:1564
msgid "Store half"
msgstr "半分保存"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1621
+#: src/gui/popups/popupmenu.cpp:1568
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1625
+#: src/gui/popups/popupmenu.cpp:1572
msgid "Store all"
msgstr "全部保存"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1638
+#: src/gui/popups/popupmenu.cpp:1585
msgid "Move to craft..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1647 src/gui/windows/inventorywindow.cpp:269
+#: src/gui/popups/popupmenu.cpp:1594 src/gui/windows/inventorywindow.cpp:269
#: src/gui/windows/inventorywindow.cpp:292
msgid "Retrieve"
msgstr "取出す"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1655
+#: src/gui/popups/popupmenu.cpp:1602
msgid "Retrieve 10"
msgstr "10 取出す"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1607
msgid "Retrieve half"
msgstr "半分取出す"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1664
+#: src/gui/popups/popupmenu.cpp:1611
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1615
msgid "Retrieve all"
msgstr "全部取出す"
@@ -2507,9 +2522,9 @@ msgstr "全部取出す"
#. TRANSLATORS: default use button name
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1732 src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:1679 src/gui/popups/popupmenu.cpp:2680
#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:789 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/inventorywindow.cpp:793 src/gui/windows/skilldialog.cpp:93
#: src/gui/windows/skilldialog.cpp:193 src/gui/windows/skilldialog.cpp:465
#: src/gui/windows/skilldialog.cpp:657 src/gui/windows/skilldialog.cpp:772
#: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2517,7 +2532,7 @@ msgid "Use"
msgstr "使用"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1842
+#: src/gui/popups/popupmenu.cpp:1789
msgid "Clear drop window"
msgstr "ドロップ窓を消す"
@@ -2526,43 +2541,43 @@ msgstr "ドロップ窓を消す"
#. TRANSLATORS: hide player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/popups/popupmenu.cpp:1935
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:2911
-#: src/gui/popups/popupmenu.cpp:3025
+#: src/gui/popups/popupmenu.cpp:1820 src/gui/popups/popupmenu.cpp:1882
+#: src/gui/popups/popupmenu.cpp:2838 src/gui/popups/popupmenu.cpp:2858
+#: src/gui/popups/popupmenu.cpp:2972
msgid "Hide"
msgstr "非表示"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1880 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:1889
msgid "Show"
msgstr "表示"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1896
msgid "Open yellow bar settings"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:1898
msgid "Reset yellow bar"
msgstr "黄色バーをリセットする"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1955 src/gui/windows/statuswindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:1902 src/gui/windows/statuswindow.cpp:89
msgid "Copy to chat"
msgstr "チャットへコピーする"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:1998 src/gui/popups/popupmenu.cpp:2018
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:1965
msgid "Move up"
msgstr "上へ移動"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2004 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:1951 src/gui/popups/popupmenu.cpp:1972
msgid "Move down"
msgstr "下へ移動"
@@ -2570,94 +2585,94 @@ msgstr "下へ移動"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2583
msgid "Undress"
msgstr "脱ぐ"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2071
msgid "Copy"
msgstr "コピー"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2074
msgid "Paste"
msgstr "ペースト"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2146
+#: src/gui/popups/popupmenu.cpp:2093
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:2111
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2215
+#: src/gui/popups/popupmenu.cpp:2162
msgid "Skill"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2219
+#: src/gui/popups/popupmenu.cpp:2166
msgid "Skill level..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: set skill cast type
-#: src/gui/popups/popupmenu.cpp:2223
+#: src/gui/popups/popupmenu.cpp:2170
msgid "Skill cast type..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: set skill cast offset by x
-#: src/gui/popups/popupmenu.cpp:2227
+#: src/gui/popups/popupmenu.cpp:2174
msgid "Skill offset by x..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: set skill cast offset by y
-#: src/gui/popups/popupmenu.cpp:2231
+#: src/gui/popups/popupmenu.cpp:2178
msgid "Skill offset by y..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2256
+#: src/gui/popups/popupmenu.cpp:2203
msgid "Skill cast offset by x"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2262
+#: src/gui/popups/popupmenu.cpp:2209
msgid "Skill cast offset by y"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: skill level header
-#: src/gui/popups/popupmenu.cpp:2302
+#: src/gui/popups/popupmenu.cpp:2249
msgid "Select skill level"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2260
msgid "Max level"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: skill cast type header
-#: src/gui/popups/popupmenu.cpp:2339
+#: src/gui/popups/popupmenu.cpp:2286
msgid "Select skill cast type"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: skill cast type
#. TRANSLATORS: button in input settings tab
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/skillpopup.cpp:164
+#: src/gui/popups/popupmenu.cpp:2290 src/gui/popups/skillpopup.cpp:164
#: src/gui/widgets/tabs/setup_input.cpp:69
msgid "Default"
msgstr "標準に戻す"
@@ -2665,149 +2680,149 @@ msgstr "標準に戻す"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: skill cast type
#. TRANSLATORS: debug window tab
-#: src/gui/popups/popupmenu.cpp:2347 src/gui/popups/skillpopup.cpp:168
+#: src/gui/popups/popupmenu.cpp:2294 src/gui/popups/skillpopup.cpp:168
#: src/gui/windows/debugwindow.cpp:66
msgid "Target"
msgstr "ターゲット"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: skill cast type
-#: src/gui/popups/popupmenu.cpp:2351 src/gui/popups/skillpopup.cpp:172
+#: src/gui/popups/popupmenu.cpp:2298 src/gui/popups/skillpopup.cpp:172
msgid "Mouse position"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: skill cast type
#. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:2355 src/resources/skill/skilltypelist.h:39
+#: src/gui/popups/popupmenu.cpp:2302 src/resources/skill/skilltypelist.h:39
msgid "Self"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2402 src/gui/popups/popupmenu.cpp:2438
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2349 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2424 src/gui/popups/popupmenu.cpp:2442
msgid "Disregard"
msgstr "無視する"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2405 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2427 src/gui/windows/confirmdialog.cpp:62
msgid "Ignore"
msgstr "無視"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2430
msgid "Black list"
msgstr "ブラックリスト"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2411 src/gui/popups/popupmenu.cpp:2444
+#: src/gui/popups/popupmenu.cpp:2358 src/gui/popups/popupmenu.cpp:2391
msgid "Set as enemy"
msgstr "敵に設定する"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2447
-#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2468
-#: src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:2361 src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
+#: src/gui/popups/popupmenu.cpp:2433
msgid "Erase"
msgstr "消す"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2371
msgid "Be friend"
msgstr "友達になる"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2453
-#: src/gui/popups/popupmenu.cpp:2465 src/gui/popups/popupmenu.cpp:2474
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2412 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2439
msgid "Unignore"
msgstr "完全無視解除"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2458
msgid "Follow"
msgstr "フォロー"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2515
+#: src/gui/popups/popupmenu.cpp:2462
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2482 src/gui/popups/popupmenu.cpp:2506
msgid "Buy (?)"
msgstr "買う (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2562
+#: src/gui/popups/popupmenu.cpp:2494 src/gui/popups/popupmenu.cpp:2509
msgid "Sell (?)"
msgstr "売る (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2576 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:2523 src/gui/popups/popupmenu.cpp:2548
msgid "Invite to party"
msgstr "パーティへ招待"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2572
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2580
msgid "Show Items"
msgstr "アイテムを表示する"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2597
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2604
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2709
+#: src/gui/popups/popupmenu.cpp:2656
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2665
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:898
+#: src/gui/popups/popupmenu.cpp:2695 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:903
msgid "Drop..."
msgstr "落とす..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2751
+#: src/gui/popups/popupmenu.cpp:2698
msgid "Drop all"
msgstr "全て落とす"
@@ -2815,38 +2830,38 @@ msgstr "全て落とす"
#. TRANSLATORS: drop item
#. TRANSLATORS: long button name for drops window.
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2757 src/gui/windowmenu.cpp:142
-#: src/gui/windows/inventorywindow.cpp:903
+#: src/gui/popups/popupmenu.cpp:2704 src/gui/windowmenu.cpp:142
+#: src/gui/windows/inventorywindow.cpp:908
msgid "Drop"
msgstr "落とす"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:2715
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2776
+#: src/gui/popups/popupmenu.cpp:2723
#, c-format
msgid "Show %s"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2780
+#: src/gui/popups/popupmenu.cpp:2727
msgid "Account info"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:2730
msgid "Level"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2786
+#: src/gui/popups/popupmenu.cpp:2733
msgid "Stats"
msgstr ""
@@ -2855,16 +2870,16 @@ msgstr ""
#. TRANSLATORS: long button name for inventory window.
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2789 src/gui/windowmenu.cpp:108
+#: src/gui/popups/popupmenu.cpp:2736 src/gui/windowmenu.cpp:108
#: src/gui/windows/inventorywindow.cpp:149
-#: src/resources/inventory/inventory.cpp:343
+#: src/resources/inventory/inventory.cpp:345
msgid "Inventory"
msgstr "インベントリー"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show player storage list
#. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2792 src/resources/inventory/inventory.cpp:348
+#: src/gui/popups/popupmenu.cpp:2739 src/resources/inventory/inventory.cpp:350
msgid "Storage"
msgstr "倉庫"
@@ -2873,40 +2888,40 @@ msgstr "倉庫"
#. TRANSLATORS: long button name for cart window.
#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2795 src/gui/windowmenu.cpp:112
+#: src/gui/popups/popupmenu.cpp:2742 src/gui/windowmenu.cpp:112
#: src/gui/windows/inventorywindow.cpp:238
-#: src/resources/inventory/inventory.cpp:358
+#: src/resources/inventory/inventory.cpp:360
msgid "Cart"
msgstr "カート"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
#. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2798 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2745 src/gui/widgets/tabs/setup_chat.cpp:87
msgid "Commands"
msgstr "コマンド"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2801
+#: src/gui/popups/popupmenu.cpp:2748
msgid "Char commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2804 src/gui/popups/popupmenu.cpp:3006
+#: src/gui/popups/popupmenu.cpp:2751 src/gui/popups/popupmenu.cpp:2953
msgid "Back"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2765
msgid "Locate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2771
msgid "Check ip"
msgstr ""
@@ -2914,7 +2929,7 @@ msgstr ""
#. TRANSLATORS: go to player position
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2828 src/gui/popups/popupmenu.cpp:3036
+#: src/gui/popups/popupmenu.cpp:2775 src/gui/popups/popupmenu.cpp:2983
msgid "Goto"
msgstr ""
@@ -2922,109 +2937,109 @@ msgstr ""
#. TRANSLATORS: recall player to current position
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2831 src/gui/popups/popupmenu.cpp:3030
+#: src/gui/popups/popupmenu.cpp:2778 src/gui/popups/popupmenu.cpp:2977
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2793
msgid "Recall party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2853
+#: src/gui/popups/popupmenu.cpp:2800
msgid "Recall guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2864
+#: src/gui/popups/popupmenu.cpp:2811
msgid "Give party leader"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2879
+#: src/gui/popups/popupmenu.cpp:2826
msgid "Show..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2882
+#: src/gui/popups/popupmenu.cpp:2829
msgid "Mute..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2902
+#: src/gui/popups/popupmenu.cpp:2849
msgid "Immortal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2905
+#: src/gui/popups/popupmenu.cpp:2852
msgid "Jail"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2908
+#: src/gui/popups/popupmenu.cpp:2855
msgid "Unjail"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2915
+#: src/gui/popups/popupmenu.cpp:2862
msgid "Killer"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2918
+#: src/gui/popups/popupmenu.cpp:2865
msgid "Killable"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2921
+#: src/gui/popups/popupmenu.cpp:2868
msgid "Set save"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:2871
msgid "Warp to save"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2927
+#: src/gui/popups/popupmenu.cpp:2874
msgid "Warp to random"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2931
+#: src/gui/popups/popupmenu.cpp:2878
msgid "Spawn clone"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2934
+#: src/gui/popups/popupmenu.cpp:2881
msgid "Spawn slave clone"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2937
+#: src/gui/popups/popupmenu.cpp:2884
msgid "Spawn evil clone"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:2941
+#: src/gui/popups/popupmenu.cpp:2888
msgid "Break guild"
msgstr ""
@@ -3032,31 +3047,31 @@ msgstr ""
#. TRANSLATORS: kick player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:2948 src/gui/popups/popupmenu.cpp:3019
-#: src/gui/popups/popupmenu.cpp:3048
+#: src/gui/popups/popupmenu.cpp:2895 src/gui/popups/popupmenu.cpp:2966
+#: src/gui/popups/popupmenu.cpp:2995
msgid "Kick"
msgstr "追い出す"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2956
+#: src/gui/popups/popupmenu.cpp:2903
#, c-format
msgid "Mute %s"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2964 src/gui/popups/popupmenu.cpp:2968
-#: src/gui/popups/popupmenu.cpp:2972 src/gui/popups/popupmenu.cpp:2976
-#: src/gui/popups/popupmenu.cpp:2980
+#: src/gui/popups/popupmenu.cpp:2911 src/gui/popups/popupmenu.cpp:2915
+#: src/gui/popups/popupmenu.cpp:2919 src/gui/popups/popupmenu.cpp:2923
+#: src/gui/popups/popupmenu.cpp:2927
#, c-format
msgid "Mute %d"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2985 src/gui/popups/popupmenu.cpp:2989
-#: src/gui/popups/popupmenu.cpp:2993 src/gui/popups/popupmenu.cpp:2997
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:2932 src/gui/popups/popupmenu.cpp:2936
+#: src/gui/popups/popupmenu.cpp:2940 src/gui/popups/popupmenu.cpp:2944
+#: src/gui/popups/popupmenu.cpp:2948
#, c-format
msgid "Unmute %d"
msgstr ""
@@ -3065,19 +3080,19 @@ msgstr ""
#. TRANSLATORS: disguise to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3033 src/gui/popups/popupmenu.cpp:3060
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3007
msgid "Disguise"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3051
+#: src/gui/popups/popupmenu.cpp:2998
msgid "Spawn same"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3057
+#: src/gui/popups/popupmenu.cpp:3004
msgid "Spawn slave"
msgstr ""
@@ -3086,115 +3101,117 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show item information
#. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: servers dialog button
#. TRANSLATORS: info message header
#. TRANSLATORS: info header
#. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3064 src/gui/popups/popupmenu.cpp:3083
-#: src/gui/popups/popupmenu.cpp:3096 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
-#: src/net/eathena/charserverrecv.cpp:455
+#: src/gui/popups/popupmenu.cpp:3011 src/gui/popups/popupmenu.cpp:3030
+#: src/gui/popups/popupmenu.cpp:3043 src/gui/windows/charselectdialog.cpp:76
+#: src/gui/windows/serverdialog.cpp:119 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:417
+#: src/net/eathena/charserverrecv.cpp:453
msgid "Info"
msgstr "情報"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3067
+#: src/gui/popups/popupmenu.cpp:3014
msgid "Search"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3071
+#: src/gui/popups/popupmenu.cpp:3018
msgid "Search spawns"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3086 src/gui/popups/popupmenu.cpp:3099
+#: src/gui/popups/popupmenu.cpp:3033 src/gui/popups/popupmenu.cpp:3046
msgid "Who drops"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm create item
-#: src/gui/popups/popupmenu.cpp:3103
+#: src/gui/popups/popupmenu.cpp:3050
msgid "Add 1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm create item
-#: src/gui/popups/popupmenu.cpp:3106
+#: src/gui/popups/popupmenu.cpp:3053
msgid "Add 5"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm create item
-#: src/gui/popups/popupmenu.cpp:3109
+#: src/gui/popups/popupmenu.cpp:3056
msgid "Add 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm create item
-#: src/gui/popups/popupmenu.cpp:3112
+#: src/gui/popups/popupmenu.cpp:3059
msgid "Add 100"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm create item
-#: src/gui/popups/popupmenu.cpp:3115
+#: src/gui/popups/popupmenu.cpp:3062
msgid "Add 1000"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm create item
-#: src/gui/popups/popupmenu.cpp:3118
+#: src/gui/popups/popupmenu.cpp:3065
msgid "Add 10000"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3125
+#: src/gui/popups/popupmenu.cpp:3072
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3142
#, c-format
msgid "Move to craft %d"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3212
+#: src/gui/popups/popupmenu.cpp:3159
msgid "Mail to..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3221
+#: src/gui/popups/popupmenu.cpp:3168
msgid "Taming pet"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3230
+#: src/gui/popups/popupmenu.cpp:3177
msgid "Adopt child"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: leave party
-#: src/gui/popups/popupmenu.cpp:3242
+#: src/gui/popups/popupmenu.cpp:3189
msgid "Leave party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: leave guild
-#: src/gui/popups/popupmenu.cpp:3258
+#: src/gui/popups/popupmenu.cpp:3205
msgid "Leave guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change guild notice message
-#: src/gui/popups/popupmenu.cpp:3286
+#: src/gui/popups/popupmenu.cpp:3233
msgid "Change notice"
msgstr ""
@@ -3237,13 +3254,13 @@ msgstr "ショートカット"
#. TRANSLATORS: long button name for windows list menu.
#. TRANSLATORS: input action label
#: src/gui/setupinputpages.cpp:52 src/gui/widgets/tabs/setup_other.cpp:334
-#: src/gui/windowmenu.cpp:187 src/input/pages/windows.cpp:34
+#: src/gui/windowmenu.cpp:192 src/input/pages/windows.cpp:34
msgid "Windows"
msgstr "ウィンドウ"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:368
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:370
msgid "Craft"
msgstr "クラフト"
@@ -3583,7 +3600,7 @@ msgstr ""
#. TRANSLATORS: status bar label
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:349
+#: src/gui/widgets/selldialog.cpp:140 src/gui/windows/buydialog.cpp:349
#: src/gui/windows/statuswindow.cpp:444 src/gui/windows/statuswindow.cpp:500
msgid "Max"
msgstr "最大"
@@ -3595,14 +3612,14 @@ msgstr "最大"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:135 src/gui/windows/buydialog.cpp:329
+#: src/gui/widgets/selldialog.cpp:136 src/gui/windows/buydialog.cpp:329
#: src/gui/windows/itemamountwindow.cpp:189
#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
msgid "+"
msgstr "+"
#. TRANSLATORS: character level
-#: src/gui/widgets/characterdisplay.cpp:138
+#: src/gui/widgets/characterdisplay.cpp:142
#, c-format
msgid "Level: %u"
msgstr ""
@@ -3610,15 +3627,15 @@ msgstr ""
#. TRANSLATORS: character money
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:704 src/gui/windows/statuswindow.cpp:75
+#: src/gui/widgets/characterdisplay.cpp:146
+#: src/gui/windows/inventorywindow.cpp:708 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:218 src/gui/windows/statuswindow.cpp:359
#, c-format
msgid "Money: %s"
msgstr "GP: %s"
#. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:419 src/gui/widgets/itemcontainer.cpp:541
+#: src/gui/widgets/itemcontainer.cpp:424 src/gui/widgets/itemcontainer.cpp:546
msgid "Eq."
msgstr "装着."
@@ -3638,7 +3655,7 @@ msgstr "URLを開く"
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:113 src/gui/windows/buydialog.cpp:335
+#: src/gui/widgets/selldialog.cpp:114 src/gui/windows/buydialog.cpp:335
#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:134
#: src/gui/windows/serverdialog.cpp:111 src/gui/windows/shopwindow.cpp:123
#: src/gui/windows/tradewindow.cpp:87
@@ -3652,10 +3669,10 @@ msgstr "追加"
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:117 src/gui/windows/buydialog.cpp:347
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:347
#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:107
-#: src/gui/windows/textselectdialog.cpp:93 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
msgid "Quit"
msgstr "終了"
@@ -3664,7 +3681,7 @@ msgstr "終了"
#. You may change this symbol if your language uses another.
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
+#: src/gui/widgets/selldialog.cpp:138 src/gui/windows/buydialog.cpp:332
#: src/gui/windows/itemamountwindow.cpp:187
#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:127
msgid "-"
@@ -3672,7 +3689,7 @@ msgstr "-"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:146 src/gui/widgets/selldialog.cpp:363
+#: src/gui/widgets/selldialog.cpp:147 src/gui/widgets/selldialog.cpp:369
#: src/gui/windows/buydialog.cpp:315 src/gui/windows/buydialog.cpp:749
#, c-format
msgid "Price: %s / Total: %s"
@@ -3686,8 +3703,7 @@ msgid "Edit"
msgstr "編集"
#. TRANSLATORS: status window label
-#: src/gui/widgets/statspagebasic.cpp:70
-#: src/gui/widgets/statspagebasic.cpp:101
+#: src/gui/widgets/statspagebasic.cpp:70 src/gui/widgets/statspagebasic.cpp:101
#, c-format
msgid "Character points: %d"
msgstr "キャラクターポイント: %d"
@@ -3698,30 +3714,30 @@ msgid "Battle"
msgstr "バトル"
#. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:173
+#: src/gui/widgets/tabs/chat/chattab.cpp:174
msgid "Global announcement:"
msgstr "グローバルアナウンス:"
#. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:179
+#: src/gui/widgets/tabs/chat/chattab.cpp:180
#, c-format
msgid "Global announcement from %s:"
msgstr "%sからのアナウンス:"
#. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:205
+#: src/gui/widgets/tabs/chat/chattab.cpp:206
#, c-format
msgid "%s whispers: %s"
msgstr "%s ささやく: %s"
#. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:545
+#: src/gui/widgets/tabs/chat/chattab.cpp:550
#, c-format
msgid "%s is now Online."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:551
+#: src/gui/widgets/tabs/chat/chattab.cpp:556
#, c-format
msgid "%s is now Offline."
msgstr ""
@@ -4184,15 +4200,15 @@ msgstr ""
msgid ""
"Enables aggressive protection of input focus in chat window.\n"
"\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings colors tab name
#. TRANSLATORS: emotes tab name
#: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:131
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:131
msgid "Colors"
msgstr "色"
@@ -4216,9 +4232,11 @@ msgstr "チャットの文字色リストを表示"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:79
msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
"\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
msgstr ""
#. TRANSLATORS: settings option
@@ -4245,9 +4263,11 @@ msgstr "チャットで一行に表示する最大文字数を制限する"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:103
msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
"\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
msgstr ""
#. TRANSLATORS: settings option
@@ -4258,7 +4278,9 @@ msgstr "チャットで表示する最大行数を制限する"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:112
msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
"\n"
"Note: keeping too many lines in scroll buffer can slow client down."
msgstr ""
@@ -4299,8 +4321,8 @@ msgstr "チャット履歴を表示"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:138
msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
msgstr ""
#. TRANSLATORS: settings option
@@ -4311,9 +4333,11 @@ msgstr ""
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:145
msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
"\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
msgstr ""
#. TRANSLATORS: settings option
@@ -4324,9 +4348,11 @@ msgstr ""
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:153
msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
"\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
msgstr ""
#. TRANSLATORS: settings group
@@ -4342,9 +4368,13 @@ msgstr "売買メッセージを隠す"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:165
msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
"\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
msgstr ""
#. TRANSLATORS: settings option
@@ -4357,14 +4387,15 @@ msgstr "MVPメッセージを表示する"
msgid ""
"Enable this setting to see MVP messages from server.\n"
"\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: input action group
#. TRANSLATORS: input action label
#: src/gui/widgets/tabs/setup_chat.cpp:183 src/input/pages/chat.cpp:61
-#: src/input/pages/windows.cpp:202
+#: src/input/pages/windows.cpp:208
msgid "Tabs"
msgstr "タブ"
@@ -4376,9 +4407,12 @@ msgstr "ささやきををタブで表示する"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:188
msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
"\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
msgstr ""
#. TRANSLATORS: settings option
@@ -4389,7 +4423,8 @@ msgstr "デバッグタブに呪文をログする"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:198
msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
"\n"
"Note: it does not affects server replies related to spells."
msgstr ""
@@ -4402,9 +4437,11 @@ msgstr "デバッグタブにサーバーメッセージをログする"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:206
msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
"\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
msgstr ""
#. TRANSLATORS: settings option
@@ -4429,9 +4466,11 @@ msgstr ""
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:225
msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
"\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
msgstr ""
#. TRANSLATORS: settings option
@@ -4442,7 +4481,8 @@ msgstr ""
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:233
msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
"\n"
"Note: only supported by Evol server yet."
msgstr ""
@@ -4455,7 +4495,9 @@ msgstr ""
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:241
msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
"\n"
"Note: it only works on servers supporting language tabs feature, like Evol."
msgstr ""
@@ -4468,7 +4510,9 @@ msgstr "バトルタブを有効"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:251
msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
"\n"
"Note: client restart required to take effect."
msgstr ""
@@ -4494,7 +4538,10 @@ msgstr "チャットタブをリサイズする"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:268
msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
"\n"
"Note: its mostly about jumpy attitude vs less usable space for text."
msgstr ""
@@ -4529,7 +4576,8 @@ msgstr "文字をハイライト (コンマで区切る)"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:298
msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
"\n"
"Note: frequent highlights are annoying - use it with caution."
msgstr ""
@@ -4542,7 +4590,8 @@ msgstr ""
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:306
msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
"\n"
"Note: careless use of this feature can make you to miss important announces!"
msgstr ""
@@ -4555,9 +4604,12 @@ msgstr ""
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:315
msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
"\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
msgstr ""
#. TRANSLATORS: settings option
@@ -4666,7 +4718,9 @@ msgstr "ショートカットキーが重複しています."
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
"strange behaviour."
-msgstr "\"%s\"と\"%s\"キーが重複しています。 ゲームプレイに悪い影響が出るかもしれません."
+msgstr ""
+"\"%s\"と\"%s\"キーが重複しています。 ゲームプレイに悪い影響が出るかもしれませ"
+"ん."
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
@@ -4676,44 +4730,44 @@ msgid "unknown"
msgstr "不明"
#. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:139
+#: src/gui/widgets/tabs/setup_joystick.cpp:47
+#: src/gui/widgets/tabs/setup_joystick.cpp:137
msgid "Press the button to start calibration"
msgstr "ボタンを押してカリブレーションを開始"
#. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
-#: src/gui/widgets/tabs/setup_joystick.cpp:136
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:134
msgid "Calibrate"
msgstr "カリブレーション"
#. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
msgid "Detect joysticks"
msgstr ""
#. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:55
+#: src/gui/widgets/tabs/setup_joystick.cpp:53
msgid "Enable joystick"
msgstr "ジョイスティックを使用可能にする"
#. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:59
+#: src/gui/widgets/tabs/setup_joystick.cpp:57
msgid "Use joystick if client window inactive"
msgstr "クライアントが無効の場合ジョイスティックを使用"
#. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:64
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
msgid "Joystick"
msgstr "ジョイスティック"
#. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:145
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
msgid "Stop"
msgstr "停止"
#. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:148
+#: src/gui/widgets/tabs/setup_joystick.cpp:146
msgid "Rotate the stick and don't press buttons"
msgstr "ボタンは押さないでスティックを回転する"
@@ -5602,8 +5656,8 @@ msgstr "テーマを変更しました"
#. TRANSLATORS: ok dialog message
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:403
-#: src/gui/widgets/tabs/setup_video.cpp:421
+#: src/gui/widgets/tabs/setup_video.cpp:401
+#: src/gui/widgets/tabs/setup_video.cpp:419
msgid "Restart your client for the change to take effect."
msgstr "設定変更の為アプリケーションを再起動してください."
@@ -5684,109 +5738,109 @@ msgid "Button %u action"
msgstr "ボタン %u アクション"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:77
+#: src/gui/widgets/tabs/setup_video.cpp:75
msgid "Full screen"
msgstr "フルスクリーン"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:80
+#: src/gui/widgets/tabs/setup_video.cpp:78
msgid "FPS limit:"
msgstr "FPSリミット:"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:85
-#: src/gui/widgets/tabs/setup_video.cpp:126
-#: src/gui/widgets/tabs/setup_video.cpp:333
-#: src/gui/widgets/tabs/setup_video.cpp:478
+#: src/gui/widgets/tabs/setup_video.cpp:83
+#: src/gui/widgets/tabs/setup_video.cpp:124
+#: src/gui/widgets/tabs/setup_video.cpp:331
+#: src/gui/widgets/tabs/setup_video.cpp:476
msgid "Alt FPS limit: "
msgstr "Alt FPS リミット: "
#. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:88
+#: src/gui/widgets/tabs/setup_video.cpp:86
msgid "Detect best mode"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:98
+#: src/gui/widgets/tabs/setup_video.cpp:96
msgid "Show cursor"
msgstr "カーソルを表示"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:101
+#: src/gui/widgets/tabs/setup_video.cpp:99
msgid "Custom cursor"
msgstr "カスタムカーソル"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:103
msgid "Enable resize"
msgstr "リサイズを有効にする"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:106
msgid "No frame"
msgstr "フレームなし"
#. TRANSLATORS: video settings label
#. TRANSLATORS: video settings label value
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:128
-#: src/gui/widgets/tabs/setup_video.cpp:331
-#: src/gui/widgets/tabs/setup_video.cpp:462
-#: src/gui/widgets/tabs/setup_video.cpp:475
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:126
+#: src/gui/widgets/tabs/setup_video.cpp:329
+#: src/gui/widgets/tabs/setup_video.cpp:460
+#: src/gui/widgets/tabs/setup_video.cpp:473
msgid "None"
msgstr "なし"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr "ウインドウモード、また前モードの復元にも失敗しました!"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:243
+#: src/gui/widgets/tabs/setup_video.cpp:241
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr "フルスクリーンモード、また前モードの復元にも失敗しました!"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:256
+#: src/gui/widgets/tabs/setup_video.cpp:254
msgid "Switching to Full Screen"
msgstr "フルスクリーンに変更"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:258
+#: src/gui/widgets/tabs/setup_video.cpp:256
msgid "Restart needed for changes to take effect."
msgstr "設定変更の為、再起動をしてください."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:285
+#: src/gui/widgets/tabs/setup_video.cpp:283
msgid "Changing to OpenGL"
msgstr "OpenGLに変更"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:287
+#: src/gui/widgets/tabs/setup_video.cpp:285
msgid "Applying change to OpenGL requires restart."
msgstr "OpenGLの設定を変更するため、再起動をしてください."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:372
+#: src/gui/widgets/tabs/setup_video.cpp:370
msgid "Custom resolution (example: 1024x768)"
msgstr "カスタム解像度 (例: 1024x768)"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:374
+#: src/gui/widgets/tabs/setup_video.cpp:372
msgid "Enter new resolution: "
msgstr "解像度を入力して下さい: "
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:401
-#: src/gui/widgets/tabs/setup_video.cpp:419
+#: src/gui/widgets/tabs/setup_video.cpp:399
+#: src/gui/widgets/tabs/setup_video.cpp:417
msgid "Screen Resolution Changed"
msgstr "スクリーンの解像度を変更しました"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:405
+#: src/gui/widgets/tabs/setup_video.cpp:403
msgid "Some windows may be moved to fit the lowered resolution."
msgstr "解像度の変更に合わせ、いくつかのウィンドウが移動する可能性があります."
@@ -6275,28 +6329,41 @@ msgstr ""
#. TRANSLATORS: mail window name
#. TRANSLATORS: inventory type name
#: src/gui/windowmenu.cpp:172 src/gui/windows/mailwindow.cpp:53
-#: src/resources/inventory/inventory.cpp:363
+#: src/resources/inventory/inventory.cpp:365
msgid "Mail"
msgstr ""
-#. TRANSLATORS: short button name for debug window.
+#. TRANSLATORS: short button name for server info window.
#: src/gui/windowmenu.cpp:175
+#, fuzzy
+msgid "SI"
+msgstr "SKI"
+
+#. TRANSLATORS: long button name for server info window.
+#. TRANSLATORS: servers dialog name
+#: src/gui/windowmenu.cpp:177 src/gui/windows/serverinfowindow.cpp:40
+#, fuzzy
+msgid "Server info"
+msgstr "サーバー:"
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:180
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:185
+#: src/gui/windowmenu.cpp:190
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:190
+#: src/gui/windowmenu.cpp:195
msgid "SET"
msgstr "SET"
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:325 src/gui/windows/outfitwindow.cpp:78
+#: src/gui/windowmenu.cpp:330 src/gui/windows/outfitwindow.cpp:78
#: src/gui/windows/outfitwindow.cpp:626
#, c-format
msgid "Key: %s"
@@ -6332,7 +6399,7 @@ msgstr "量:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/buydialog.cpp:335 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:613
+#: src/gui/windows/charselectdialog.cpp:615
msgid "Create"
msgstr "作成"
@@ -6389,7 +6456,7 @@ msgstr "パスワードの変更"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:111 src/gui/windows/registerdialog.cpp:74
+#: src/gui/windows/logindialog.cpp:112 src/gui/windows/registerdialog.cpp:74
msgid "Password:"
msgstr "パスワード:"
@@ -6430,7 +6497,7 @@ msgstr "新しいキャラクター"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:84
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:109
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:110
#: src/gui/windows/registerdialog.cpp:72
msgid "Name:"
msgstr "名前:"
@@ -6449,8 +6516,7 @@ msgstr "^"
#: src/gui/windows/charcreatedialog.cpp:196
#: src/gui/windows/charcreatedialog.cpp:209
#: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:66
msgid ">"
msgstr ">"
@@ -6468,8 +6534,7 @@ msgstr "%d ポイントを振り分けてください"
#: src/gui/windows/charcreatedialog.cpp:200
#: src/gui/windows/charcreatedialog.cpp:211
#: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:64
msgid "<"
msgstr "<"
@@ -6495,8 +6560,7 @@ msgstr ""
#. TRANSLATORS: one char size female character gender
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:70
msgid "F"
msgstr "友達"
@@ -6565,7 +6629,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:603
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/updaterwindow.cpp:194
msgid "Play"
msgstr "プレイ"
@@ -6623,29 +6687,29 @@ msgid "Enter password:"
msgstr "パスワードを入力して下さい:"
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:702
+#: src/gui/windows/chatwindow.cpp:704
#, c-format
msgid "Present: %s; %d players are present."
msgstr "現在: %s; %d プレイヤーがいます."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1159
+#: src/gui/windows/chatwindow.cpp:1161
#, c-format
msgid "Whispering to %s: %s"
msgstr "%sにささやき中:%s"
#. TRANSLATORS: prefix for moved message to trade tab.
-#: src/gui/windows/chatwindow.cpp:1592
+#: src/gui/windows/chatwindow.cpp:1594
msgid "Moved: "
msgstr ""
#. TRANSLATORS: moved message to trade tab warning.
-#: src/gui/windows/chatwindow.cpp:1600
+#: src/gui/windows/chatwindow.cpp:1602
msgid "Your message was moved to trade tab"
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1625
+#: src/gui/windows/chatwindow.cpp:1627
msgid "Broken nick detected: "
msgstr ""
@@ -6686,8 +6750,7 @@ msgstr "サーバー編集"
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:109
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:109
msgid "Connect"
msgstr "接続"
@@ -6762,9 +6825,8 @@ msgstr ""
#. TRANSLATORS: unknown hosts group name
#. TRANSLATORS: unknown skills tab name
#. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:674
-#: src/gui/windows/serverdialog.cpp:460 src/gui/windows/skilldialog.cpp:146
-#: src/resources/skill/skillinfo.cpp:124
+#: src/gui/windows/equipmentwindow.cpp:674 src/gui/windows/serverdialog.cpp:479
+#: src/gui/windows/skilldialog.cpp:146 src/resources/skill/skillinfo.cpp:124
msgid "Unknown"
msgstr ""
@@ -6823,12 +6885,12 @@ msgid "E"
msgstr ""
#. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1034
+#: src/gui/windows/inventorywindow.cpp:1039
msgid "Insert card request"
msgstr ""
#. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1036
+#: src/gui/windows/inventorywindow.cpp:1041
#, c-format
msgid "Insert %s into %s?"
msgstr ""
@@ -7010,8 +7072,10 @@ msgstr "サーバー変更"
#. TRANSLATORS: login dialog button
#. TRANSLATORS: register dialog name
#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: server info comment
#: src/gui/windows/logindialog.cpp:85 src/gui/windows/registerdialog.cpp:53
#: src/gui/windows/registerdialog.cpp:62
+#: src/gui/windows/serverinfowindow.cpp:124
msgid "Register"
msgstr "登録"
@@ -7021,17 +7085,17 @@ msgid "Custom update host"
msgstr "カスタムアップデートホスト"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:105
+#: src/gui/windows/logindialog.cpp:106
msgid "Server:"
msgstr "サーバー:"
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:247
+#: src/gui/windows/logindialog.cpp:248
msgid "Open register url"
msgstr ""
#. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:396
+#: src/gui/windows/logindialog.cpp:397
msgid "default updates"
msgstr ""
@@ -7058,15 +7122,13 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
msgid "Money:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
#: src/gui/windows/mailviewwindow.cpp:133
msgid "Item:"
msgstr ""
@@ -7319,13 +7381,13 @@ msgid "Passwords do not match."
msgstr "パスワードが一致しません."
#. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:218 src/net/ea/loginrecv.cpp:165
-#: src/net/eathena/loginrecv.cpp:109
+#: src/gui/windows/registerdialog.cpp:218 src/net/ea/loginrecv.cpp:121
+#: src/net/eathena/loginrecv.cpp:114
msgid "Incorrect email."
msgstr "メールアドレスが違います."
#. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224
+#: src/gui/windows/registerdialog.cpp:225
msgid "Email too long."
msgstr ""
@@ -7340,47 +7402,90 @@ msgid "Load"
msgstr "読込み"
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:129
+#: src/gui/windows/serverdialog.cpp:131
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "サーバーを選んで下さい *** セーフモード ***"
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:138
+#: src/gui/windows/serverdialog.cpp:140
msgid "Use same ip for game sub servers"
msgstr "同じIPをゲームサブサーバーでも使用する"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:401
+#: src/gui/windows/serverdialog.cpp:420
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "サーバーリストをダウンロード中...%2.2f%%"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:407
+#: src/gui/windows/serverdialog.cpp:426
msgid "Waiting for server..."
msgstr "サーバーからの応答を待っています..."
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:412
+#: src/gui/windows/serverdialog.cpp:431
msgid "Preparing download"
msgstr "ダウンロード準備中"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:417
+#: src/gui/windows/serverdialog.cpp:436
msgid "Error retreiving server list!"
msgstr "サーバーリストの読み込みに失敗!"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:536
+#: src/gui/windows/serverdialog.cpp:599
msgid "requires a newer version"
msgstr "アップデートが必要です"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:541
+#: src/gui/windows/serverdialog.cpp:604
#, c-format
msgid "requires v%s"
msgstr "v%sが必要"
+#. TRANSLATORS: server info comment
+#: src/gui/windows/serverinfowindow.cpp:102
+msgid "##BServer with free license."
+msgstr ""
+
+#. TRANSLATORS: server info comment
+#: src/gui/windows/serverinfowindow.cpp:107
+msgid "##BServer with non free license."
+msgstr ""
+
+#. TRANSLATORS: server info comment
+#: src/gui/windows/serverinfowindow.cpp:113
+msgid "##BServer unknown licesne."
+msgstr ""
+
+#. TRANSLATORS: server info comment
+#: src/gui/windows/serverinfowindow.cpp:118
+#, fuzzy
+msgid "Server"
+msgstr "サーバー:"
+
+#. TRANSLATORS: server info comment
+#. TRANSLATORS: Skill type
+#: src/gui/windows/serverinfowindow.cpp:121
+#: src/resources/skill/skilltypelist.h:43
+msgid "Support"
+msgstr ""
+
+#. TRANSLATORS: server info non free comment
+#: src/gui/windows/serverinfowindow.cpp:128
+msgid "##BNon free sources"
+msgstr ""
+
+#. TRANSLATORS: server info non free comment
+#: src/gui/windows/serverinfowindow.cpp:131
+msgid "##BFree sources"
+msgstr ""
+
+#. TRANSLATORS: server info documentation comment
+#: src/gui/windows/serverinfowindow.cpp:134
+msgid "##BDocumentation"
+msgstr ""
+
#. TRANSLATORS: setup button
#: src/gui/windows/setupwindow.cpp:103
msgid "Apply"
@@ -7392,14 +7497,14 @@ msgid "Reset Windows"
msgstr "ウィンドウをリセットする"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1123
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:1130
msgid "Personal Shop"
msgstr "最大 (15)"
#. TRANSLATORS: shop window button
#. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:437
-#: src/gui/windows/shopwindow.cpp:462
+#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:438
+#: src/gui/windows/shopwindow.cpp:463
msgid "Publish"
msgstr ""
@@ -7414,50 +7519,50 @@ msgid "Show links in announce"
msgstr "アナウンスにリンクを表示する"
#. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:371
+#: src/gui/windows/shopwindow.cpp:372
msgid "Please enter new shop name"
msgstr ""
#. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:432 src/gui/windows/shopwindow.cpp:457
+#: src/gui/windows/shopwindow.cpp:433 src/gui/windows/shopwindow.cpp:458
msgid "Unpublish"
msgstr ""
#. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:924
+#: src/gui/windows/shopwindow.cpp:930
msgid "error: player busy"
msgstr ""
#. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:972
+#: src/gui/windows/shopwindow.cpp:979
msgid "error: Can't sell this item"
msgstr ""
#. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:984
+#: src/gui/windows/shopwindow.cpp:991
msgid "error: Can't buy this item"
msgstr ""
#. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1004
+#: src/gui/windows/shopwindow.cpp:1011
#, c-format
msgid "%s wants to buy %s do you accept?"
msgstr ""
#. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1011
+#: src/gui/windows/shopwindow.cpp:1018
#, c-format
msgid "%s wants to sell %s do you accept?"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1018 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1025 src/net/ea/traderecv.cpp:163
msgid "Request for Trade"
msgstr "トレードをリクエスト"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1128
+#: src/gui/windows/shopwindow.cpp:1135
#, c-format
msgid "Personal Shop - %s"
msgstr ""
@@ -7739,9 +7844,10 @@ msgstr "GP不足です."
#. TRANSLATORS: trade error
#: src/gui/windows/tradewindow.cpp:532
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "アイテムの追加に失敗しました。アイテム一種類を一つのウインドウ上で重複して追加することは出来ません."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"アイテムの追加に失敗しました。アイテム一種類を一つのウインドウ上で重複して追"
+"加することは出来ません."
#. TRANSLATORS: trade error
#: src/gui/windows/tradewindow.cpp:545
@@ -7764,27 +7870,27 @@ msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:858
+#: src/gui/windows/updaterwindow.cpp:860
msgid "##1 The update process is incomplete."
msgstr "##1 アップデートは完了していません."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:860
+#: src/gui/windows/updaterwindow.cpp:862
msgid "##1 It is strongly recommended that"
msgstr "##1 する事を強く推奨します"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:862
+#: src/gui/windows/updaterwindow.cpp:864
msgid "##1 you try again later."
msgstr "##1 しばらくたってからもう一度試してください."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1049
+#: src/gui/windows/updaterwindow.cpp:1052
msgid "Completed"
msgstr "完了"
#. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:96 src/gui/windows/whoisonline.cpp:665
+#: src/gui/windows/whoisonline.cpp:96 src/gui/windows/whoisonline.cpp:667
msgid "Who Is Online - Updating"
msgstr "オンラインリスト - アップデート中"
@@ -7799,12 +7905,12 @@ msgid "Who Is Online - "
msgstr "オンラインリスト - "
#. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:681
+#: src/gui/windows/whoisonline.cpp:683
msgid "Who Is Online - error"
msgstr "オンラインリスト - エラー"
#. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:728
+#: src/gui/windows/whoisonline.cpp:730
msgid "Who Is Online - Update"
msgstr "オンラインリスト - アップデート"
@@ -8371,11 +8477,20 @@ msgstr ""
#. TRANSLATORS: input action name
#: src/input/pages/move.cpp:95
+msgid "Move homunculus to master"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/move.cpp:101
+msgid "Move mercenary to master"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/move.cpp:107
msgid "Move to navigation point shortcuts"
msgstr "ナビポイントショートカットまで移動"
#. TRANSLATORS: input action name
-#: src/input/pages/move.cpp:101 src/input/pages/move.cpp:107
#: src/input/pages/move.cpp:113 src/input/pages/move.cpp:119
#: src/input/pages/move.cpp:125 src/input/pages/move.cpp:131
#: src/input/pages/move.cpp:137 src/input/pages/move.cpp:143
@@ -8399,6 +8514,7 @@ msgstr "ナビポイントショートカットまで移動"
#: src/input/pages/move.cpp:353 src/input/pages/move.cpp:359
#: src/input/pages/move.cpp:365 src/input/pages/move.cpp:371
#: src/input/pages/move.cpp:377 src/input/pages/move.cpp:383
+#: src/input/pages/move.cpp:389 src/input/pages/move.cpp:395
#, c-format
msgid "Move to point Shortcut %d"
msgstr "ショートカット %dまで移動"
@@ -8724,6 +8840,33 @@ msgid "Pet ai stop"
msgstr ""
#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:432
+msgid "Feed homunculus"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:438
+#, fuzzy
+msgid "Feed pet"
+msgstr "ターゲット必要"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:444
+msgid "Drop pet's loot"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:450
+msgid "Return pet to egg"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:456
+#, fuzzy
+msgid "Unequip pet"
+msgstr "取外す"
+
+#. TRANSLATORS: input action name
#: src/input/pages/outfits.cpp:35
msgid "Outfits keys"
msgstr "服装キー"
@@ -8734,55 +8877,55 @@ msgid "Wear outfit"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/outfits.cpp:47
+#: src/input/pages/outfits.cpp:53
msgid "Copy Outfit to other outfit"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/outfits.cpp:53
+#: src/input/pages/outfits.cpp:59
msgid "Copy outfit to chat"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/outfits.cpp:59
+#: src/input/pages/outfits.cpp:65
msgid "Copy equipped to outfit"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/outfits.cpp:65
+#: src/input/pages/outfits.cpp:71
msgid "Show hat in chat"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/outfits.cpp:71
+#: src/input/pages/outfits.cpp:77
msgid "Outfits shortcuts"
msgstr "服装ショートカット"
#. TRANSLATORS: input action name
-#: src/input/pages/outfits.cpp:77 src/input/pages/outfits.cpp:83
-#: src/input/pages/outfits.cpp:89 src/input/pages/outfits.cpp:95
-#: src/input/pages/outfits.cpp:101 src/input/pages/outfits.cpp:107
-#: src/input/pages/outfits.cpp:113 src/input/pages/outfits.cpp:119
-#: src/input/pages/outfits.cpp:125 src/input/pages/outfits.cpp:131
-#: src/input/pages/outfits.cpp:137 src/input/pages/outfits.cpp:143
-#: src/input/pages/outfits.cpp:149 src/input/pages/outfits.cpp:155
-#: src/input/pages/outfits.cpp:161 src/input/pages/outfits.cpp:167
-#: src/input/pages/outfits.cpp:173 src/input/pages/outfits.cpp:179
-#: src/input/pages/outfits.cpp:185 src/input/pages/outfits.cpp:191
-#: src/input/pages/outfits.cpp:197 src/input/pages/outfits.cpp:203
-#: src/input/pages/outfits.cpp:209 src/input/pages/outfits.cpp:215
-#: src/input/pages/outfits.cpp:221 src/input/pages/outfits.cpp:227
-#: src/input/pages/outfits.cpp:233 src/input/pages/outfits.cpp:239
-#: src/input/pages/outfits.cpp:245 src/input/pages/outfits.cpp:251
-#: src/input/pages/outfits.cpp:257 src/input/pages/outfits.cpp:263
-#: src/input/pages/outfits.cpp:269 src/input/pages/outfits.cpp:275
-#: src/input/pages/outfits.cpp:281 src/input/pages/outfits.cpp:287
-#: src/input/pages/outfits.cpp:293 src/input/pages/outfits.cpp:299
-#: src/input/pages/outfits.cpp:305 src/input/pages/outfits.cpp:311
-#: src/input/pages/outfits.cpp:317 src/input/pages/outfits.cpp:323
-#: src/input/pages/outfits.cpp:329 src/input/pages/outfits.cpp:335
-#: src/input/pages/outfits.cpp:341 src/input/pages/outfits.cpp:347
-#: src/input/pages/outfits.cpp:353 src/input/pages/outfits.cpp:359
+#: src/input/pages/outfits.cpp:83 src/input/pages/outfits.cpp:89
+#: src/input/pages/outfits.cpp:95 src/input/pages/outfits.cpp:101
+#: src/input/pages/outfits.cpp:107 src/input/pages/outfits.cpp:113
+#: src/input/pages/outfits.cpp:119 src/input/pages/outfits.cpp:125
+#: src/input/pages/outfits.cpp:131 src/input/pages/outfits.cpp:137
+#: src/input/pages/outfits.cpp:143 src/input/pages/outfits.cpp:149
+#: src/input/pages/outfits.cpp:155 src/input/pages/outfits.cpp:161
+#: src/input/pages/outfits.cpp:167 src/input/pages/outfits.cpp:173
+#: src/input/pages/outfits.cpp:179 src/input/pages/outfits.cpp:185
+#: src/input/pages/outfits.cpp:191 src/input/pages/outfits.cpp:197
+#: src/input/pages/outfits.cpp:203 src/input/pages/outfits.cpp:209
+#: src/input/pages/outfits.cpp:215 src/input/pages/outfits.cpp:221
+#: src/input/pages/outfits.cpp:227 src/input/pages/outfits.cpp:233
+#: src/input/pages/outfits.cpp:239 src/input/pages/outfits.cpp:245
+#: src/input/pages/outfits.cpp:251 src/input/pages/outfits.cpp:257
+#: src/input/pages/outfits.cpp:263 src/input/pages/outfits.cpp:269
+#: src/input/pages/outfits.cpp:275 src/input/pages/outfits.cpp:281
+#: src/input/pages/outfits.cpp:287 src/input/pages/outfits.cpp:293
+#: src/input/pages/outfits.cpp:299 src/input/pages/outfits.cpp:305
+#: src/input/pages/outfits.cpp:311 src/input/pages/outfits.cpp:317
+#: src/input/pages/outfits.cpp:323 src/input/pages/outfits.cpp:329
+#: src/input/pages/outfits.cpp:335 src/input/pages/outfits.cpp:341
+#: src/input/pages/outfits.cpp:347 src/input/pages/outfits.cpp:353
+#: src/input/pages/outfits.cpp:359 src/input/pages/outfits.cpp:365
#, c-format
msgid "Outfit Shortcut %d"
msgstr "服装ショートカット %d"
@@ -8844,156 +8987,162 @@ msgstr "ヘルプウィンドウ"
#. TRANSLATORS: input action name
#: src/input/pages/windows.cpp:70
+#, fuzzy
+msgid "Server Info Window"
+msgstr "インベントリーウィンドウ"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:76
msgid "Status Window"
msgstr "ステータスウィンドウ"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:76
+#: src/input/pages/windows.cpp:82
msgid "Inventory Window"
msgstr "インベントリーウィンドウ"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:82
+#: src/input/pages/windows.cpp:88
msgid "Equipment Window"
msgstr "装着ウィンドウ"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:88
+#: src/input/pages/windows.cpp:94
msgid "Skill Window"
msgstr "スキルウィンドウ"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:94
+#: src/input/pages/windows.cpp:100
msgid "Minimap Window"
msgstr "ミニマップウィンドウ"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:100
+#: src/input/pages/windows.cpp:106
msgid "Chat Window"
msgstr "チャットウィンドウ"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:106
+#: src/input/pages/windows.cpp:112
msgid "Item Shortcut Window"
msgstr "アイテムショートカットウィンドウ"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:112
+#: src/input/pages/windows.cpp:118
msgid "Setup Window"
msgstr "設定ウィンドウ"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:118
+#: src/input/pages/windows.cpp:124
msgid "Debug Window"
msgstr "デバグウィンドウ"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:124
+#: src/input/pages/windows.cpp:130
msgid "Social Window"
msgstr "ソーシャルウインドウ"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:130
+#: src/input/pages/windows.cpp:136
msgid "Emote Shortcut Window"
msgstr "スマイリーショートカットウィンドウ"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:136
+#: src/input/pages/windows.cpp:142
msgid "Outfits Window"
msgstr "服装ウインドウ"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:142
+#: src/input/pages/windows.cpp:148
msgid "Shop Window"
msgstr "ショップウィンドウ"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:148
+#: src/input/pages/windows.cpp:154
msgid "Quick drop Window"
msgstr "クイックドロップウィンドウ"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:154
+#: src/input/pages/windows.cpp:160
msgid "Kill Stats Window"
msgstr "キルスタッツ窓"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:160
+#: src/input/pages/windows.cpp:166
msgid "Commands Window"
msgstr "コマンドウインドウ"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:166
+#: src/input/pages/windows.cpp:172
msgid "Who Is Online Window"
msgstr "オンラインユーザーウインドウ"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:172
+#: src/input/pages/windows.cpp:178
msgid "Did you know Window"
msgstr "豆知識窓"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:178
+#: src/input/pages/windows.cpp:184
msgid "Quests Window"
msgstr "クエスト窓"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:184
+#: src/input/pages/windows.cpp:190
msgid "Updates Window"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:190
+#: src/input/pages/windows.cpp:196
msgid "Cart window"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:196
+#: src/input/pages/windows.cpp:202
msgid "Quick settings window"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:208
+#: src/input/pages/windows.cpp:214
msgid "Previous Social Tab"
msgstr "前ソーシャルタブ"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:214
+#: src/input/pages/windows.cpp:220
msgid "Next Social Tab"
msgstr "次ソーシャルタブ"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:220
+#: src/input/pages/windows.cpp:226
msgid "Previous Shortcuts tab"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:226
+#: src/input/pages/windows.cpp:232
msgid "Next Shortcuts tab"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:232
+#: src/input/pages/windows.cpp:238
msgid "Previous Commands tab"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:238
+#: src/input/pages/windows.cpp:244
msgid "Next Commands tab"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:244
+#: src/input/pages/windows.cpp:250
msgid "Previous inventory tab"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:250
+#: src/input/pages/windows.cpp:256
msgid "Next inventory tab"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:256
+#: src/input/pages/windows.cpp:262
msgid "Clear drops window"
msgstr ""
@@ -9015,11 +9164,13 @@ msgstr "不明なキャラクターサーバーエラー."
#. TRANSLATORS: error message
#: src/net/ea/charserverrecv.cpp:75
msgid "Failed to create character. Most likely the name is already taken."
-msgstr "キャラクター作成に失敗しました。既に使われている名前もしくは無効な文字が含まれています."
+msgstr ""
+"キャラクター作成に失敗しました。既に使われている名前もしくは無効な文字が含ま"
+"れています."
#. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
-#: src/net/eathena/loginrecv.cpp:104
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:117
+#: src/net/eathena/loginrecv.cpp:109
msgid "Wrong name."
msgstr "名前が違います."
@@ -9081,64 +9232,66 @@ msgid "Request to quit denied!"
msgstr "今キャンセルできません!"
#. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:120 src/net/eathena/loginrecv.cpp:58
+#: src/net/ea/loginrecv.cpp:76 src/net/eathena/loginrecv.cpp:63
msgid "Unregistered ID."
msgstr "未登録なID."
#. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:124 src/net/eathena/loginrecv.cpp:62
+#: src/net/ea/loginrecv.cpp:80 src/net/eathena/loginrecv.cpp:67
msgid "Wrong password."
msgstr "入力したパスワードは間違っています."
#. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:129 src/net/eathena/loginrecv.cpp:67
+#: src/net/ea/loginrecv.cpp:85 src/net/eathena/loginrecv.cpp:72
msgid "Account expired."
msgstr "アカウントの有効期限が切れました."
#. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:133 src/net/eathena/loginrecv.cpp:71
+#: src/net/ea/loginrecv.cpp:89 src/net/eathena/loginrecv.cpp:76
msgid "Rejected from server."
msgstr "サーバーから拒否されました."
#. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:137 src/net/eathena/loginrecv.cpp:75
+#: src/net/ea/loginrecv.cpp:93 src/net/eathena/loginrecv.cpp:80
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr "ゲームから永久追放されました。詳細はGMチームへ連絡して下さい."
#. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:142 src/net/eathena/loginrecv.cpp:80
+#: src/net/ea/loginrecv.cpp:98 src/net/eathena/loginrecv.cpp:85
msgid ""
"Client too old or wrong server type.\n"
"Please update client on http://manaplus.org"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:85
+#: src/net/ea/loginrecv.cpp:103 src/net/eathena/loginrecv.cpp:90
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
"Please contact the GM team via the forums."
-msgstr "あなたは%sまでゲームから追放されました。\nGMにご連絡下さい."
+msgstr ""
+"あなたは%sまでゲームから追放されました。\n"
+"GMにご連絡下さい."
#. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:94
+#: src/net/ea/loginrecv.cpp:109 src/net/eathena/loginrecv.cpp:99
msgid "Server overpopulated."
msgstr "サーバーが混雑しています."
#. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:99
+#: src/net/ea/loginrecv.cpp:113 src/net/eathena/loginrecv.cpp:104
msgid "This user name is already taken."
msgstr "ユーザ名は既に使用されています."
#. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:114
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:119
msgid "Username permanently erased."
msgstr "ユーザーネームは永久に削除されました."
#. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:118
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
+#: src/net/ea/loginrecv.cpp:129 src/net/eathena/loginrecv.cpp:123
+#: src/net/eathena/loginrecv.cpp:214 src/net/tmwa/loginrecv.cpp:128
msgid "Unknown error."
msgstr "不明なエラー."
@@ -9159,33 +9312,33 @@ msgstr "サーバーへの接続が切断されました. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:398
-#: src/net/eathena/charserverrecv.cpp:446
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:444
msgid "Character rename error."
msgstr ""
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:421
+#: src/net/eathena/charserverrecv.cpp:419
msgid "Character renamed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:437
+#: src/net/eathena/charserverrecv.cpp:435
msgid "Rename not allowed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:441
+#: src/net/eathena/charserverrecv.cpp:439
msgid "New name is not set."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:448
msgid "Character not found."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
msgid "Failed to delete character."
msgstr "キャラクター削除に失敗しました."
@@ -9238,7 +9391,7 @@ msgid "Do you accept %s and %s as parents?"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:178 src/net/tmwa/generalhandler.cpp:181
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:179
msgid "Got disconnected from server!"
msgstr "サーバーから切断されました!"
@@ -9456,17 +9609,17 @@ msgid "Unknown item"
msgstr "不明なアイテム"
#. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:202 src/net/tmwa/loginrecv.cpp:116
msgid "Account was not found. Please re-login."
msgstr "アカウントが見つかりませんでした。再度ログインして下さい."
#. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:206 src/net/tmwa/loginrecv.cpp:120
msgid "Old password incorrect."
msgstr "変更前のパスワードが間違っています."
#. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:210 src/net/tmwa/loginrecv.cpp:124
msgid "New password too short."
msgstr "新しいパスワードは文字数が足りません."
@@ -9612,32 +9765,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr "%sはあなたにトレードを申請しています?"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:145
+#: src/net/tmwa/charserverhandler.cpp:143
msgid "Strength:"
msgstr "攻撃力:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:145
msgid "Agility:"
msgstr "機敏さ:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:149
+#: src/net/tmwa/charserverhandler.cpp:147
msgid "Vitality:"
msgstr "防御力:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:151
+#: src/net/tmwa/charserverhandler.cpp:149
msgid "Intelligence:"
msgstr "魔力:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:153
+#: src/net/tmwa/charserverhandler.cpp:151
msgid "Dexterity:"
msgstr "命中率:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:155
+#: src/net/tmwa/charserverhandler.cpp:153
msgid "Luck:"
msgstr "幸運:"
@@ -9792,12 +9945,12 @@ msgid "Extended"
msgstr ""
#. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:353
+#: src/resources/inventory/inventory.cpp:355
msgid "Npc"
msgstr ""
#. TRANSLATORS: memory usage chat message
-#: src/resources/memorymanager.cpp:92
+#: src/resources/memorymanager.cpp:95
#, c-format
msgid "Calculated memory usage: %d"
msgstr ""
@@ -10815,11 +10968,6 @@ msgid "Unused"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:43
-msgid "Support"
-msgstr ""
-
-#. TRANSLATORS: Skill type
#: src/resources/skill/skilltypelist.h:45
msgid "TargetTrap"
msgstr ""
@@ -10828,59 +10976,61 @@ msgstr ""
#: src/utils/booleanoptions.h:29
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "/%sへの可能なオプションは:\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"/%sへの可能なオプションは:\"yes\", \"no\", \"true\", \"false\", \"1\", "
+"\"0\"."
#. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:973
+#: src/utils/stringutils.cpp:972
#, c-format
msgid "%d week"
msgstr "%d週"
-#: src/utils/stringutils.cpp:973
+#: src/utils/stringutils.cpp:972
#, c-format
msgid "%d weeks"
msgstr "%d週"
#. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:984
+#: src/utils/stringutils.cpp:983
#, c-format
msgid "%d day"
msgstr "%d日"
-#: src/utils/stringutils.cpp:984
+#: src/utils/stringutils.cpp:983
#, c-format
msgid "%d days"
msgstr "%d日"
#. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:994
+#: src/utils/stringutils.cpp:993
#, c-format
msgid "%d hour"
msgstr "%d時"
-#: src/utils/stringutils.cpp:994
+#: src/utils/stringutils.cpp:993
#, c-format
msgid "%d hours"
msgstr "%d時"
#. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:1004
+#: src/utils/stringutils.cpp:1003
#, c-format
msgid "%d minute"
msgstr "%d分"
-#: src/utils/stringutils.cpp:1004
+#: src/utils/stringutils.cpp:1003
#, c-format
msgid "%d minutes"
msgstr "%d分"
#. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:1014 src/utils/stringutils.cpp:1020
+#: src/utils/stringutils.cpp:1013 src/utils/stringutils.cpp:1019
#, c-format
msgid "%d second"
msgstr "%d秒"
-#: src/utils/stringutils.cpp:1014 src/utils/stringutils.cpp:1020
+#: src/utils/stringutils.cpp:1013 src/utils/stringutils.cpp:1019
#, c-format
msgid "%d seconds"
msgstr "%d秒"