From 568cf1908df485de741922e331205fc828570e18 Mon Sep 17 00:00:00 2001
From: Deskull <deskull@users.sourceforge.jp>
Date: Mon, 14 Jan 2019 12:55:00 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E3=83=A1=E3=83=83?=
 =?utf8?q?=E3=82=BB=E3=83=BC=E3=82=B8=E6=95=B4=E7=90=86=E3=80=82(window=5F?=
 =?utf8?q?flag=5Fdesc)=20/=20Refactor=20messages.=20(window=5Fflag=5Fdesc)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cmd4.c   |  6 ++--
 src/tables.c | 91 +++++++++---------------------------------------------------
 2 files changed, 15 insertions(+), 82 deletions(-)

diff --git a/src/cmd4.c b/src/cmd4.c
index ece0cc166..ba00b86bf 100644
--- 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
-	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
-	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 */
diff --git a/src/tables.c b/src/tables.c
index bde47c424..45fb4be1c 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -4821,87 +4821,22 @@ const concptr stat_names_reduced[6] =
  */
 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,
-#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,
-#ifdef JP
-	"ボーグ・メッセージ",
-#else
-	"Display borg messages",
-#endif
-
-#ifdef JP
-	"ボーグ・ステータス",
-#else
-	"Display borg status",
-#endif
-
+	_("ボーグ・メッセージ", "Display borg messages"),
+	_("ボーグ・ステータス", "Display borg status"),
 	NULL,
 	NULL,
 	NULL,
-- 
2.11.0