マスタエディタ:システムが英語のとき日本語の選択を不可にした。英語版の文字化け修正。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@198 7061adef-622a-194b-ae81-725974e89856

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.en.resx

@@ -280,6 +280,9 @@
   <data name="cboxIsInputPerson2.Text" xml:space="preserve">
     <value>Enter Contact 2 (optional)</value>
   </data>
+  <data name="gboxPerson2.Text" xml:space="preserve">
+    <value>Contact 2</value>
+  </data>
   <data name="labArbit4.Size" type="System.Drawing.Size, System.Drawing">
     <value>55, 12</value>
   </data>
@@ -292,8 +295,8 @@
   <data name="labArbit3.Text" xml:space="preserve">
     <value>(Optional)</value>
   </data>
-  <data name="gboxPerson2.Text" xml:space="preserve">
+  <data name="gboxPerson1.Text" xml:space="preserve">
-    <value>Contact 2</value>
+    <value>Contact 1</value>
   </data>
   <data name="labArbit2.Size" type="System.Drawing.Size, System.Drawing">
     <value>55, 12</value>
@@ -307,21 +310,18 @@
   <data name="labArbit1.Text" xml:space="preserve">
     <value>(Optional)</value>
   </data>
-  <data name="gboxPerson1.Text" xml:space="preserve">
-    <value>Contact 1</value>
-  </data>
   <data name="gboxUsage.Text" xml:space="preserve">
     <value>Usage</value>
   </data>
+  <data name="gboxSubmitWay.Text" xml:space="preserve">
+    <value>Submission Method</value>
+  </data>
   <data name="rSubmitHand.Size" type="System.Drawing.Size, System.Drawing">
     <value>62, 16</value>
   </data>
   <data name="rSubmitHand.Text" xml:space="preserve">
     <value>Internet</value>
   </data>
-  <data name="gboxSubmitWay.Text" xml:space="preserve">
-    <value>Submission Method</value>
-  </data>
   <data name="labSubmiteDate.Location" type="System.Drawing.Point, System.Drawing">
     <value>9, 143</value>
   </data>
@@ -361,15 +361,15 @@
   <data name="labProductCodeForeign.Location" type="System.Drawing.Point, System.Drawing">
     <value>9, 74</value>
   </data>
+  <data name="gboxShared2Size.Text" xml:space="preserve">
+    <value>Shared 2 File Size</value>
+  </data>
   <data name="cboxIsShared2.Size" type="System.Drawing.Size, System.Drawing">
     <value>130, 16</value>
   </data>
   <data name="cboxIsShared2.Text" xml:space="preserve">
     <value>Use of Shared 2 File</value>
   </data>
-  <data name="gboxShared2Size.Text" xml:space="preserve">
-    <value>Shared 2 File Size</value>
-  </data>
   <data name="labLib.Size" type="System.Drawing.Size, System.Drawing">
     <value>161, 12</value>
   </data>
@@ -418,15 +418,15 @@
   <data name="cboxIsTmpJump.Text" xml:space="preserve">
     <value>Permit Tmp Jump Landing</value>
   </data>
+  <data name="gboxAccess.Text" xml:space="preserve">
+    <value>Access Control Information</value>
+  </data>
   <data name="labAccessOther.Size" type="System.Drawing.Size, System.Drawing">
     <value>33, 12</value>
   </data>
   <data name="labAccessOther.Text" xml:space="preserve">
     <value>Other</value>
   </data>
-  <data name="gboxAccess.Text" xml:space="preserve">
-    <value>Access Control Information</value>
-  </data>
   <data name="labIsGameCardOn2.Size" type="System.Drawing.Size, System.Drawing">
     <value>119, 11</value>
   </data>
@@ -505,11 +505,17 @@
   <data name="stripItemMiddlewareHtml.Text" xml:space="preserve">
     <value>Create middleware list only (HTML format)</value>
   </data>
+  <data name="tabRomInfo.Text" xml:space="preserve">
+    <value>Basic ROM Info</value>
+  </data>
   <data name="tboxGuideRomInfo.Text" xml:space="preserve">
     <value>Information on this tab cannot be edited. If data errors exist, review the ROM's build settings.</value>
   </data>
