2.2.9.2

DataEditorX/CodeEditForm.cs

@@ -78,16 +78,16 @@ void InitForm()
             popupMenu_find.Items.Width = 300;
             title = this.Text;
 
-            string fontname = MyConfig.readString(CodeConfig.TAG_FONT_NAME);
-            float fontsize = MyConfig.readFloat(CodeConfig.TAG_FONT_SIZE, 14);
+            string fontname = MyConfig.readString(MyConfig.TAG_FONT_NAME);
+            float fontsize = MyConfig.readFloat(MyConfig.TAG_FONT_SIZE, 14);
             fctb.Font = new Font(fontname, fontsize);
-            if (MyConfig.readBoolean(CodeConfig.TAG_IME))
+            if (MyConfig.readBoolean(MyConfig.TAG_IME))
                 fctb.ImeMode = ImeMode.On;
-            if (MyConfig.readBoolean(CodeConfig.TAG_WORDWRAP))
+            if (MyConfig.readBoolean(MyConfig.TAG_WORDWRAP))
                 fctb.WordWrap = true;
             else
                 fctb.WordWrap = false;
-            if (MyConfig.readBoolean(CodeConfig.TAG_TAB2SPACES))
+            if (MyConfig.readBoolean(MyConfig.TAG_TAB2SPACES))
                 tabisspaces = true;
             else
                 tabisspaces = false;

DataEditorX/Config/CodeConfig.cs

