Unify the spelling of Hong Meiling

y-iihoshi · Jan 3, 2025 · 1040ee9 · 1040ee9
1 parent 1316ec0
commit 1040ee9
Show file tree

Hide file tree

Showing 5 changed files with 179 additions and 139 deletions.
diff --git a/ThScoreFileConverter.Core/Models/Th095/Definitions.cs b/ThScoreFileConverter.Core/Models/Th095/Definitions.cs
@@ -50,13 +50,13 @@ public static class Definitions
             { (Level.Four,  7), (Enemy.Medicine,  "譫妄「イントゥデリリウム」") },
             { (Level.Four,  8), (Enemy.Tewi,      "借符「大穴牟遅様の薬」") },
             { (Level.Four,  9), (Enemy.Reisen,    "狂夢「風狂の夢（ドリームワールド）」") },
-            { (Level.Five,  1), (Enemy.Meirin,    string.Empty) },
+            { (Level.Five,  1), (Enemy.Meiling,    string.Empty) },
             { (Level.Five,  2), (Enemy.Patchouli, "日＆水符「ハイドロジェナスプロミネンス」") },
-            { (Level.Five,  3), (Enemy.Meirin,    "華符「彩光蓮華掌」") },
+            { (Level.Five,  3), (Enemy.Meiling,    "華符「彩光蓮華掌」") },
             { (Level.Five,  4), (Enemy.Patchouli, "水＆火符「フロギスティックレイン」") },
-            { (Level.Five,  5), (Enemy.Meirin,    "彩翔「飛花落葉」") },
+            { (Level.Five,  5), (Enemy.Meiling,    "彩翔「飛花落葉」") },
             { (Level.Five,  6), (Enemy.Patchouli, "月＆木符「サテライトヒマワリ」") },
-            { (Level.Five,  7), (Enemy.Meirin,    "彩華「虹色太極拳」") },
+            { (Level.Five,  7), (Enemy.Meiling,    "彩華「虹色太極拳」") },
             { (Level.Five,  8), (Enemy.Patchouli, "日＆月符「ロイヤルダイアモンドリング」") },
             { (Level.Six,   1), (Enemy.Chen,      string.Empty) },
             { (Level.Six,   2), (Enemy.Youmu,     "人智剣「天女返し」") },

diff --git a/ThScoreFileConverter.Core/Models/Th095/Enemy.cs b/ThScoreFileConverter.Core/Models/Th095/Enemy.cs
@@ -67,10 +67,10 @@ public enum Enemy
     Reisen,
 
     /// <summary>
-    /// Hon Meirin.
+    /// Hong Meiling.
     /// </summary>
-    [Character(nameof(Meirin))]
-    Meirin,
+    [Character(nameof(Meiling))]
+    Meiling,
 
     /// <summary>
     /// Patchouli Knowledge.

diff --git a/ThScoreFileConverter.Core/Resources/CharacterNames.Designer.cs b/ThScoreFileConverter.Core/Resources/CharacterNames.Designer.cs
diff --git a/ThScoreFileConverter.Core/Resources/CharacterNames.ja-JP.resx b/ThScoreFileConverter.Core/Resources/CharacterNames.ja-JP.resx
@@ -1,76 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
-		Microsoft ResX Schema
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
 
-		Version 1.3
-
-		The primary goals of this format is to allow a simple XML format 
-		that is mostly human readable. The generation and parsing of the 
-		various data types are done through the TypeConverter classes 
-		associated with the data types.
-
-		Example:
-
-		... ado.net/XML headers & schema ...
-		<resheader name="resmimetype">text/microsoft-resx</resheader>
-		<resheader name="version">1.3</resheader>
-		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-		<data name="Name1">this is my long string</data>
-		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-			[base64 mime encoded serialized .NET Framework object]
-		</data>
-		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-			[base64 mime encoded string representing a byte array form of the .NET Framework object]
-		</data>
-
-		There are any number of "resheader" rows that contain simple 
-		name/value pairs.
-
-		Each data row contains a name, and value. The row also contains a 
-		type or mimetype. Type corresponds to a .NET class that support 
-		text/value conversion through the TypeConverter architecture. 
-		Classes that don't support this are serialized and stored with the 
-		mimetype set.
-
-		The mimetype is used for serialized objects, and tells the 
-		ResXResourceReader how to depersist the object. This is currently not 
-		extensible. For a given mimetype the value must be set accordingly:
-
-		Note - application/x-microsoft.net.object.binary.base64 is the format 
-		that the ResXResourceWriter will generate, however the reader can 
-		read any of the formats listed below.
-
-		mimetype: application/x-microsoft.net.object.binary.base64
-		value   : The object must be serialized with 
-			: System.Serialization.Formatters.Binary.BinaryFormatter
-			: and then encoded with base64 encoding.
-
-		mimetype: application/x-microsoft.net.object.soap.base64
-		value   : The object must be serialized with 
-			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-			: and then encoded with base64 encoding.
-
-		mimetype: application/x-microsoft.net.object.bytearray.base64
-		value   : The object must be serialized into a byte array 
-			: using a System.ComponentModel.TypeConverter
-			: and then encoded with base64 encoding.
-	-->
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
@@ -89,13 +109,13 @@
     <value>text/microsoft-resx</value>
   </resheader>
   <resheader name="version">
-    <value>1.3</value>
+    <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Alice" xml:space="preserve">
     <value>アリス</value>
@@ -427,10 +447,10 @@
   <data name="MegumuFullName" xml:space="preserve">
     <value>飯綱丸 龍</value>
   </data>
-  <data name="Meirin" xml:space="preserve">
+  <data name="Meiling" xml:space="preserve">
     <value>美鈴</value>
   </data>
-  <data name="MeirinFullName" xml:space="preserve">
+  <data name="MeilingFullName" xml:space="preserve">
     <value>紅 美鈴</value>
   </data>
   <data name="Merlin" xml:space="preserve">