diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb
index bafb345..1fced18 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 8702b15..afab2f2 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/AssemblyInfo.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/AssemblyInfo.cpp
index 497d1f7..676cb68 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/AssemblyInfo.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/AssemblyInfo.cpp
@@ -31,7 +31,7 @@ using namespace System::Security::Permissions;
 // すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を
 // 既定値にすることができます:
 
-[assembly:AssemblyVersionAttribute("1.7.*")];
+[assembly:AssemblyVersionAttribute("1.8.*")];
 
 [assembly:ComVisible(false)];
 
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm
index 86ac397..18ce442 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.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h
index ff5c7d0..21b32d5 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h
@@ -3486,6 +3486,23 @@ private: System::Windows::Forms::TextBox^  tboxWarningChinaRating;
 		//	}
 		//}
 
+		// 日本語フォントがあるかどうか調べる
+		bool hasJapaneseFont(void)
+		{
+			System::Drawing::Text::InstalledFontCollection ^ifc = gcnew System::Drawing::Text::InstalledFontCollection();
+
+			bool ret = false;
+			for each( System::Drawing::FontFamily ^ff in ifc->Families )
+			{
+				//System::Diagnostics::Debug::WriteLine(ff->Name);
+				if( ff->Name && (ff->Name->ToUpper()->Equals("MS PGOTHIC") || ff->Name->Equals("ＭＳ Ｐゴシック")) )
+				{
+					ret = true;
+				}
+			}
+			return ret;
+		}
+
 	private:
 		// ----------------------------------------------
 		// 固定ファイル名の取得
@@ -3847,6 +3864,12 @@ private: System::Windows::Forms::TextBox^  tboxWarningChinaRating;
 		}
 		System::Void stripItemJapanese_Click(System::Object^  sender, System::EventArgs^  e)
 		{
+			if( !this->hasJapaneseFont() )
+			{
+				this->errMsg( "E_JapaneseFont" );
+				return;
+			}
+
 			this->stripItemEnglish->Checked  = false;
 			this->stripItemJapanese->Checked = true;
 			this->changeJapanese();
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp
index 56ff322..b421b39 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp
@@ -92,6 +92,10 @@ void Form1::construct(void)
 		this->stripItemJapanese->Checked = true;
 		this->stripItemEnglish->Checked  = false;
 		this->changeFormInput("ja");
+
+		// 用途の"Internet"を選択不可にする
+		this->rSubmitInternet->Enabled = false;
+		this->rSubmitInternet->Visible = false;
 	}
 	else
 	{
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp
index e06cfdc..47c8d5a 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp
@@ -56,13 +56,13 @@ void Form1::changeFormInput( System::String ^langname )
 		this->labArbit4->Visible     = true;
 
 		// 日本ではInternet提出を認めないので表示を消す
-		if( this->rSubmitInternet->Checked )
-		{
-			this->rSubmitInternet->Checked = false;		// Internetが選択されているときに表示を消すとどれも選択されていない状況になるので
-			this->rSubmitPost->Checked     = true;		// 必ずどれか1つが選択されているようにしておく
-		}
-		this->rSubmitInternet->Enabled = false;
-		this->rSubmitInternet->Visible = false;
+		//if( this->rSubmitInternet->Checked )
+		//{
+		//	this->rSubmitInternet->Checked = false;		// Internetが選択されているときに表示を消すとどれも選択されていない状況になるので
+		//	this->rSubmitPost->Checked     = true;		// 必ずどれか1つが選択されているようにしておく
+		//}
+		//this->rSubmitInternet->Enabled = false;
+		//this->rSubmitInternet->Visible = false;
 	}
 	else
 	{
@@ -79,8 +79,8 @@ void Form1::changeFormInput( System::String ^langname )
 		this->labArbit2->Visible     = false;
 		this->labArbit4->Visible     = false;
 
-		this->rSubmitInternet->Enabled = true;
-		this->rSubmitInternet->Visible = true;
+		//this->rSubmitInternet->Enabled = true;
+		//this->rSubmitInternet->Visible = true;
 	}
 }
 
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm
index 32cda6f..9be2c7b 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 dfa1822..f528c99 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:1041"
-"CodePage" = "3:932"
-"UILanguageId" = "3:1041"
+"LanguageId" = "3:0"
+"CodePage" = "3:1252"
+"UILanguageId" = "3:0"
 "SccProjectName" = "8:"
 "SccLocalPath" = "8:"
 "SccAuxPath" = "8:"
