From b48f1daf15893fb87745a37f5342c83cdcd7eff1 Mon Sep 17 00:00:00 2001
From: iks <iks3@users.noreply.github.com>
Date: Sat, 20 Mar 2021 23:59:33 +0900
Subject: [PATCH] =?utf8?q?[Fix]=20=E8=8B=B1=E8=AA=9E=E7=89=88=E3=81=A7?=
 =?utf8?q?=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=83=90=E3=83=BC=E3=81=8C?=
 =?utf8?q?=E6=97=A5=E6=9C=AC=E8=AA=9E=20#573?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

æ´æ°ããã¦ããªãã£ãåã®ã¡ãã¥ã¼é ç®ãè¿½å 
---
 Hengband/Hengband/Hengband.vcxproj |  12 ++-
 src/ang_eng.rc                     |   4 +
 src/ang_jp.rc                      | 153 ++++++++++++++++++++++++++++++++++++
 src/angband.rc                     | 157 ++-----------------------------------
 4 files changed, 173 insertions(+), 153 deletions(-)
 create mode 100644 src/ang_jp.rc
diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 6c7be434b..8be50a1bf 100644
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -127,6 +127,10 @@
       <Command>
       </Command>
     </PreBuildEvent>
+    <ResourceCompile>
+      <Culture>0x0411</Culture>
+      <PreprocessorDefinitions>JP</PreprocessorDefinitions>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='English-Debug|Win32'">
     <ClCompile>
@@ -174,6 +178,12 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <SubSystem>Windows</SubSystem>
     </Link>
+    <ResourceCompile>
+      <PreprocessorDefinitions>JP</PreprocessorDefinitions>
+    </ResourceCompile>
+    <ResourceCompile>
+      <Culture>0x0411</Culture>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='English-Release|Win32'">
     <ClCompile>
@@ -1834,4 +1844,4 @@
     <Error Condition="!Exists('..\packages\Microsoft.NetFramework.Analyzers.3.0.0\build\Microsoft.NetFramework.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetFramework.Analyzers.3.0.0\build\Microsoft.NetFramework.Analyzers.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.0.0\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.0.0\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props'))" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/ang_eng.rc b/src/ang_eng.rc
index 2bdabeb9a..b20ca4b08 100644
--- a/src/ang_eng.rc
+++ b/src/ang_eng.rc
@@ -52,6 +52,8 @@ ANGBAND MENU
 			MENUITEM "Term-7 window", 227
 		}
 
+		MENUITEM "&Always display subwindows", 280
+
 		MENUITEM SEPARATOR
 /*
 		POPUP "Bizarre Display"
@@ -125,6 +127,7 @@ ANGBAND MENU
 			MENUITEM "&Bigtile mode", 409
 		}
 
+		MENUITEM "&Music", 411
 		MENUITEM "&Sound", 410
 		MENUITEM "&Back ground pict", 440
 		MENUITEM "Choose BG pict", 441
@@ -135,6 +138,7 @@ ANGBAND MENU
 	POPUP "&Help"
 	{
 		MENUITEM "&Contents", 901
+		MENUITEM "&Spoilers", 902
 	}
 */
 }