-  <data name="tabRomInfo.Text" xml:space="preserve">
+  <data name="tabTWLInfo.Text" xml:space="preserve">
-    <value>Basic ROM Info</value>
+    <value>TWL Extended Info</value>
+  </data>
+  <data name="gboxLaunch.Text" xml:space="preserve">
+    <value>Launch Control on DSi Menu</value>
   </data>
   <data name="labConnectIcon.Size" type="System.Drawing.Size, System.Drawing">
     <value>198, 12</value>
@@ -517,18 +523,18 @@
   <data name="labConnectIcon.Text" xml:space="preserve">
     <value>Display Connection Icon on DSi Menu</value>
   </data>
-  <data name="gboxLaunch.Text" xml:space="preserve">
-    <value>Launch Control on DSi Menu</value>
-  </data>
   <data name="tboxGuideTWLInfo.Text" xml:space="preserve">
     <value>Information on this tab cannot be edited. If data errors exist, review the ROM's build settings.</value>
   </data>
-  <data name="tabTWLInfo.Text" xml:space="preserve">
+  <data name="tabNandSizeInfo.Text" xml:space="preserve">
-    <value>TWL Extended Info</value>
+    <value>DSiWare Info</value>
   </data>
   <data name="tboxGuideNandSizeInfo.Text" xml:space="preserve">
     <value>Information on this tab is required to confirm the amount of space a given Nintendo DSiWare title (NAND application) uses in the system memory. &lt;newline&gt;If the media of the application is a Game Card, there is no need to check the amount of system memory used.</value>
   </data>
+  <data name="gboxNandSize.Text" xml:space="preserve">
+    <value>Amount of System NAND Memory Used by DSiWare Application</value>
+  </data>
   <data name="labNandSize.Location" type="System.Drawing.Point, System.Drawing">
     <value>154, 23</value>
   </data>
@@ -557,7 +563,7 @@
     <value>Actual ROM File Size</value>
   </data>
   <data name="labSumSize2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>111, 194</value>
+    <value>139, 195</value>
   </data>
   <data name="labSumSize2.Size" type="System.Drawing.Size, System.Drawing">
     <value>147, 12</value>
@@ -565,6 +571,9 @@
   <data name="labSumSize2.Text" xml:space="preserve">
     <value>(Total NAND memory used)</value>
   </data>
+  <data name="labSumSize.Location" type="System.Drawing.Point, System.Drawing">
+    <value>209, 180</value>
+  </data>
   <data name="labSumSize.Size" type="System.Drawing.Size, System.Drawing">
     <value>56, 12</value>
   </data>
@@ -581,7 +590,7 @@
     <value>Sub-Banner File Size</value>
   </data>
   <data name="labTmdSize.Location" type="System.Drawing.Point, System.Drawing">
-    <value>18, 144</value>
+    <value>99, 144</value>
   </data>
   <data name="labTmdSize.Size" type="System.Drawing.Size, System.Drawing">
     <value>33, 12</value>
@@ -589,11 +598,11 @@
   <data name="labTmdSize.Text" xml:space="preserve">
     <value>Other</value>
   </data>
-  <data name="gboxNandSize.Text" xml:space="preserve">
+  <data name="tabRomEditInfo.Text" xml:space="preserve">
-    <value>Amount of System NAND Memory Used by DSiWare Application</value>
+    <value>Market and Rating</value>
   </data>
-  <data name="tabNandSizeInfo.Text" xml:space="preserve">
+  <data name="gboxOtherSpec.Text" xml:space="preserve">
-    <value>DSiWare Info</value>
+    <value>Other ROM Specifications</value>
   </data>
   <data name="cboxIsUGC.Size" type="System.Drawing.Size, System.Drawing">
     <value>227, 16</value>
@@ -601,33 +610,33 @@
   <data name="cboxIsUGC.Text" xml:space="preserve">
     <value>UGC (User Generated Content) Support</value>
   </data>
-  <data name="gboxOtherSpec.Text" xml:space="preserve">
-    <value>Other ROM Specifications</value>
-  </data>
   <data name="butSetBack.Text" xml:space="preserve">
     <value>Restore Initial Settings</value>
   </data>
   <data name="tboxGuideRomEditInfo.Text" xml:space="preserve">
     <value>You must complete all items on this tab to create a submission checklist and Master ROM. &lt;newline&gt;This information is used as ROM registration data when the Master ROM is created (excluding "Other ROM Specifications").</value>
   </data>