@@ -57,12 +57,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_69FDEF4B9A5E47BF87030D77CA500CF1"
-        "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_6EC739CA561443E48045379A268C1657"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -105,8 +99,14 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_EE72447B1EAC4E24A028D3AA3060EF26"
-        "OwnerKey" = "8:_69FDEF4B9A5E47BF87030D77CA500CF1"
+        "MsmKey" = "8:_EB97861D2BE24B1889C25826A31A7639"
+        "OwnerKey" = "8:_F5BECC59B4FF45CA9F9146470B41D52D"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_F5BECC59B4FF45CA9F9146470B41D52D"
+        "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -402,7 +402,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.6.3476.31697, Culture=en, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3586.25974, Culture=en, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
                 }
@@ -468,7 +468,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.6.3476.31697, Culture=ja, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3586.25974, Culture=ja, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
                 }
@@ -623,7 +623,7 @@
         }
         "MsiBootstrapper"
         {
-        "LangId" = "3:1041"
+        "LangId" = "3:0"
         "RequiresElevation" = "11:FALSE"
         }
         "Product"
@@ -631,7 +631,7 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:MasterEditorTWL"
         "ProductCode" = "8:{B12B5AFF-26D1-47B5-85B6-1E2A7B5106F5}"
-        "PackageCode" = "8:{81911C57-DB7E-405D-9943-298C27E682F9}"
+        "PackageCode" = "8:{1D0B613E-4E5F-46E7-B3E5-76CC6D251B6B}"
         "UpgradeCode" = "8:{CE22C209-7AE1-4F58-8F6B-6D044BA2A118}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:FALSE"
@@ -1160,11 +1160,11 @@
         }
         "MergeModule"
         {
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_69FDEF4B9A5E47BF87030D77CA500CF1"
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_EB97861D2BE24B1889C25826A31A7639"
             {
             "UseDynamicProperties" = "11:TRUE"
             "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm"
+            "SourcePath" = "8:microsoft_vc90_crt_x86.msm"
                 "Properties"
                 {
                 }
@@ -1174,11 +1174,11 @@
             "Feature" = "8:"
             "IsolateTo" = "8:"
             }
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_EE72447B1EAC4E24A028D3AA3060EF26"
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_F5BECC59B4FF45CA9F9146470B41D52D"
             {
             "UseDynamicProperties" = "11:TRUE"
             "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:microsoft_vc90_crt_x86.msm"
+            "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm"
                 "Properties"
                 {
                 }
diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_e.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_e.xml
index 16d5b4d..a653ec5 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_e.xml
+++ b/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_e.xml
@@ -2,7 +2,7 @@
 <message>
 
 <!-- Begin messages appended in ver1.7-->
-<E_JapaneseFont>Japanese text display is only supported on PCs that have the MS Gothic Japanese font installed.</E_JapaneseFont>
+<E_JapaneseFont>Japanese text display is only supported on PCs that have the MS PGothic Japanese font installed.</E_JapaneseFont>
 <!-- End messages appended in ver1.7-->
 
 <!-- common -->
diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_j.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_j.xml
index c918a80..4fd9192 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_j.xml
+++ b/build/tools/MasterEditor/MasterEditorTWL/resource/gui_msg_j.xml
@@ -2,7 +2,7 @@
 <message>
 
 <!-- 闍ｱ險ｳ萓晞�ｼ ver1.7 霑ｽ蜉�繝｡繝�繧ｻ繝ｼ繧ｸ 縺薙％縺九ｉ -->
-<E_JapaneseFont>�ｼｭ�ｼｳ 繧ｴ繧ｷ繝�繧ｯ (MS Gothic) 繝輔か繝ｳ繝医′繧､繝ｳ繧ｹ繝医�ｼ繝ｫ縺輔ｌ縺ｦ縺�縺ｪ縺ПC縺ｧ縺ｮ譌･譛ｬ隱櫁｡ｨ遉ｺ縺ｫ縺ｯ蟇ｾ蠢懊＠縺ｦ縺�縺ｾ縺帙ｓ縲�</E_JapaneseFont>
+<E_JapaneseFont>�ｼｭ�ｼｳ �ｼｰ繧ｴ繧ｷ繝�繧ｯ (MS PGothic) 繝輔か繝ｳ繝医′繧､繝ｳ繧ｹ繝医�ｼ繝ｫ縺輔ｌ縺ｦ縺�縺ｪ縺ПC縺ｧ縺ｮ譌･譛ｬ隱櫁｡ｨ遉ｺ縺ｫ縺ｯ蟇ｾ蠢懊＠縺ｦ縺�縺ｾ縺帙ｓ縲�</E_JapaneseFont>
 <!-- 闍ｱ險ｳ萓晞�ｼ ver1.7 霑ｽ蜉�繝｡繝�繧ｻ繝ｼ繧ｸ 縺薙％縺ｾ縺ｧ -->
 
 <!-- common -->