diff --git a/src/ang_jp.rc b/src/ang_jp.rc
new file mode 100644
index 000000000..0d9e6f99e
--- /dev/null
+++ b/src/ang_jp.rc
@@ -0,0 +1,153 @@
+/* File: angband.rc */
+
+ANGBAND MENU
+{
+	POPUP "t@C(&F)"
+	{
+		MENUITEM "VK(&N)", 100
+		MENUITEM "J­(&O)...", 101
+		MENUITEM SEPARATOR
+		MENUITEM "Û¶(&S)", 110
+		MENUITEM SEPARATOR
+		MENUITEM "XRA(&C)", 120
+		MENUITEM "[r[(&M)", 121
+		MENUITEM SEPARATOR  
+		MENUITEM "I¹(&X)", 130
+	}
+
+	POPUP "EBhE(&W)"
+	{
+		POPUP "\¦(&V)"
+		{
+			MENUITEM "CEBhE", 200
+			MENUITEM "TuEBhE 1", 201
+			MENUITEM "TuEBhE 2", 202
+			MENUITEM "TuEBhE 3", 203
+			MENUITEM "TuEBhE 4", 204
+			MENUITEM "TuEBhE 5", 205
+			MENUITEM "TuEBhE 6", 206
+			MENUITEM "TuEBhE 7", 207
+		}
+
+		POPUP "tHg(&F)"
+		{
+			MENUITEM "CEBhE", 210
+			MENUITEM "TuEBhE 1", 211
+			MENUITEM "TuEBhE 2", 212
+			MENUITEM "TuEBhE 3", 213
+			MENUITEM "TuEBhE 4", 214
+			MENUITEM "TuEBhE 5", 215
+			MENUITEM "TuEBhE 6", 216
+			MENUITEM "TuEBhE 7", 217
+		}
+
+		POPUP "OÊÉÅè"
+		{
+			MENUITEM "TuEBhE 1", 221
+			MENUITEM "TuEBhE 2", 222
+			MENUITEM "TuEBhE 3", 223
+			MENUITEM "TuEBhE 4", 224
+			MENUITEM "TuEBhE 5", 225
+			MENUITEM "TuEBhE 6", 226
+			MENUITEM "TuEBhE 7", 227
+		}
+
+		MENUITEM "íÉTuEBhEð\¦(&K)", 280
+
+		MENUITEM SEPARATOR
+
+		/*  POPUP "Bizarre Display"
+		{
+			MENUITEM "CEBhE", 230
+			MENUITEM "TuEBhE 1", 231
+			MENUITEM "TuEBhE 2", 232
+			MENUITEM "TuEBhE 3", 233
+			MENUITEM "TuEBhE 4", 234
+			MENUITEM "TuEBhE 5", 235
+			MENUITEM "TuEBhE 6", 236
+			MENUITEM "TuEBhE 7", 237
+		}
+		*/
+
+		POPUP "^CÌðL°é"
+		{
+			MENUITEM "CEBhE", 240
+			MENUITEM "TuEBhE 1", 241
+			MENUITEM "TuEBhE 2", 242
+			MENUITEM "TuEBhE 3", 243
+			MENUITEM "TuEBhE 4", 244
+			MENUITEM "TuEBhE 5", 245
+			MENUITEM "TuEBhE 6", 246
+			MENUITEM "TuEBhE 7", 247
+		}
+
+		POPUP "^CÌðkßé"
+		{
+			MENUITEM "CEBhE", 250
+			MENUITEM "TuEBhE 1", 251
+			MENUITEM "TuEBhE 2", 252
+			MENUITEM "TuEBhE 3", 253
+			MENUITEM "TuEBhE 4", 254
+			MENUITEM "TuEBhE 5", 255
+			MENUITEM "TuEBhE 6", 256
+			MENUITEM "TuEBhE 7", 257
+		}
+
+		POPUP "^CÌ³ðL°é"
+		{
+			MENUITEM "CEBhE", 260
+			MENUITEM "TuEBhE 1", 261
+			MENUITEM "TuEBhE 2", 262
+			MENUITEM "TuEBhE 3", 263
+			MENUITEM "TuEBhE 4", 264
+			MENUITEM "TuEBhE 5", 265
+			MENUITEM "TuEBhE 6", 266
+			MENUITEM "TuEBhE 7", 267
+		}
+
+		POPUP "^CÌ³ðkßé"
+		{
+			MENUITEM "CEBhE", 270
+			MENUITEM "TuEBhE 1", 271
+			MENUITEM "TuEBhE 2", 272
+			MENUITEM "TuEBhE 3", 273
+			MENUITEM "TuEBhE 4", 274
+			MENUITEM "TuEBhE 5", 275
+			MENUITEM "TuEBhE 6", 276
+			MENUITEM "TuEBhE 7", 277
+		}
+	}
+
+	POPUP "IvV(&O)"
+	{
+		POPUP "OtBNX(&G)"
+		{
+			MENUITEM "Èµ(&N)", 400
+			MENUITEM "^C(&O)", 401
+			MENUITEM "&Adam Bolt³ñ^C", 402
+			MENUITEM "V^C", 403
+			MENUITEM "^Cð2{Å\¦", 409
+		}
+		MENUITEM "BGM(&M)", 411
+		MENUITEM "øÊ¹(&S)", 410
+		MENUITEM "Çðg¤(&B)", 440
+		MENUITEM "ÇðIð(&O)...", 441
+		MENUITEM "æÊðHTMLÅÛ¶(&H)...", 450
+		/*  MENUITEM "n}(&M)", 430 */
+		/*  MENUITEM SEPARATOR
+		MENUITEM "¢gp", 410
+		MENUITEM "¢gp", 411*/
+	}
+
+	/*
+	POPUP "wv(&H)"
+	{
+		MENUITEM "êÊ(&G)",      901
+		MENUITEM "X|C[(&S)", 902
+	}
+	*/
+}
+
+ANGBAND ICON "angband.ico"
+
+ANGBAND BITMAP "wall.bmp"
diff --git a/src/angband.rc b/src/angband.rc
index bedfb6b08..b68ed9470 100644
--- a/src/angband.rc
+++ b/src/angband.rc
@@ -1,153 +1,6 @@
 /* File: angband.rc */
