diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb
index 67687fc..1d928c6 100644
Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb differ
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo
index 7790b6a..7db01f9 100644
Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo differ
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm
index 64fe3bb..5eb35ad 100644
Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX
index 6c861bb..9405a7a 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX
@@ -1465,7 +1465,7 @@
True
- 230, 207
+ 227, 204
58, 12
@@ -1492,7 +1492,7 @@
True
- 230, 156
+ 227, 153
58, 12
@@ -1981,7 +1981,7 @@
True
- 219, 207
+ 216, 204
58, 12
@@ -2008,7 +2008,7 @@
True
- 219, 156
+ 216, 153
58, 12
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp
index 75bcac5..fcf81a2 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp
@@ -281,18 +281,18 @@ void Form1::loadTmp( System::String ^filename )
// 言語
text = MasterEditorTWL::getXPathText( root, "/MasterEditorTWL/Lang" );
- if( !System::String::IsNullOrEmpty(text) && text->Equals("E") )
- {
- this->stripItemEnglish->Checked = true;
- this->stripItemJapanese->Checked = false;
- this->changeEnglish();
- }
- else
+ if( !System::String::IsNullOrEmpty(text) && text->Equals("J") && this->stripItemJapanese->Enabled ) // 日本語が選択可能なときのみ
{
this->stripItemEnglish->Checked = false;
this->stripItemJapanese->Checked = true;
this->changeJapanese();
}
+ else
+ {
+ this->stripItemEnglish->Checked = true;
+ this->stripItemJapanese->Checked = false;
+ this->changeEnglish();
+ }
this->maskRatingForms(); // ペアレンタルコントロール情報をリージョンに合わせる
this->changeUnnecessaryRatingForms(true); // 一度コンボボックスがenableになるので再設定
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm
index aecc9b5..6570d33 100644
Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm differ
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj
index c46dcb4..5afbe8a 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj
@@ -4,9 +4,9 @@
"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}"
"IsWebType" = "8:FALSE"
"ProjectName" = "8:MasterEditorTWLSetup"
-"LanguageId" = "3:0"
-"CodePage" = "3:1252"
-"UILanguageId" = "3:0"
+"LanguageId" = "3:1041"
+"CodePage" = "3:932"
+"UILanguageId" = "3:1041"
"SccProjectName" = "8:"
"SccLocalPath" = "8:"
"SccAuxPath" = "8:"
@@ -21,6 +21,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_17DEC7700AB24CF788F16DC2E3CA658B"
+ "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_351447BE85794AA58330AD369D8A545D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -45,6 +51,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_66AB9DF4508D46A78B5DD77090E047F2"
+ "OwnerKey" = "8:_17DEC7700AB24CF788F16DC2E3CA658B"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_6EC739CA561443E48045379A268C1657"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -85,6 +97,24 @@
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_BFEA9BAA0DBF4332913A71EDE89FC3CD"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_7DAFD42678FC4D69A3A6BC6E6726AB10"
+ "MsmSig" = "8:_UNDEFINED"
+ }
}
"Configurations"
{
@@ -314,7 +344,7 @@
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.4.3350.18506, Culture=en, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.4.3351.35028, Culture=en, processorArchitecture=MSIL"
"ScatterAssemblies"
{
}
@@ -380,7 +410,7 @@
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.4.3350.18506, Culture=ja, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.4.3351.35028, Culture=ja, processorArchitecture=MSIL"
"ScatterAssemblies"
{
}
@@ -515,7 +545,7 @@
}
"MsiBootstrapper"
{
- "LangId" = "3:0"
+ "LangId" = "3:1041"
"RequiresElevation" = "11:FALSE"
}
"Product"
@@ -523,7 +553,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MasterEditorTWL"
"ProductCode" = "8:{B12B5AFF-26D1-47B5-85B6-1E2A7B5106F5}"
- "PackageCode" = "8:{5577DF15-4D76-4CC2-85EC-4D08A2649CB2}"
+ "PackageCode" = "8:{090C6074-3E94-4D36-AF0F-E6CF082E9464}"
"UpgradeCode" = "8:{CE22C209-7AE1-4F58-8F6B-6D044BA2A118}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:FALSE"
@@ -1052,12 +1082,40 @@
}
"MergeModule"
{
+ "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_17DEC7700AB24CF788F16DC2E3CA658B"
+ {
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:TRUE"
+ "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm"
+ "Properties"
+ {
+ }
+ "LanguageId" = "3:0"
+ "Exclude" = "11:FALSE"
+ "Folder" = "8:"
+ "Feature" = "8:"
+ "IsolateTo" = "8:"
+ }
+ "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_66AB9DF4508D46A78B5DD77090E047F2"
+ {
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:TRUE"
+ "SourcePath" = "8:microsoft_vc90_crt_x86.msm"
+ "Properties"
+ {
+ }
+ "LanguageId" = "3:0"
+ "Exclude" = "11:FALSE"
+ "Folder" = "8:"
+ "Feature" = "8:"
+ "IsolateTo" = "8:"
+ }
}
"ProjectOutput"
{
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_7746D2D347F0423FB46FA2300F6158A4"
{
- "SourcePath" = "8:..\\Release\\MasterEditorTWL.exe"
+ "SourcePath" = "8:..\\Debug\\MasterEditorTWL.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_1494B8B199184797B9C812877A4DFB7F"
diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_e.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_e.xml
index e7f39da..79a5cf2 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_e.xml
+++ b/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_e.xml
@@ -83,9 +83,9 @@ Exception:{0}
Failed to read temporary information.
-Input omission: Input data.
-Input omission: Illegal value.
-Input omission: Select data.
+Insufficient input: Input data.
+Insufficient input: Illegal value.
+Insufficient input: Select data.
Product Name
Product Code
Product Code(Region Code)