[Refactor] #37353 メッセージ整理。(window_flag_desc) / Refactor messages. (window_flag_desc)

diff --git a/src/cmd4.c b/src/cmd4.c
index ece0cc1..ba00b86 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -806,11 +806,9 @@ static void do_cmd_disp_nikki(void)
        else strcpy(tmp,subtitle[randint0(MAX_SUBTITLE-2)+1]);
 
 #ifdef JP
        else strcpy(tmp,subtitle[randint0(MAX_SUBTITLE-2)+1]);
 
 #ifdef JP

-       sprintf(nikki_title, "「%s%s%sの伝説 -%s-」",
-               ap_ptr->title, ap_ptr->no ? "の" : "", p_ptr->name, tmp);
+       sprintf(nikki_title, "「%s%s%sの伝説 -%s-」", ap_ptr->title, ap_ptr->no ? "の" : "", p_ptr->name, tmp);

 #else
 #else

-       sprintf(nikki_title, "Legend of %s %s '%s'",
-               ap_ptr->title, p_ptr->name, tmp);
+       sprintf(nikki_title, "Legend of %s %s '%s'", ap_ptr->title, p_ptr->name, tmp);

 #endif
 
        /* Display the file contents */
 #endif
 
        /* Display the file contents */

diff --git a/src/tables.c b/src/tables.c
index bde47c4..45fb4be 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -4821,87 +4821,22 @@ const concptr stat_names_reduced[6] =
  */
 const concptr window_flag_desc[32] =
 {
  */
 const concptr window_flag_desc[32] =
 {

-#ifdef JP
-       "持ち物/装備一覧",
-#else
-       "Display inven/equip",
-#endif
-
-#ifdef JP
-       "装備/持ち物一覧",
-#else
-       "Display equip/inven",
-#endif
-
-#ifdef JP
-       "呪文一覧",
-#else
-       "Display spell list",
-#endif
-
-#ifdef JP
-       "キャラクタ情報",
-#else
-       "Display character",
-#endif
-               
-#ifdef JP
-       "視界内のモンスター表示",
-#else
-       "Display monsters in sight",
-#endif         
-
+       _("持ち物/装備一覧", "Display inven/equip"),
+       _("装備/持ち物一覧", "Display equip/inven"),
+       _("呪文一覧", "Display spell list"),
+       _("キャラクタ情報", "Display character"),
+       _("視界内のモンスター表示", "Display monsters in sight"),

        NULL,
        NULL,

-#ifdef JP
-       "メッセージ",
-#else
-       "Display messages",
-#endif
-
-#ifdef JP
-       "ダンジョン全体図",
-#else
-       "Display overhead view",
-#endif
-
-#ifdef JP
-       "モンスターの思い出",
-#else
-       "Display monster recall",
-#endif
-
-#ifdef JP
-       "アイテムの詳細",
-#else
-       "Display object recall",
-#endif
-
-#ifdef JP
-       "自分の周囲を表示", 
-#else
-       "Display dungeon view",
-#endif
-
-#ifdef JP
-       "記念撮影",
-#else
-       "Display snap-shot",
-#endif
-
+       _("メッセージ", "Display messages"),
+       _("ダンジョン全体図", "Display overhead view"),
+       _("モンスターの思い出", "Display monster recall"),
+       _("アイテムの詳細", "Display object recall"),
+       _("自分の周囲を表示", "Display dungeon view"),
+       _("記念撮影", "Display snap-shot"),

        NULL,
        NULL,
        NULL,
        NULL,

-#ifdef JP
-       "ボーグ・メッセージ",
-#else
-       "Display borg messages",
-#endif
-
-#ifdef JP
-       "ボーグ・ステータス",
-#else
-       "Display borg status",
-#endif
-
+       _("ボーグ・メッセージ", "Display borg messages"),
+       _("ボーグ・ステータス", "Display borg status"),

        NULL,
        NULL,
        NULL,
        NULL,
        NULL,
        NULL,