[Refactor] #40413 Unified English and Japanese resources in util.c

diff --git a/src/util/util.c b/src/util/util.c
index 457bce3..a9f901f 100644 (file)
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -2961,39 +2961,21 @@ typedef struct
 #define MENU_CLASS 1
 #define MENU_WILD 2
 
-#ifdef JP
 special_menu_naiyou special_menu_info[] =
 {
-       {"超能力/特殊能力", 0, 0, MENU_CLASS, CLASS_MINDCRAFTER},
-       {"ものまね/特殊能力", 0, 0, MENU_CLASS, CLASS_IMITATOR},
-       {"歌/特殊能力", 0, 0, MENU_CLASS, CLASS_BARD},
-       {"必殺技/特殊能力", 0, 0, MENU_CLASS, CLASS_SAMURAI},
-       {"練気術/魔法/特殊能力", 0, 0, MENU_CLASS, CLASS_FORCETRAINER},
-       {"技/特殊能力", 0, 0, MENU_CLASS, CLASS_BERSERKER},
-       {"技術/特殊能力", 0, 0, MENU_CLASS, CLASS_SMITH},
-       {"鏡魔法/特殊能力", 0, 0, MENU_CLASS, CLASS_MIRROR_MASTER},
-       {"忍術/特殊能力", 0, 0, MENU_CLASS, CLASS_NINJA},
-       {"広域マップ(<)", 2, 6, MENU_WILD, FALSE},
-       {"通常マップ(>)", 2, 7, MENU_WILD, TRUE},
+       {_("超能力/特殊能力", "MindCraft/Special"), 0, 0, MENU_CLASS, CLASS_MINDCRAFTER},
+       {_("ものまね/特殊能力", "Imitation/Special"), 0, 0, MENU_CLASS, CLASS_IMITATOR},
+       {_("歌/特殊能力", "Song/Special"), 0, 0, MENU_CLASS, CLASS_BARD},
+       {_("必殺技/特殊能力", "Technique/Special"), 0, 0, MENU_CLASS, CLASS_SAMURAI},
+       {_("練気術/魔法/特殊能力", "Mind/Magic/Special"), 0, 0, MENU_CLASS, CLASS_FORCETRAINER},
+       {_("技/特殊能力", "BrutalPower/Special"), 0, 0, MENU_CLASS, CLASS_BERSERKER},
+       {_("技術/特殊能力", "Technique/Special"), 0, 0, MENU_CLASS, CLASS_SMITH},
+       {_("鏡魔法/特殊能力", "MirrorMagic/Special"), 0, 0, MENU_CLASS, CLASS_MIRROR_MASTER},
+       {_("忍術/特殊能力", "Ninjutsu/Special"), 0, 0, MENU_CLASS, CLASS_NINJA},
+       {_("広域マップ(<)", "Enter global map(<)"), 2, 6, MENU_WILD, FALSE},
+       {_("通常マップ(>)", "Enter local map(>)"), 2, 7, MENU_WILD, TRUE},
        {"", 0, 0, 0, 0},
 };
-#else
-special_menu_naiyou special_menu_info[] =
-{
-       {"MindCraft/Special", 0, 0, MENU_CLASS, CLASS_MINDCRAFTER},
-       {"Imitation/Special", 0, 0, MENU_CLASS, CLASS_IMITATOR},
-       {"Song/Special", 0, 0, MENU_CLASS, CLASS_BARD},
-       {"Technique/Special", 0, 0, MENU_CLASS, CLASS_SAMURAI},
-       {"Mind/Magic/Special", 0, 0, MENU_CLASS, CLASS_FORCETRAINER},
-       {"BrutalPower/Special", 0, 0, MENU_CLASS, CLASS_BERSERKER},
-       {"Technique/Special", 0, 0, MENU_CLASS, CLASS_SMITH},
-       {"MirrorMagic/Special", 0, 0, MENU_CLASS, CLASS_MIRROR_MASTER},
-       {"Ninjutsu/Special", 0, 0, MENU_CLASS, CLASS_NINJA},
-       {"Enter global map(<)", 2, 6, MENU_WILD, FALSE},
-       {"Enter local map(>)", 2, 7, MENU_WILD, TRUE},
-       {"", 0, 0, 0, 0},
-};
-#endif
 
 static char inkey_from_menu(player_type *player_ptr)
 {