+  <data name="gboxParental.Text" xml:space="preserve">
+    <value>Market and Rating Information</value>
+  </data>
   <data name="cboxIsUnnecessaryRating.Size" type="System.Drawing.Size, System.Drawing">
     <value>195, 16</value>
   </data>
   <data name="cboxIsUnnecessaryRating.Text" xml:space="preserve">
     <value>Rating Not Required (Tools Only)</value>
   </data>
-  <data name="gboxParental.Text" xml:space="preserve">
+  <data name="tabSubmitInfo.Text" xml:space="preserve">
-    <value>Market and Rating Information</value>
+    <value>Submission Info</value>
-  </data>
-  <data name="tabRomEditInfo.Text" xml:space="preserve">
-    <value>Market and Rating</value>
   </data>
   <data name="labProductNameLimit.Text" xml:space="preserve">
     <value>(30 characters or less)</value>
   </data>
   <data name="tboxGuideSubmitInfo.Text" xml:space="preserve">
     <value>You must complete all items on this tab to create a submission checklist.
-    </value>
+</value>
+  </data>
+  <data name="gboxForeign.Text" xml:space="preserve">
+    <value>Foreign Version</value>
   </data>
   <data name="labProductNameLimitForeign.Text" xml:space="preserve">
     <value>(30 characters or less)</value>
@@ -638,30 +647,27 @@
   <data name="labMultiForeign2.Text" xml:space="preserve">
     <value>(When for &gt;1 market)</value>
   </data>
-  <data name="gboxForeign.Text" xml:space="preserve">
+  <data name="tabCompanyInfo.Text" xml:space="preserve">
-    <value>Foreign Version</value>
+    <value>Company Info</value>
-  </data>
-  <data name="tabSubmitInfo.Text" xml:space="preserve">
-    <value>Submission Info</value>
   </data>
   <data name="tboxGuideCompanyInfo.Text" xml:space="preserve">
     <value>You must complete all items on this tab to create a submission checklist. Enter all information.</value>
   </data>
-  <data name="tabCompanyInfo.Text" xml:space="preserve">
+  <data name="tabErrorInfo.Text" xml:space="preserve">
-    <value>Company Info</value>
+    <value>Error Info</value>
   </data>
   <data name="tboxGuideErrorInfo.Text" xml:space="preserve">
     <value>This tab lists problems in the ROM data file and editing mistakes made when using this program. &lt;newline&gt;Items in red cannot be corrected using this program. You must modify the ROM build settings. &lt;newline&gt;Items in blue indicate problems with the ROM data that can be can corrected using this program. &lt;newline&gt;Items in black indicate errors or omissions in the Submission Info and Company Info tabs.</value>
   </data>
+  <data name="gboxErrorTiming.Text" xml:space="preserve">
+    <value>Display Information From</value>
+  </data>
   <data name="rErrorCurrent.Size" type="System.Drawing.Size, System.Drawing">
     <value>121, 16</value>
   </data>
   <data name="rErrorCurrent.Text" xml:space="preserve">
     <value>Apply current input</value>
   </data>
-  <data name="gboxErrorTiming.Text" xml:space="preserve">
-    <value>Display Information From</value>
-  </data>
   <data name="labWarn.Size" type="System.Drawing.Size, System.Drawing">
     <value>466, 12</value>
   </data>
@@ -686,7 +692,4 @@
   <data name="colErrorBegin.HeaderText" xml:space="preserve">
     <value>Start</value>
   </data>
-  <data name="tabErrorInfo.Text" xml:space="preserve">
-    <value>Error Info</value>
-  </data>
 </root>

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp

@@ -85,7 +85,7 @@ void Form1::construct(void)
 	this->tboxGuideNandSizeInfo->Text = this->tboxGuideNandSizeInfo->Text->Replace( "<newline>", "\r\n" );
 	this->tboxGuideErrorInfo->Text    = this->tboxGuideErrorInfo->Text->Replace( "<newline>", "\r\n" );
 