@@ -11,12 +11,6 @@ namespace DataEditorX.Config
     /// </summary>
     public class CodeConfig
     {
-        public const string TAG_FONT_NAME = "fontname";
-        public const string TAG_FONT_SIZE = "fontsize";
-        public const string TAG_IME = "IME";
-        public const string TAG_WORDWRAP = "wordwrap";
-        public const string TAG_TAB2SPACES = "tabisspace";
-
 
         #region 成员
         public CodeConfig()

DataEditorX/Config/DataConfig.cs

@@ -16,14 +16,6 @@ namespace DataEditorX.Config
     /// </summary>
     public class DataConfig
     {
-        public const string TAG_RULE = "rule";
-        public const string TAG_RACE = "race";
-        public const string TAG_ATTRIBUTE = "attribute";
-        public const string TAG_LEVEL = "level";
-        public const string TAG_CATEGORY = "category";
-        public const string TAG_TYPE = "type";
-        public const string TAG_SETNAME = "setname";
-
         public DataConfig()
         {
             InitMember(MyPath.Combine(Application.StartupPath, MyConfig.TAG_CARDINFO+".txt"));
@@ -48,13 +40,13 @@ public void InitMember(string conf)
             }
             //提取内容
             string text = File.ReadAllText(conf);
-            dicCardRules = DataManager.Read(text, TAG_RULE);
-            dicSetnames = DataManager.Read(text, TAG_SETNAME);
-            dicCardTypes = DataManager.Read(text, TAG_TYPE);
-            dicCardcategorys = DataManager.Read(text, TAG_CATEGORY);
-            dicCardAttributes = DataManager.Read(text, TAG_ATTRIBUTE);
-            dicCardRaces = DataManager.Read(text, TAG_RACE);
-            dicCardLevels = DataManager.Read(text, TAG_LEVEL);
+            dicCardRules = DataManager.Read(text, MyConfig.TAG_RULE);
+            dicSetnames = DataManager.Read(text, MyConfig.TAG_SETNAME);
+            dicCardTypes = DataManager.Read(text, MyConfig.TAG_TYPE);
+            dicCardcategorys = DataManager.Read(text, MyConfig.TAG_CATEGORY);
+            dicCardAttributes = DataManager.Read(text, MyConfig.TAG_ATTRIBUTE);
+            dicCardRaces = DataManager.Read(text, MyConfig.TAG_RACE);
+            dicCardLevels = DataManager.Read(text, MyConfig.TAG_LEVEL);
 
 		}
 

DataEditorX/Config/DataManager.cs

@@ -18,7 +18,7 @@ public class DataManager
     {
         public const string TAG_START = "##";
         public const string TAG_END = "#";
-        public const string SEP_LINE = "	";
+        public const char SEP_LINE = '\t';
 
         #region 根据tag获取内容
         static string reReturn(string content)
@@ -78,26 +78,21 @@ public static string subString(string content, string tag)
         public static Dictionary<long, string> Read(string[] lines)
         {
             Dictionary<long, string> tempDic = new Dictionary<long, string>();
-            string strkey, strword;
-            int l;
             long lkey;
             foreach (string line in lines)
             {
                 if (line.StartsWith("#"))
                     continue;
-                if ((l = line.IndexOf(SEP_LINE)) < 0)
+                string[] words = line.Split(SEP_LINE);
+                if (words.Length < 2)
                     continue;
-                strkey = line.Substring(0, l).Replace("0x", "");
-                strword = line.Substring(l + 1);
-                int t = strword.IndexOf(SEP_LINE);
-                if (t > 0)
-                    strword = strword.Substring(0, t);
-                if (line.StartsWith("0x"))
-                    long.TryParse(strkey, NumberStyles.HexNumber, null, out lkey);
+                if (words[0].StartsWith("0x"))
+                    long.TryParse(words[0].Replace("0x", ""), NumberStyles.HexNumber, null, out lkey);
                 else
-                    long.TryParse(strkey, out lkey);
-                if (!tempDic.ContainsKey(lkey) && strword != "N/A")
-                    tempDic.Add(lkey, strword);
+                    long.TryParse(words[0], out lkey);
+                // N/A 的数据不显示
+                if (!tempDic.ContainsKey(lkey) && words[1] != "N/A")
+                    tempDic.Add(lkey, words[1]);
             }
             return tempDic;
         }

DataEditorX/Config/ImageSet.cs

@@ -15,11 +15,7 @@ namespace DataEditorX.Config
 
 	public class ImageSet
 	{
-        public const string TAG_IMAGE_OTHER = "image_other";
-        public const string TAG_IMAGE_XYZ = "image_xyz";
-        public const string TAG_IMAGE_PENDULUM = "image_pendulum";
-        public const string TAG_IMAGE_SIZE = "image";
-        public const string TAG_IMAGE_QUILTY = "image_quilty";
+
 		bool isInit;
 		public ImageSet(){
 			isInit=false;
@@ -29,20 +25,20 @@ public void Init()
 			if(isInit)
 				return;
 			isInit=true;
-            this.normalArea = MyConfig.readArea(TAG_IMAGE_OTHER);
+            this.normalArea = MyConfig.readArea(MyConfig.TAG_IMAGE_OTHER);
 
-            this.xyzArea = MyConfig.readArea(TAG_IMAGE_XYZ);
+            this.xyzArea = MyConfig.readArea(MyConfig.TAG_IMAGE_XYZ);
 
-            this.pendulumArea = MyConfig.readArea(TAG_IMAGE_PENDULUM);
+            this.pendulumArea = MyConfig.readArea(MyConfig.TAG_IMAGE_PENDULUM);
 
-            int[] ints = MyConfig.readIntegers(TAG_IMAGE_SIZE, 4);
+            int[] ints = MyConfig.readIntegers(MyConfig.TAG_IMAGE_SIZE, 4);
 
             this.w = ints[0];
             this.h = ints[1];
             this.W = ints[2];
             this.H = ints[3];
 
-            this.quilty = MyConfig.readInteger(TAG_IMAGE_QUILTY, 95);
+            this.quilty = MyConfig.readInteger(MyConfig.TAG_IMAGE_QUILTY, 95);
 		}
 		public int quilty;
 		public int w,h,W,H;

DataEditorX/Config/MSEConfig.cs

@@ -37,9 +37,9 @@ public class MSEConfig
         public const string TAG_REP = "%%";
         public const string SEP_LINE = " ";
         //默认的配置
-        public const string FILE_CONFIG = "mse_chs.txt";
+        public const string FILE_CONFIG_NAME = "Chinese-Simplified";
         public const string PATH_IMAGE = "Images";
-        public string configName = FILE_CONFIG;
+        public string configName = FILE_CONFIG_NAME;
         
         public MSEConfig(string path)
         {
@@ -52,7 +52,7 @@ public void SetConfig(string config, string path)
             regx_monster = "(\\s\\S*?)";
             regx_pendulum = "(\\s\\S*?)";
             //设置文件名
-            configName = Path.GetFileName(config);
+            configName = getLanguage(config);
 
             replaces = new Dictionary<string, string>();
 
@@ -74,9 +74,9 @@ public void SetConfig(string config, string path)
                 else if (line.StartsWith(TAG_TRAP))
                     str_trap = ConfHelper.getValue(line);
                 else if (line.StartsWith(TAG_REG_PENDULUM))
-                    regx_pendulum = ConfHelper.getMultLineValue(line);
+                    regx_pendulum = ConfHelper.getValue(line);
                 else if (line.StartsWith(TAG_REG_MONSTER))
-                    regx_monster = ConfHelper.getMultLineValue(line);
+                    regx_monster = ConfHelper.getValue(line);
                 else if (line.StartsWith(TAG_MAXCOUNT))
                     maxcount = ConfHelper.getIntegerValue(line, 0);
                 else if (line.StartsWith(TAG_IMAGE))
@@ -108,16 +108,28 @@ public void init(string path)
             Iscn2tw = false;
  
             //读取配置
-            string tmp = MyPath.Combine(path, MyConfig.readString(MyConfig.TAG_MSE));
+            string tmp = MyPath.Combine(path, getFileName(MyConfig.readString(MyConfig.TAG_MSE)));
             
             if (!File.Exists(tmp))
             {
-                tmp = MyPath.Combine(path, FILE_CONFIG);
+                tmp = MyPath.Combine(path, getFileName(FILE_CONFIG_NAME));
                 if(!File.Exists(tmp))
                     return;//如果默认的也不存在
             }
             SetConfig(tmp, path);
         }
+        public static string getFileName(string lang)
+        {
+            return "mse_" + lang + ".txt";
+        }
+        public static string getLanguage(string file)
+        {
+            string name = Path.GetFileNameWithoutExtension(file);
+            if (!name.StartsWith("mse_"))
+                return "";
+            else
+                return name.Replace("mse_", "");
+        }
 
         //每个存档最大数
         public int maxcount;

DataEditorX/Config/MyConfig.cs

@@ -13,7 +13,6 @@ class MyConfig
         public const string TAG_CARDINFO = "cardinfo";
         public const string TAG_LANGUAGE = "language";
 
-        public const string FILE_LANGUAGE = "language.txt";
         public const string FILE_TEMP = "open.tmp";
         public const string FILE_HISTORY = "history.txt";
         
@@ -23,6 +22,26 @@ class MyConfig
         public const string TAG_SOURCE_URL = "sourceURL";
         public const string TAG_UPDATE_URL = "updateURL";
 
+        public const string TAG_IMAGE_OTHER = "image_other";
+        public const string TAG_IMAGE_XYZ = "image_xyz";
+        public const string TAG_IMAGE_PENDULUM = "image_pendulum";
+        public const string TAG_IMAGE_SIZE = "image";
+        public const string TAG_IMAGE_QUILTY = "image_quilty";
+
+        public const string TAG_FONT_NAME = "fontname";
+        public const string TAG_FONT_SIZE = "fontsize";
+        public const string TAG_IME = "IME";
+        public const string TAG_WORDWRAP = "wordwrap";
+        public const string TAG_TAB2SPACES = "tabisspace";
+
+        public const string TAG_RULE = "rule";
+        public const string TAG_RACE = "race";
+        public const string TAG_ATTRIBUTE = "attribute";
+        public const string TAG_LEVEL = "level";
+        public const string TAG_CATEGORY = "category";
+        public const string TAG_TYPE = "type";
+        public const string TAG_SETNAME = "setname";
+
         public static string readString(string key)
         {
             return GetAppConfig(key);
@@ -82,14 +101,14 @@ public static void Save(string appKey, string appValue)
             XmlDocument xDoc = new XmlDocument();
             xDoc.Load(System.Windows.Forms.Application.ExecutablePath + ".config");
 
-            var xNode = xDoc.SelectSingleNode("//appSettings");
+            XmlNode xNode = xDoc.SelectSingleNode("//appSettings");
 
-            var xElem = (XmlElement)xNode.SelectSingleNode("//add[@key='" + appKey + "']");
+            XmlElement xElem = (XmlElement)xNode.SelectSingleNode("//add[@key='" + appKey + "']");
             if (xElem != null) //存在，则更新
                 xElem.SetAttribute("value", appValue);
             else//不存在，则插入
             {
-                var xNewElem = xDoc.CreateElement("add");
+                XmlElement xNewElem = xDoc.CreateElement("add");
                 xNewElem.SetAttribute("key", appKey);
                 xNewElem.SetAttribute("value", appValue);
                 xNode.AppendChild(xNewElem);
@@ -101,9 +120,9 @@ public static string GetAppConfig(string appKey)
             XmlDocument xDoc = new XmlDocument();
             xDoc.Load(System.Windows.Forms.Application.ExecutablePath + ".config");
 
-            var xNode = xDoc.SelectSingleNode("//appSettings");
+            XmlNode xNode = xDoc.SelectSingleNode("//appSettings");
 
-            var xElem = (XmlElement)xNode.SelectSingleNode("//add[@key='" + appKey + "']");
+            XmlElement xElem = (XmlElement)xNode.SelectSingleNode("//add[@key='" + appKey + "']");
 
             if (xElem != null)
             {

DataEditorX/DataEditForm.cs

@@ -285,7 +285,8 @@ void InitCheckPanel(FlowLayoutPanel fpanel, Dictionary<long, string> dic)
             foreach (long key in dic.Keys)
             {
                 CheckBox _cbox = new CheckBox();
-                _cbox.Name = fpanel.Name + key.ToString();
+                _cbox.Name = fpanel.Name + key.ToString("x");
+                _cbox.Tag = key;
                 _cbox.Text = dic[key];
                 _cbox.AutoSize = true;
                 _cbox.Margin = fpanel.Margin;
@@ -338,7 +339,10 @@ string SetCheck(FlowLayoutPanel fpl, long number)
                 if (c is CheckBox)
                 {
                     CheckBox cbox = (CheckBox)c;
-                    long.TryParse(cbox.Name.Substring(fpl.Name.Length), out temp);
+                    if (cbox.Tag == null)
+                        temp = 0;
+                    else
+                        temp = (long)cbox.Tag;
 
                     if ((temp & number) == temp && temp != 0)
                     {
@@ -424,7 +428,10 @@ long GetCheck(FlowLayoutPanel fpl)
                 if (c is CheckBox)
                 {
                     CheckBox cbox = (CheckBox)c;
-                    long.TryParse(cbox.Name.Substring(fpl.Name.Length), out temp);
+                    if (cbox.Tag == null)
+                        temp = 0;
+                    else
+                        temp = (long)cbox.Tag;
                     if (cbox.Checked)
                         number += temp;
                 }
@@ -1599,14 +1606,14 @@ void AddMenuItemFormMSE()
             string[] files = Directory.GetFiles(datapath);
             foreach (string file in files)
             {
-                string name = Path.GetFileName(file);
-                if (!name.StartsWith("mse"))
+                string name = MSEConfig.getLanguage(file);
+                if (string.IsNullOrEmpty(name))
                     continue;
                 ToolStripMenuItem tsmi = new ToolStripMenuItem(name);
+                tsmi.ToolTipText = file;
+                tsmi.Click += SetMseConfig_Click;
                 if (msecfg.configName.Equals(name, StringComparison.OrdinalIgnoreCase))
                     tsmi.Checked = true;
-                tsmi.Click += SetMseConfig_Click;
-                tsmi.ToolTipText = file;
                 menuitem_mseconfig.DropDownItems.Add(tsmi);
             }
         }
@@ -1627,5 +1634,6 @@ void SetMseConfig_Click(object sender, EventArgs e)
             }
         }
         #endregion
+
     }
 }

DataEditorX/DataEditorX.csproj

@@ -117,7 +117,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="data\mse_cht.txt">
+    <Content Include="data\mse_Chinese-Traditional.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <None Include="data\constant.lua">
@@ -129,13 +129,13 @@
     <Content Include="data\language_english.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\mse_en.txt">
+    <Content Include="data\mse_English.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="data\cardinfo_english.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\mse_jp.txt">
+    <Content Include="data\mse_Japan.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
@@ -198,7 +198,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="data\mse_chs.txt">
+    <Content Include="data\mse_Chinese-Simplified.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

DataEditorX/Language/LanguageHelper.cs

@@ -21,8 +21,8 @@ public static class LANG
     {
         static Dictionary<string, string> mWordslist = new Dictionary<string, string>();
         static SortedList<LMSG, string> msglist = new SortedList<LMSG, string>();
-        static string SEP_CONTROL = ".";
-        static string SEP_LINE = "	";
+        const char SEP_CONTROL = '.';
+        const char SEP_LINE = '\t';
 
         #region 获取消息文字
         public static string GetMsg(LMSG lMsg)
@@ -117,7 +117,7 @@ static void SetMenuItem(string pName, ToolStripItem tsi)
             if (tsi is ToolStripMenuItem)
             {
                 ToolStripMenuItem tsmi = (ToolStripMenuItem)tsi;
-                if (GetLabel(pName +SEP_CONTROL + tsmi.Name, out title))
+                if (GetLabel(pName + SEP_CONTROL + tsmi.Name, out title))
                     tsmi.Text = title;
                 if (tsmi.HasDropDownItems)
                 {
@@ -241,7 +241,8 @@ public static bool SaveLanguage(string conf)
                 sw.WriteLine("#");
                 foreach (LMSG k in msglist.Keys)
                 {
-                    sw.WriteLine("0x" + ((uint)k).ToString("x") + SEP_LINE + msglist[k].Replace("\n", "/n"));
+                    //记得替换换行符
+                    sw.WriteLine("0x" + ((uint)k).ToString("x") + SEP_LINE + msglist[k].Replace("\n", "\\n"));
                 }
                 foreach (LMSG k in Enum.GetValues(typeof(LMSG)))
                 {
@@ -265,40 +266,27 @@ public static void LoadFormLabels(string f)
             using (FileStream fs = new FileStream(f, FileMode.Open, FileAccess.Read))
             {
                 StreamReader sr = new StreamReader(fs, Encoding.UTF8);
-                string line, sk, v;
+                string line;
                 uint utemp;
                 LMSG ltemp;
                 while ((line = sr.ReadLine()) != null)
                 {
                     if (line.Length == 0)
                         continue;
+                    string[] words = line.Split(SEP_LINE);
+                    if (words.Length < 2)
+                        continue;
                     if (line.StartsWith("0x"))//加载消息文字
                     {
-                        int si = line.IndexOf(SEP_LINE);
-                        if (si > 0)
-                        {
-                            sk = line.Substring(0, si);
-                            v = line.Substring(si + 1);
-                            //if (sk.StartsWith("0x"))
-                            uint.TryParse(sk.Replace("0x", ""), NumberStyles.HexNumber, null, out utemp);
-                            //else
-                             //   uint.TryParse(sk, out utemp);
+                        uint.TryParse(words[0].Replace("0x", ""), NumberStyles.HexNumber, null, out utemp);
                         ltemp = (LMSG)utemp;
-                            if (msglist.IndexOfKey(ltemp) < 0)
-                                msglist.Add(ltemp, v.Replace("/n", "\n"));
-                        }
+                        if (msglist.IndexOfKey(ltemp) < 0)//记得替换换行符
+                            msglist.Add(ltemp, words[1].Replace("\\n", "\n"));
                     }
                     else if (!line.StartsWith("#"))//加载界面语言
                     {
-                        int si = line.IndexOf(SEP_LINE);
-                        if (si > 0)
-                        {
-                            sk = line.Substring(0, si);
-                            v = line.Substring(si + 1);
-
-                            if (!mWordslist.ContainsKey(sk))
-                                mWordslist.Add(sk, v);
-                        }
+                        if (!mWordslist.ContainsKey(words[0]))
+                            mWordslist.Add(words[0], words[1]);
                     }
                 }
                 sr.Close();

DataEditorX/Properties/AssemblyInfo.cs

@@ -28,4 +28,4 @@
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("2.2.9.1")]
+[assembly: AssemblyVersion("2.2.9.2")]

DataEditorX/app.config

@@ -10,9 +10,9 @@
 		<!-- access these values via the property:
             System.Configuration.ConfigurationManager.AppSettings[key]
         -->
-		<!-- MSE language -->
-		<add key="mse" value="mse_chs.txt" />
-    <!-- Language -->
+		<!-- MSE language  data/mse_xxx.txt -->
+		<add key="mse" value="Chinese-Simplified" />
+    <!-- Language data/cardinfo_xxxx.txt  data/language_xxx.txt -->
     <add key="language" value="chinese" />
 		<!-- DataEditorX source code -->
 		<add key="sourceURL" value="https://github.com/247321453/DataEditorX" />

DataEditorX/data/cardinfo_english.txt

-##rule
+################ use tab
+##rule
 0x0	Rule
 0x1	OCG
 0x2	TCG
 0x3	OCG&TCG
 0x4	Anime/DIY
 ##attribute
-0x0	Atribute
+0x0	Attribute
 0x1	Earth
 0x2	Water
 0x4	Fire
@@ -14,7 +15,7 @@
 0x20	Dark
 0x40	Divine
 ##level
-0x0	Level/Rank
+0x0	Star
 0x1	1★
 0x2	2★
 0x3	3★

DataEditorX/data/language_chinese.txt

@@ -39,17 +39,19 @@ DataEditForm.mainMenu.menuitem_copyselectto	把选中复制到...
 DataEditForm.mainMenu.menuitem_copyto	把结果复制到...
 DataEditForm.mainMenu.menuitem_openLastDataBase	打开最后的数据库
 DataEditForm.mainMenu.menuitem_quit	退出
+DataEditForm.mainMenu.menu_setting	设置(&S)
+DataEditForm.mainMenu.menuitem_importmseimg	设置为MSE图片库
+DataEditForm.mainMenu.menuitem_mseconfig	设置MSE的配置文件
 DataEditForm.mainMenu.menu_tools	工具(&T)
 DataEditForm.mainMenu.menuitem_readydk	从卡组文件读取卡片(&Y)
 DataEditForm.mainMenu.menuitem_readimages	从卡图文件夹读取卡片(&I)
 DataEditForm.mainMenu.menuitem_compdb	压缩数据库
 DataEditForm.mainMenu.menuitem_exportdata	导出数据库和图片脚本为zip
-DataEditForm.mainMenu.menuitem_mseconfig	设置MSE的配置文件
+DataEditForm.mainMenu.menuitem_readmse	读取MSE存档
 DataEditForm.mainMenu.menuitem_saveasmse_select	把选中导为MSE存档
 DataEditForm.mainMenu.menuitem_saveasmse	把结果导为MSE存档
 DataEditForm.mainMenu.menuitem_cutimages	批量裁剪卡图
 DataEditForm.mainMenu.menuitem_convertimage	批量导入卡图
-DataEditForm.mainMenu.menuitem_importmseimg	设置为MSE图片库
 DataEditForm.mainMenu.menuitem_cancelTask	取消任务
 DataEditForm.mainMenu.menuitem_help	帮助(&H)
 DataEditForm.mainMenu.menuitem_about	关于
@@ -91,7 +93,7 @@ MainForm.mainMenu.menuitem_closeall	关闭所有
 0xc	是否创建脚本文件？
 0xd	是否打开数据库？
 0xe	是否替换已经存在的卡片？
-0xf	已经是最新版本了。/n需要重新下载，请点击“确定”重新下载。
+0xf	已经是最新版本了。\n需要重新下载，请点击“确定”重新下载。
 0x10	检查更新失败，请检查网络。
 0x11	发现新的版本，是否更新？
 0x12	文件不存在！

DataEditorX/data/language_english.txt

@@ -39,12 +39,14 @@ DataEditForm.mainMenu.menuitem_copyselectto	Copy Selected...
 DataEditForm.mainMenu.menuitem_copyto	Copy All Search...
 DataEditForm.mainMenu.menuitem_openLastDataBase	Open Last DataBase
 DataEditForm.mainMenu.menuitem_quit	Quit
+DataEditForm.mainMenu.menu_setting	Setting(&S)
 DataEditForm.mainMenu.menu_tools	Tool(&T)
 DataEditForm.mainMenu.menuitem_readydk	Read From ydk File(&Y)
 DataEditForm.mainMenu.menuitem_readimages	Read From Images Path(&I)
 DataEditForm.mainMenu.menuitem_compdb	Compress DataBase
 DataEditForm.mainMenu.menuitem_exportdata	Export Data As zip
 DataEditForm.mainMenu.menuitem_mseconfig	Set MSE Config
+DataEditForm.mainMenu.menuitem_readmse	Read MSE-set
 DataEditForm.mainMenu.menuitem_saveasmse_select	Save Selected As MSE-set
 DataEditForm.mainMenu.menuitem_saveasmse	Save All As MSE-set
 DataEditForm.mainMenu.menuitem_cutimages	Cut Images
@@ -91,9 +93,9 @@ MainForm.mainMenu.menuitem_closeall	Close All
 0xc	If create script file？
 0xd	If open database?
 0xe	If replace exitis cards?
-0xf	It's new version./nWhether you need to download again?
-0x10	Check update fail，/nPlease Check Network.
-0x11	Find a new version,/nIf Download it?
+0xf	It's new version.\nWhether you need to download again?
+0x10	Check update fail，\nPlease Check Network.
+0x11	Find a new version,\nIf Download it?
 0x12	File is't exitis!
 0x13	No select database!
 0x14	select database file

DataEditorX/data/mse_chs.txt → DataEditorX/data/mse_Chinese-Simplified.txt

 ###########################
 # Magic Set Editor 2
-#
+# 简体中文
 # \t = Tab \n = Enter [:space:] = Space
-########################### Chs 2 Cht 
+########################### 简体转繁体 
 cn2tw = false
-########################### Setting
+########################### 存档最大卡片数
 maxcount = 0
 imagepath = ./Images
 ########################### Spell/Trap

DataEditorX/data/mse_cht.txt → DataEditorX/data/mse_Chinese-Traditional.txt

 ###########################
 # Magic Set Editor 2
-#
+# 繁体中文
 # \t = Tab \n = Enter [:space:] = Space
 ########################### Chs 2 Cht 
 cn2tw = false

win32/data/mse_en.txt → DataEditorX/data/mse_English.txt

 ###########################
 # Magic Set Editor 2
-#
+# English
 # \t = Tab \n = Enter [:space:] = Space
 ########################### Chs 2 Cht 
 cn2tw = false

win32/data/mse_jp.txt → DataEditorX/data/mse_Japan.txt

@@ -31,7 +31,7 @@ replace = ([·]) ・
 ###########################
 ##race
 race 0x1 戦士族
-race 0x2 魔法使い族
+race 0x2 魔法師族
 race 0x4 天使族
 race 0x8 悪魔族
 race 0x10 アンデット族

DataEditorX/readme.txt

-[DataEditorX]2.2.9.1[DataEditorX]
+[DataEditorX]2.2.9.2[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★文件关联(File association)
@@ -80,6 +80,10 @@ Ctrl+鼠标左键 	跳转到函数定义
 Ctrl+鼠标滑轮 	缩放文字
 
 ★更新历史
+2.2.9.2
+读取MSE存档暂未实现
+修改DataEditor界面
+如果这次显示有问题，请务必反馈
 2.2.9.1
 添加MSE设置说明
 2.2.9.0

win32/DataEditorX.exe.config

@@ -10,9 +10,9 @@
 		<!-- access these values via the property:
             System.Configuration.ConfigurationManager.AppSettings[key]
         -->
-		<!-- MSE language -->
-		<add key="mse" value="mse_chs.txt" />
-    <!-- Language -->
+		<!-- MSE language  data/mse_xxx.txt -->
+		<add key="mse" value="Chinese-Simplified" />
+    <!-- Language data/cardinfo_xxxx.txt  data/language_xxx.txt -->
     <add key="language" value="chinese" />
 		<!-- DataEditorX source code -->
 		<add key="sourceURL" value="https://github.com/247321453/DataEditorX" />

win32/data/cardinfo_english.txt

-##rule
+################ use tab
+##rule
 0x0	Rule
 0x1	OCG
 0x2	TCG
 0x3	OCG&TCG
 0x4	Anime/DIY
 ##attribute
-0x0	Atribute
+0x0	Attribute
 0x1	Earth
 0x2	Water
 0x4	Fire
@@ -14,7 +15,7 @@
 0x20	Dark
 0x40	Divine
 ##level
-0x0	Level/Rank
+0x0	Star
 0x1	1★
 0x2	2★
 0x3	3★

win32/data/language_chinese.txt

@@ -39,17 +39,19 @@ DataEditForm.mainMenu.menuitem_copyselectto	把选中复制到...
 DataEditForm.mainMenu.menuitem_copyto	把结果复制到...
 DataEditForm.mainMenu.menuitem_openLastDataBase	打开最后的数据库
 DataEditForm.mainMenu.menuitem_quit	退出
+DataEditForm.mainMenu.menu_setting	设置(&S)
+DataEditForm.mainMenu.menuitem_importmseimg	设置为MSE图片库
+DataEditForm.mainMenu.menuitem_mseconfig	设置MSE的配置文件
 DataEditForm.mainMenu.menu_tools	工具(&T)
 DataEditForm.mainMenu.menuitem_readydk	从卡组文件读取卡片(&Y)
 DataEditForm.mainMenu.menuitem_readimages	从卡图文件夹读取卡片(&I)
 DataEditForm.mainMenu.menuitem_compdb	压缩数据库
 DataEditForm.mainMenu.menuitem_exportdata	导出数据库和图片脚本为zip
-DataEditForm.mainMenu.menuitem_mseconfig	设置MSE的配置文件
+DataEditForm.mainMenu.menuitem_readmse	读取MSE存档
 DataEditForm.mainMenu.menuitem_saveasmse_select	把选中导为MSE存档
 DataEditForm.mainMenu.menuitem_saveasmse	把结果导为MSE存档
 DataEditForm.mainMenu.menuitem_cutimages	批量裁剪卡图
 DataEditForm.mainMenu.menuitem_convertimage	批量导入卡图
-DataEditForm.mainMenu.menuitem_importmseimg	设置为MSE图片库
 DataEditForm.mainMenu.menuitem_cancelTask	取消任务
 DataEditForm.mainMenu.menuitem_help	帮助(&H)
 DataEditForm.mainMenu.menuitem_about	关于
@@ -91,7 +93,7 @@ MainForm.mainMenu.menuitem_closeall	关闭所有
 0xc	是否创建脚本文件？
 0xd	是否打开数据库？
 0xe	是否替换已经存在的卡片？
-0xf	已经是最新版本了。/n需要重新下载，请点击“确定”重新下载。
+0xf	已经是最新版本了。\n需要重新下载，请点击“确定”重新下载。
 0x10	检查更新失败，请检查网络。
 0x11	发现新的版本，是否更新？
 0x12	文件不存在！

win32/data/language_english.txt

@@ -39,12 +39,14 @@ DataEditForm.mainMenu.menuitem_copyselectto	Copy Selected...
 DataEditForm.mainMenu.menuitem_copyto	Copy All Search...
 DataEditForm.mainMenu.menuitem_openLastDataBase	Open Last DataBase
 DataEditForm.mainMenu.menuitem_quit	Quit
+DataEditForm.mainMenu.menu_setting	Setting(&S)
 DataEditForm.mainMenu.menu_tools	Tool(&T)
 DataEditForm.mainMenu.menuitem_readydk	Read From ydk File(&Y)
 DataEditForm.mainMenu.menuitem_readimages	Read From Images Path(&I)
 DataEditForm.mainMenu.menuitem_compdb	Compress DataBase
 DataEditForm.mainMenu.menuitem_exportdata	Export Data As zip
 DataEditForm.mainMenu.menuitem_mseconfig	Set MSE Config
+DataEditForm.mainMenu.menuitem_readmse	Read MSE-set
 DataEditForm.mainMenu.menuitem_saveasmse_select	Save Selected As MSE-set
 DataEditForm.mainMenu.menuitem_saveasmse	Save All As MSE-set
 DataEditForm.mainMenu.menuitem_cutimages	Cut Images
@@ -91,9 +93,9 @@ MainForm.mainMenu.menuitem_closeall	Close All
 0xc	If create script file？
 0xd	If open database?
 0xe	If replace exitis cards?
-0xf	It's new version./nWhether you need to download again?
-0x10	Check update fail，/nPlease Check Network.
-0x11	Find a new version,/nIf Download it?
+0xf	It's new version.\nWhether you need to download again?
+0x10	Check update fail，\nPlease Check Network.
+0x11	Find a new version,\nIf Download it?
 0x12	File is't exitis!
 0x13	No select database!
 0x14	select database file

win32/data/mse_chs.txt → win32/data/mse_Chinese-Simplified.txt

 ###########################
 # Magic Set Editor 2
-#
+# 简体中文
 # \t = Tab \n = Enter [:space:] = Space
-########################### Chs 2 Cht 
+########################### 简体转繁体 
 cn2tw = false
-########################### Setting
+########################### 存档最大卡片数
 maxcount = 0
 imagepath = ./Images
 ########################### Spell/Trap

win32/data/mse_cht.txt → win32/data/mse_Chinese-Traditional.txt

 ###########################
 # Magic Set Editor 2
-#
+# 繁体中文
 # \t = Tab \n = Enter [:space:] = Space
 ########################### Chs 2 Cht 
 cn2tw = false

DataEditorX/data/mse_en.txt → win32/data/mse_English.txt

 ###########################
 # Magic Set Editor 2
-#
+# English
 # \t = Tab \n = Enter [:space:] = Space
 ########################### Chs 2 Cht 
 cn2tw = false

DataEditorX/data/mse_jp.txt → win32/data/mse_Japan.txt

@@ -31,7 +31,7 @@ replace = ([·]) ・
 ###########################
 ##race
 race 0x1 戦士族
-race 0x2 魔法使い族
+race 0x2 魔法師族
 race 0x4 天使族
 race 0x8 悪魔族
 race 0x10 アンデット族

win32/readme.txt

-[DataEditorX]2.2.9.1[DataEditorX]
+[DataEditorX]2.2.9.2[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★文件关联(File association)
@@ -80,6 +80,10 @@ Ctrl+鼠标左键 	跳转到函数定义
 Ctrl+鼠标滑轮 	缩放文字
 
 ★更新历史
+2.2.9.2
+读取MSE存档暂未实现
+修改DataEditor界面
+如果这次显示有问题，请务必反馈
 2.2.9.1
 添加MSE设置说明
 2.2.9.0