-
-ANGBAND MENU
-{
-	POPUP "t@C(&F)"
-	{
-		MENUITEM "VK(&N)", 100
-		MENUITEM "J­(&O)...", 101
-		MENUITEM SEPARATOR
-		MENUITEM "Û¶(&S)", 110
-		MENUITEM SEPARATOR
-		MENUITEM "XRA(&C)", 120
-		MENUITEM "[r[(&M)", 121
-		MENUITEM SEPARATOR  
-		MENUITEM "I¹(&X)", 130
-	}
-
-	POPUP "EBhE(&W)"
-	{
-		POPUP "\¦(&V)"
-		{
-			MENUITEM "CEBhE", 200
-			MENUITEM "TuEBhE 1", 201
-			MENUITEM "TuEBhE 2", 202
-			MENUITEM "TuEBhE 3", 203
-			MENUITEM "TuEBhE 4", 204
-			MENUITEM "TuEBhE 5", 205
-			MENUITEM "TuEBhE 6", 206
-			MENUITEM "TuEBhE 7", 207
-		}
-
-		POPUP "tHg(&F)"
-		{
-			MENUITEM "CEBhE", 210
-			MENUITEM "TuEBhE 1", 211
-			MENUITEM "TuEBhE 2", 212
-			MENUITEM "TuEBhE 3", 213
-			MENUITEM "TuEBhE 4", 214
-			MENUITEM "TuEBhE 5", 215
-			MENUITEM "TuEBhE 6", 216
-			MENUITEM "TuEBhE 7", 217
-		}
-
-		POPUP "OÊÉÅè"
-		{
-			MENUITEM "TuEBhE 1", 221
-			MENUITEM "TuEBhE 2", 222
-			MENUITEM "TuEBhE 3", 223
-			MENUITEM "TuEBhE 4", 224
-			MENUITEM "TuEBhE 5", 225
-			MENUITEM "TuEBhE 6", 226
-			MENUITEM "TuEBhE 7", 227
-		}
-
-		MENUITEM "íÉTuEBhEð\¦(&K)", 280
-
-		MENUITEM SEPARATOR
-
-		/*  POPUP "Bizarre Display"
-		{
-			MENUITEM "CEBhE", 230
-			MENUITEM "TuEBhE 1", 231
-			MENUITEM "TuEBhE 2", 232
-			MENUITEM "TuEBhE 3", 233
-			MENUITEM "TuEBhE 4", 234
-			MENUITEM "TuEBhE 5", 235
-			MENUITEM "TuEBhE 6", 236
-			MENUITEM "TuEBhE 7", 237
-		}
-		*/
-
-		POPUP "^CÌðL°é"
-		{
-			MENUITEM "CEBhE", 240
-			MENUITEM "TuEBhE 1", 241
-			MENUITEM "TuEBhE 2", 242
-			MENUITEM "TuEBhE 3", 243
-			MENUITEM "TuEBhE 4", 244
-			MENUITEM "TuEBhE 5", 245
-			MENUITEM "TuEBhE 6", 246
-			MENUITEM "TuEBhE 7", 247
-		}
-
-		POPUP "^CÌðkßé"
-		{
-			MENUITEM "CEBhE", 250
-			MENUITEM "TuEBhE 1", 251
-			MENUITEM "TuEBhE 2", 252
-			MENUITEM "TuEBhE 3", 253
-			MENUITEM "TuEBhE 4", 254
-			MENUITEM "TuEBhE 5", 255
-			MENUITEM "TuEBhE 6", 256
-			MENUITEM "TuEBhE 7", 257
-		}
-
-		POPUP "^CÌ³ðL°é"
-		{
-			MENUITEM "CEBhE", 260
-			MENUITEM "TuEBhE 1", 261
-			MENUITEM "TuEBhE 2", 262
-			MENUITEM "TuEBhE 3", 263
-			MENUITEM "TuEBhE 4", 264
-			MENUITEM "TuEBhE 5", 265
-			MENUITEM "TuEBhE 6", 266
-			MENUITEM "TuEBhE 7", 267
-		}
-
-		POPUP "^CÌ³ðkßé"
-		{
-			MENUITEM "CEBhE", 270
-			MENUITEM "TuEBhE 1", 271
-			MENUITEM "TuEBhE 2", 272
-			MENUITEM "TuEBhE 3", 273
-			MENUITEM "TuEBhE 4", 274
-			MENUITEM "TuEBhE 5", 275
-			MENUITEM "TuEBhE 6", 276
-			MENUITEM "TuEBhE 7", 277
-		}
-	}
-
-	POPUP "IvV(&O)"
-	{
-		POPUP "OtBNX(&G)"
-		{
-			MENUITEM "Èµ(&N)", 400
-			MENUITEM "^C(&O)", 401
-			MENUITEM "&Adam Bolt³ñ^C", 402
-			MENUITEM "V^C", 403
-			MENUITEM "^Cð2{Å\¦", 409
-		}
-		MENUITEM "BGM(&M)", 411
-		MENUITEM "øÊ¹(&S)", 410
-		MENUITEM "Çðg¤(&B)", 440
-		MENUITEM "ÇðIð(&O)...", 441
-		MENUITEM "æÊðHTMLÅÛ¶(&H)...", 450
-		/*  MENUITEM "n}(&M)", 430 */
-		/*  MENUITEM SEPARATOR
-		MENUITEM "¢gp", 410
-		MENUITEM "¢gp", 411*/
-	}
-
-	/*
-	POPUP "wv(&H)"
-	{
-		MENUITEM "êÊ(&G)",       901
-		MENUITEM "X|C[(&S)", 902
-	}
-	*/
-}
-
-ANGBAND ICON "angband.ico"
-
-ANGBAND BITMAP "wall.bmp"
+#ifdef JP
+#include "ang_jp.rc"
+#else
+#include "ang_eng.rc"
+#endif
-- 
2.11.0