-	// 言語バージョンにあわせてメニューにチェックを入れる
+	// システムの言語バージョンにあわせて言語切り替え
 	if( System::Threading::Thread::CurrentThread->CurrentUICulture->Name->StartsWith( "ja" ) )
 	{
 		this->stripItemJapanese->Checked = true;
@@ -94,10 +94,12 @@ void Form1::construct(void)
 	else
 	{
 		this->stripItemJapanese->Checked = false;
+		this->stripItemJapanese->Enabled = false;	// 日本語を選択できなくする
 		this->stripItemEnglish->Checked  = true;
+		this->changeEnglish();
 	}
 
-	// 非表示項目
+	// 非公開情報を非表示にする
 	this->changeVisibleForms( false );
 
 	// 設定ファイルの読み込み

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj

@@ -13,6 +13,24 @@
 "SccProvider" = "8:"
     "Hierarchy"
     {
+        "Entry"
+        {
+        "MsmKey" = "8:_0D0C05C8F5C64A36ABB4BFA2AA2727E4"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_351447BE85794AA58330AD369D8A545D"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_450932A0FF6842D68977626BA6866783"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
         "Entry"
         {
         "MsmKey" = "8:_491C89DAB2F34A939F356C47975E7BD0"
@@ -21,6 +39,18 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_4A789B616E314FB4B5958DC9AAFA6335"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_57981071910E47608EC25993EFADCA59"
+        "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_6EC739CA561443E48045379A268C1657"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -57,6 +87,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_EE873D93FEA246E684A3938326F6C12B"
+        "OwnerKey" = "8:_57981071910E47608EC25993EFADCA59"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_FE56DE664C36410FB05BBF909ADE9DBE"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -64,6 +100,12 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_BFEA9BAA0DBF4332913A71EDE89FC3CD"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -178,6 +220,66 @@
         }
         "File"
         {
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0D0C05C8F5C64A36ABB4BFA2AA2727E4"
+            {
+            "SourcePath" = "8:..\\resource\\mrc_msg_e.xml"
+            "TargetName" = "8:mrc_msg_e.xml"
+            "Tag" = "8:"
+            "Folder" = "8:_99EFE6B595C5432FB4712560C9D29AE5"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_351447BE85794AA58330AD369D8A545D"
+            {
+            "SourcePath" = "8:..\\resource\\gui_msg_j.xml"
+            "TargetName" = "8:gui_msg_j.xml"
+            "Tag" = "8:"
+            "Folder" = "8:_99EFE6B595C5432FB4712560C9D29AE5"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_450932A0FF6842D68977626BA6866783"
+            {
+            "SourcePath" = "8:..\\resource\\gui_msg_e.xml"
+            "TargetName" = "8:gui_msg_e.xml"
+            "Tag" = "8:"
+            "Folder" = "8:_99EFE6B595C5432FB4712560C9D29AE5"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_491C89DAB2F34A939F356C47975E7BD0"
             {
             "SourcePath" = "8:..\\resource\\middleware.xsl"
@@ -198,6 +300,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4A789B616E314FB4B5958DC9AAFA6335"
+            {
+            "SourcePath" = "8:..\\resource\\mrc_msg_j.xml"
+            "TargetName" = "8:mrc_msg_j.xml"
+            "Tag" = "8:"
+            "Folder" = "8:_99EFE6B595C5432FB4712560C9D29AE5"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6EC739CA561443E48045379A268C1657"
             {
             "SourcePath" = "8:..\\resource\\middleware_e.xsl"
@@ -222,7 +344,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.3.3344.19594, Culture=en, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.4.3350.17291, Culture=en, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
                     "_7DAFD42678FC4D69A3A6BC6E6726AB10"
@@ -293,7 +415,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.3.3344.19594, Culture=ja, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.4.3350.17291, Culture=ja, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
                     "_BFEA9BAA0DBF4332913A71EDE89FC3CD"
@@ -441,7 +563,7 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:MasterEditorTWL"
         "ProductCode" = "8:{B12B5AFF-26D1-47B5-85B6-1E2A7B5106F5}"
-        "PackageCode" = "8:{B5B2BB09-AD1A-47DE-B067-897C72BB682C}"
+        "PackageCode" = "8:{24F48D46-3E0F-41AC-AEE8-62358AE64A5D}"
         "UpgradeCode" = "8:{CE22C209-7AE1-4F58-8F6B-6D044BA2A118}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:FALSE"
@@ -970,12 +1092,40 @@
         }
         "MergeModule"
         {
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_57981071910E47608EC25993EFADCA59"
+            {
+            "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}:_EE873D93FEA246E684A3938326F6C12B"
+            {
+            "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:..\\Debug\\MasterEditorTWL.exe"
+            "SourcePath" = "8:..\\Release\\MasterEditorTWL.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_1494B8B199184797B9C812877A4DFB7F"