Merge branch 'test'

MifareOneTool.sln

@@ -1,26 +1,50 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
+Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2010
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.572
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MifareOneTool", "MifareOneTool\MifareOneTool.csproj", "{CDB26016-FC77-403F-B22A-A011F8622FCF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		beta|Any CPU = beta|Any CPU
+		beta|Mixed Platforms = beta|Mixed Platforms
+		beta|Win32 = beta|Win32
+		beta|x86 = beta|x86
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|Win32 = Debug|Win32
 		Debug|x86 = Debug|x86
+		MifareOneTool|Any CPU = MifareOneTool|Any CPU
+		MifareOneTool|Mixed Platforms = MifareOneTool|Mixed Platforms
+		MifareOneTool|Win32 = MifareOneTool|Win32
+		MifareOneTool|x86 = MifareOneTool|x86
 		Release|Any CPU = Release|Any CPU
 		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|Win32 = Release|Win32
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{CDB26016-FC77-403F-B22A-A011F8622FCF}.beta|Any CPU.ActiveCfg = beta|x86
+		{CDB26016-FC77-403F-B22A-A011F8622FCF}.beta|Mixed Platforms.ActiveCfg = beta|x86
+		{CDB26016-FC77-403F-B22A-A011F8622FCF}.beta|Mixed Platforms.Build.0 = beta|x86
+		{CDB26016-FC77-403F-B22A-A011F8622FCF}.beta|Win32.ActiveCfg = beta|x86
+		{CDB26016-FC77-403F-B22A-A011F8622FCF}.beta|Win32.Build.0 = beta|x86
+		{CDB26016-FC77-403F-B22A-A011F8622FCF}.beta|x86.ActiveCfg = beta|x86
+		{CDB26016-FC77-403F-B22A-A011F8622FCF}.beta|x86.Build.0 = beta|x86
 		{CDB26016-FC77-403F-B22A-A011F8622FCF}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{CDB26016-FC77-403F-B22A-A011F8622FCF}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{CDB26016-FC77-403F-B22A-A011F8622FCF}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{CDB26016-FC77-403F-B22A-A011F8622FCF}.Debug|Win32.ActiveCfg = Debug|x86
 		{CDB26016-FC77-403F-B22A-A011F8622FCF}.Debug|x86.ActiveCfg = Debug|x86
 		{CDB26016-FC77-403F-B22A-A011F8622FCF}.Debug|x86.Build.0 = Debug|x86
+		{CDB26016-FC77-403F-B22A-A011F8622FCF}.MifareOneTool|Any CPU.ActiveCfg = MifareOneTool|x86
+		{CDB26016-FC77-403F-B22A-A011F8622FCF}.MifareOneTool|Mixed Platforms.ActiveCfg = MifareOneTool|x86
+		{CDB26016-FC77-403F-B22A-A011F8622FCF}.MifareOneTool|Mixed Platforms.Build.0 = MifareOneTool|x86
+		{CDB26016-FC77-403F-B22A-A011F8622FCF}.MifareOneTool|Win32.ActiveCfg = MifareOneTool|x86
+		{CDB26016-FC77-403F-B22A-A011F8622FCF}.MifareOneTool|Win32.Build.0 = MifareOneTool|x86
+		{CDB26016-FC77-403F-B22A-A011F8622FCF}.MifareOneTool|x86.ActiveCfg = MifareOneTool|x86
+		{CDB26016-FC77-403F-B22A-A011F8622FCF}.MifareOneTool|x86.Build.0 = MifareOneTool|x86
 		{CDB26016-FC77-403F-B22A-A011F8622FCF}.Release|Any CPU.ActiveCfg = Release|x86
 		{CDB26016-FC77-403F-B22A-A011F8622FCF}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{CDB26016-FC77-403F-B22A-A011F8622FCF}.Release|Mixed Platforms.Build.0 = Release|x86
@@ -31,4 +55,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {0173FBA9-DDA4-4B2B-A55D-546257C2E727}
+	EndGlobalSection
 EndGlobal

MifareOneTool/Form1.Designer.cs

@@ -84,10 +84,10 @@
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.label7 = new System.Windows.Forms.Label();
             this.buttonEscan = new System.Windows.Forms.Button();
-            this.buttonECheckEncrypt = new System.Windows.Forms.Button();
             this.buttoEScanCard = new System.Windows.Forms.Button();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.pictureBox2 = new System.Windows.Forms.PictureBox();
+            this.buttonECheckEncrypt = new System.Windows.Forms.Button();
             this.label13 = new System.Windows.Forms.Label();
             this.groupBox5 = new System.Windows.Forms.GroupBox();
             this.tableLayoutPanel11 = new System.Windows.Forms.TableLayoutPanel();
@@ -120,6 +120,7 @@
             this.tableLayoutPanel9 = new System.Windows.Forms.TableLayoutPanel();
             this.flowLayoutPanel16 = new System.Windows.Forms.FlowLayoutPanel();
             this.flowLayoutPanel15 = new System.Windows.Forms.FlowLayoutPanel();
+            this.ShowUID = new System.Windows.Forms.Button();
             this.groupBox9 = new System.Windows.Forms.GroupBox();
             this.flowLayoutPanel21 = new System.Windows.Forms.FlowLayoutPanel();
             this.label1 = new System.Windows.Forms.Label();
@@ -156,6 +157,9 @@
             this.groupBox11 = new System.Windows.Forms.GroupBox();
             this.flowLayoutPanel3 = new System.Windows.Forms.FlowLayoutPanel();
             this.checkBoxHardLowCost = new System.Windows.Forms.CheckBox();
+            this.groupBox17 = new System.Windows.Forms.GroupBox();
+            this.flowLayoutPanel25 = new System.Windows.Forms.FlowLayoutPanel();
+            this.button1 = new System.Windows.Forms.Button();
             this.imageList2 = new System.Windows.Forms.ImageList(this.components);
             this.statusStrip1 = new System.Windows.Forms.StatusStrip();
             this.statusLabel = new System.Windows.Forms.ToolStripStatusLabel();
@@ -228,6 +232,8 @@
             this.flowLayoutPanel4.SuspendLayout();
             this.groupBox11.SuspendLayout();
             this.flowLayoutPanel3.SuspendLayout();
+            this.groupBox17.SuspendLayout();
+            this.flowLayoutPanel25.SuspendLayout();
             this.statusStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -633,10 +639,10 @@
             // 
             // tabControl1
             // 
-            resources.ApplyResources(this.tabControl1, "tabControl1");
             this.tabControl1.Controls.Add(this.tabPage2);
             this.tabControl1.Controls.Add(this.tabPage1);
             this.tabControl1.Controls.Add(this.tabPage3);
+            resources.ApplyResources(this.tabControl1, "tabControl1");
             this.tabControl1.ImageList = this.imageList2;
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
@@ -700,10 +706,10 @@
             resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
             this.tableLayoutPanel1.Controls.Add(this.label7, 0, 1);
             this.tableLayoutPanel1.Controls.Add(this.buttonEscan, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.buttonECheckEncrypt, 2, 0);
+            this.tableLayoutPanel1.Controls.Add(this.buttoEScanCard, 2, 0);
-            this.tableLayoutPanel1.Controls.Add(this.buttoEScanCard, 2, 1);
             this.tableLayoutPanel1.Controls.Add(this.pictureBox1, 1, 0);
             this.tableLayoutPanel1.Controls.Add(this.pictureBox2, 3, 0);
+            this.tableLayoutPanel1.Controls.Add(this.buttonECheckEncrypt, 2, 1);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             // 
             // label7
@@ -722,16 +728,6 @@
             this.buttonEscan.UseVisualStyleBackColor = false;
             this.buttonEscan.Click += new System.EventHandler(this.buttonEscan_Click);
             // 
-            // buttonECheckEncrypt
-            // 
-            resources.ApplyResources(this.buttonECheckEncrypt, "buttonECheckEncrypt");
-            this.buttonECheckEncrypt.BackColor = System.Drawing.Color.DodgerBlue;
-            this.buttonECheckEncrypt.FlatAppearance.BorderColor = System.Drawing.Color.DodgerBlue;
-            this.buttonECheckEncrypt.ForeColor = System.Drawing.Color.White;
-            this.buttonECheckEncrypt.Name = "buttonECheckEncrypt";
-            this.buttonECheckEncrypt.UseVisualStyleBackColor = false;
-            this.buttonECheckEncrypt.Click += new System.EventHandler(this.buttonECheckEncrypt_Click);
-            // 
             // buttoEScanCard
             // 
             resources.ApplyResources(this.buttoEScanCard, "buttoEScanCard");
@@ -756,6 +752,16 @@
             this.pictureBox2.Name = "pictureBox2";
             this.pictureBox2.TabStop = false;
             // 
+            // buttonECheckEncrypt
+            // 
+            resources.ApplyResources(this.buttonECheckEncrypt, "buttonECheckEncrypt");
+            this.buttonECheckEncrypt.BackColor = System.Drawing.Color.DodgerBlue;
+            this.buttonECheckEncrypt.FlatAppearance.BorderColor = System.Drawing.Color.DodgerBlue;
+            this.buttonECheckEncrypt.ForeColor = System.Drawing.Color.White;
+            this.buttonECheckEncrypt.Name = "buttonECheckEncrypt";
+            this.buttonECheckEncrypt.UseVisualStyleBackColor = false;
+            this.buttonECheckEncrypt.Click += new System.EventHandler(this.buttonECheckEncrypt_Click);
+            // 
             // label13
             // 
             resources.ApplyResources(this.label13, "label13");
@@ -1026,8 +1032,19 @@
             this.flowLayoutPanel15.Controls.Add(this.buttonBmfRead);
             this.flowLayoutPanel15.Controls.Add(this.buttonUidReset);
             this.flowLayoutPanel15.Controls.Add(this.buttonUidFormat);
+            this.flowLayoutPanel15.Controls.Add(this.ShowUID);
             this.flowLayoutPanel15.Name = "flowLayoutPanel15";
             // 
+            // ShowUID
+            // 
+            resources.ApplyResources(this.ShowUID, "ShowUID");
+            this.ShowUID.BackColor = System.Drawing.Color.DodgerBlue;
+            this.ShowUID.FlatAppearance.BorderColor = System.Drawing.Color.DodgerBlue;
+            this.ShowUID.ForeColor = System.Drawing.Color.White;
+            this.ShowUID.Name = "ShowUID";
+            this.ShowUID.UseVisualStyleBackColor = false;
+            this.ShowUID.Click += new System.EventHandler(this.ShowUID_Click);
+            // 
             // groupBox9
             // 
             resources.ApplyResources(this.groupBox9, "groupBox9");
@@ -1244,6 +1261,7 @@
             this.flowLayoutPanel22.Controls.Add(this.groupBox15);
             this.flowLayoutPanel22.Controls.Add(this.groupBox13);
             this.flowLayoutPanel22.Controls.Add(this.groupBox11);
+            this.flowLayoutPanel22.Controls.Add(this.groupBox17);
             this.flowLayoutPanel22.Name = "flowLayoutPanel22";
             // 
             // groupBox15
@@ -1339,6 +1357,31 @@
             this.checkBoxHardLowCost.UseVisualStyleBackColor = true;
             this.checkBoxHardLowCost.CheckedChanged += new System.EventHandler(this.checkBoxHardLowCost_CheckedChanged);
             // 
+            // groupBox17
+            // 
+            resources.ApplyResources(this.groupBox17, "groupBox17");
+            this.groupBox17.BackColor = System.Drawing.Color.DodgerBlue;
+            this.groupBox17.Controls.Add(this.flowLayoutPanel25);
+            this.groupBox17.ForeColor = System.Drawing.Color.White;
+            this.groupBox17.Name = "groupBox17";
+            this.groupBox17.TabStop = false;
+            // 
+            // flowLayoutPanel25
+            // 
+            resources.ApplyResources(this.flowLayoutPanel25, "flowLayoutPanel25");
+            this.flowLayoutPanel25.BackColor = System.Drawing.Color.White;
+            this.flowLayoutPanel25.Controls.Add(this.button1);
+            this.flowLayoutPanel25.Name = "flowLayoutPanel25";
+            // 
+            // button1
+            // 
+            resources.ApplyResources(this.button1, "button1");
+            this.button1.BackColor = System.Drawing.Color.DodgerBlue;
+            this.button1.FlatAppearance.BorderColor = System.Drawing.Color.DodgerBlue;
+            this.button1.Name = "button1";
+            this.button1.UseVisualStyleBackColor = false;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
             // imageList2
             // 
             this.imageList2.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList2.ImageStream")));
@@ -1409,9 +1452,9 @@
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
+            this.Controls.Add(this.richTextBox1);
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.tabControl1);
-            this.Controls.Add(this.richTextBox1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Name = "Form1";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing);
@@ -1538,6 +1581,10 @@
             this.groupBox11.PerformLayout();
             this.flowLayoutPanel3.ResumeLayout(false);
             this.flowLayoutPanel3.PerformLayout();
+            this.groupBox17.ResumeLayout(false);
+            this.groupBox17.PerformLayout();
+            this.flowLayoutPanel25.ResumeLayout(false);
+            this.flowLayoutPanel25.PerformLayout();
             this.statusStrip1.ResumeLayout(false);
             this.statusStrip1.PerformLayout();
             this.ResumeLayout(false);
@@ -1671,7 +1718,6 @@
         private System.Windows.Forms.Label label12;
         private System.Windows.Forms.ComboBox comboBox1;
         private System.Windows.Forms.Label label13;
-        private System.Windows.Forms.PictureBox pictureBox1;
         private System.Windows.Forms.GroupBox groupBox16;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel15;
         private System.Windows.Forms.PictureBox pictureBox2;
@@ -1681,6 +1727,11 @@
         private System.Windows.Forms.PictureBox pictureBox4;
         private System.Windows.Forms.ToolStripSplitButton toolStripCheckUpdate;
         private System.Windows.Forms.ImageList imageList2;
+        private System.Windows.Forms.Button ShowUID;
+        private System.Windows.Forms.PictureBox pictureBox1;
+        private System.Windows.Forms.GroupBox groupBox17;
+        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel25;
+        private System.Windows.Forms.Button button1;
     }
 }
 

MifareOneTool/Form1.cs

@@ -36,7 +36,7 @@ namespace MifareOneTool
             if (lprocess) { MessageBox.Show(Resources.有任务运行中_不可执行, Resources.设备忙, MessageBoxButtons.OK, MessageBoxIcon.Warning); return; }
             Form1.ActiveForm.Text = Resources.MifareOne_Tool_运行中;
             if (Properties.Settings.Default.NewScan)
-            { File.Delete("libnfc.conf"); }
+            { File.Delete(Resources.libnfc_conf); }
             BackgroundWorker bgw = new BackgroundWorker();
             bgw.DoWork += new DoWorkEventHandler(list_dev);
             bgw.WorkerReportsProgress = true;
@@ -46,11 +46,11 @@ namespace MifareOneTool
 
         void writeConfig(string devstr, bool autoscan = true, bool intscan = false)
         {
-            string cfg = "allow_autoscan = " + (autoscan ? "true" : "false") + "\n";
+            string cfg = Resources.allow_autoscan + (autoscan ? Resources._true : Resources._false) + Resources.res0;
-            cfg += "allow_intrusive_scan = " + (intscan ? "true" : "false") + "\n";
+            cfg += Resources.allow_intrusive_scan + (intscan ? Resources._true : Resources._false) + "\n";
-            cfg += "device.name = \"NFC-Device\"\n";
+            cfg += Resources.device_name_NFC_Device;
-            cfg += "device.connstring = \"" + devstr + "\"";
+            cfg += Resources.device_connstring + devstr + "\"";
-            File.WriteAllText("libnfc.conf", cfg);
+            File.WriteAllText(Resources.libnfc_conf, cfg);
             curDevice.Text = Resources.设备串口 + devstr.Replace("pn532_uart:", "").Replace(":115200", "");
         }
 
@@ -70,7 +70,7 @@ namespace MifareOneTool
                     if (File.Exists(omfd) && new FileInfo(omfd).Length > 1)
                     {
                         Directory.CreateDirectory("auto_keys");
-                        string filename = "auto_keys\\" + lastuid + "_" + DateTime.Now.ToString().Replace("/", "-").Replace(" ", "_").Replace(":", "-") + ".mfd";
+                        string filename = "auto_keys\\" + lastuid + "_" + DateTime.Now.ToString().Replace("/", "-").Replace(" ", "_").Replace(":", "-") + Resources._mfd;
                         if (File.Exists(filename))
                         {
                             File.Delete(filename);
@@ -528,12 +528,13 @@ namespace MifareOneTool
 
         private void buttonMfoc_Click(object sender, EventArgs e)
         {
-            if (lprocess) { MessageBox.Show(Resources.有任务运行中_不可执行, Resources.设备忙, MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } Form1.ActiveForm.Text = Resources.MifareOne_Tool_运行中;
+            if (lprocess) { MessageBox.Show("有任务运行中，不可执行。", "设备忙", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; }
+            Form1.ActiveForm.Text = "MifareOne Tool - 运行中";
             string rmfd = "Mfoc.tmp";
             string key = "";
             if (Control.ModifierKeys == Keys.Control)
             {
-                string[] ks = Interaction.InputBox(Resources.请输入已知的Key_以英文半角逗号分隔, Resources.请输入已知Key, Properties.Settings.Default.LastTryKey, -1, -1).Trim().Split(',');
+                string[] ks = Interaction.InputBox("请输入已知的Key，以英文半角逗号分隔。", "请输入已知Key", Properties.Settings.Default.LastTryKey, -1, -1).Trim().Split(',');
                 if (ks.Length > 0)
                 {
                     Properties.Settings.Default.LastTryKey = string.Join(",", ks);
@@ -572,7 +573,7 @@ namespace MifareOneTool
             lprocess = true;
             BackgroundWorker b = (BackgroundWorker)sender;
             process = Process.Start(psi);
-            b.ReportProgress(0, Resources.开始执行MFOC解密); running = true;
+            b.ReportProgress(0, "开始执行MFOC解密……"); running = true;
             process.OutputDataReceived += (s, _e) => b.ReportProgress(0, _e.Data);
             process.ErrorDataReceived += (s, _e) => b.ReportProgress(0, _e.Data);
             //StreamReader stderr = process.StandardError;
@@ -582,11 +583,11 @@ namespace MifareOneTool
             lprocess = false; running = false;
             if (process.ExitCode == 0)
             {
-                b.ReportProgress(101, Resources._运行完毕);
+                b.ReportProgress(101, "##运行完毕##");
             }
             else
             {
-                b.ReportProgress(100, Resources._运行出错);
+                b.ReportProgress(100, "##运行出错##");
                 File.Delete(args[0]);
             }
         }
@@ -726,11 +727,11 @@ namespace MifareOneTool
 
         private void buttonBmfWrite_Click(object sender, EventArgs e)
         {
-            if (lprocess) { MessageBox.Show(Resources.有任务运行中_不可执行, Resources.设备忙, MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } Form1.ActiveForm.Text = "MifareOne Tool - 运行中";
+            if (lprocess) { MessageBox.Show(Resources.有任务运行中_不可执行, Resources.设备忙, MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } Form1.ActiveForm.Text = Resources.MifareOne_Tool_运行中;
             string rmfd = "";
             OpenFileDialog ofd = new OpenFileDialog();
             ofd.CheckFileExists = true;
-            ofd.Filter = "MFD文件|*.mfd;*.dump";
+            ofd.Filter = Resources.MFD文件_mfd_dump;
             ofd.Title = Resources.请选择需要写入的MFD文件;
             ofd.Multiselect = false;
             if (ofd.ShowDialog() == DialogResult.OK)
@@ -800,7 +801,7 @@ namespace MifareOneTool
             string pat = "[0-9A-Fa-f]{8}";
             if (!Regex.IsMatch(uid, pat))
             {
-                MessageBox.Show(Resources.输入的UID号不合法, "InputError", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show(Resources.输入的UID号不合法, Resources.InputError, MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
             }
             BackgroundWorker bgw = new BackgroundWorker();
@@ -897,7 +898,7 @@ namespace MifareOneTool
             }
             else
             {
-                switch (MessageBox.Show(Resources.使用KeyA_是_或KeyB_否_还是不使用_用于全新白卡_, "KeyA/B/N", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Information))
+                switch (MessageBox.Show(Resources.使用KeyA_是_或KeyB_否_还是不使用_用于全新白卡_, Resources.KeyA_B_N, MessageBoxButtons.YesNoCancel, MessageBoxIcon.Information))
                 {
                     case DialogResult.No:
                         kt = "B";
@@ -1368,12 +1369,6 @@ namespace MifareOneTool
             {
                 string hardargs = fhn.GetArg();
                 BackgroundWorker bgw = new BackgroundWorker();
-                if (fhn.collectOnly())
-                {
-                    //lastuid = "0x" + GetUID() + fhn.GetFileAfter();
-                    bgw.DoWork += new DoWorkEventHandler(CollectNonce);
-                }
-                else
                 {
                     bgw.DoWork += new DoWorkEventHandler(Hardnest);
                 }
@@ -1388,67 +1383,18 @@ namespace MifareOneTool
         }
         void Hardnest(object sender, DoWorkEventArgs e)
         {
-            if (lprocess) { return; }
+            Process psi = new Process();
-            ProcessStartInfo psi = new ProcessStartInfo("nfc-bin/libnfc_hardnested.exe");
+            psi.StartInfo = new ProcessStartInfo(@"nfc-bin\cropto1_bs.exe");
-            if (Properties.Settings.Default.HardLowCost)
+            psi.StartInfo.Arguments = (string)e.Argument;
-            {
+            psi.StartInfo.UseShellExecute = false;
-                psi.FileName = "nfc-bin/libnfc_hardnestedlc.exe";
+            psi.StartInfo.RedirectStandardOutput = true;
-            }
+            psi.StartInfo.CreateNoWindow = true;
-            psi.Arguments = (string)e.Argument;
+            psi.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
-            psi.CreateNoWindow = true;
+            psi.OutputDataReceived += new DataReceivedEventHandler(SortOutputHandler);
-            psi.UseShellExecute = false;
+            psi.Start();
-            psi.RedirectStandardOutput = true;
+            psi.BeginOutputReadLine();
-            psi.RedirectStandardError = true;
+    }
-            lprocess = true;
+        
-            BackgroundWorker b = (BackgroundWorker)sender;
-            process = Process.Start(psi); 
-            b.ReportProgress(0, Resources.开始执行HardNested解密强化卡); running = true;
-            process.OutputDataReceived += (s, _e) => b.ReportProgress(0, _e.Data);
-            process.ErrorDataReceived += (s, _e) => b.ReportProgress(0, _e.Data);
-            //StreamReader stderr = process.StandardError;
-            process.BeginOutputReadLine();
-            process.BeginErrorReadLine();
-            process.WaitForExit();
-            lprocess = false; running = false;
-            if (process.ExitCode == 0)
-            {
-                b.ReportProgress(100, Resources._运行完毕);
-            }
-            else
-            {
-                b.ReportProgress(100, Resources._运行出错);
-            }
-        }
-
-        void CollectNonce(object sender, DoWorkEventArgs e)
-        {
-            if (lprocess) { return; }
-            ProcessStartInfo psi = new ProcessStartInfo(Resources.nfc_bin_collect_exe);
-            psi.Arguments = (string)e.Argument;
-            psi.CreateNoWindow = true;
-            psi.UseShellExecute = false;
-            psi.RedirectStandardOutput = true;
-            psi.RedirectStandardError = true;
-            lprocess = true;
-            BackgroundWorker b = (BackgroundWorker)sender;
-            process = Process.Start(psi); 
-            b.ReportProgress(0, Resources.开始执行HardNested收集数据); running = true;
-            process.OutputDataReceived += (s, _e) => b.ReportProgress(0, _e.Data);
-            process.ErrorDataReceived += (s, _e) => b.ReportProgress(0, _e.Data);
-            //StreamReader stderr = process.StandardError;
-            process.BeginOutputReadLine();
-            process.BeginErrorReadLine();
-            process.WaitForExit();
-            lprocess = false; running = false;
-            if (process.ExitCode == 0)
-            {
-                b.ReportProgress(102, Resources._运行完毕);
-            }
-            else
-            {
-                b.ReportProgress(100, Resources._运行出错);
-            }
-        }
 
         private void checkBoxAutoLoadKey_CheckedChanged(object sender, EventArgs e)
         {
@@ -1549,5 +1495,44 @@ namespace MifareOneTool
 
             }
         }
+
+        private void ShowUID_Click(object sender, EventArgs e)
+        {
+            if (lprocess) { MessageBox.Show(Resources.有任务运行中_不可执行, Resources.设备忙, MessageBoxButtons.OK, MessageBoxIcon.Warning); return; }
+            Form1.ActiveForm.Text = Resources.MifareOne_Tool_运行中;
+            Process cmd = new Process();
+            cmd.StartInfo = new ProcessStartInfo("nfc-bin/nfcUID.exe","-device=1");
+            cmd.StartInfo.RedirectStandardOutput = true;
+            cmd.StartInfo.RedirectStandardInput = true;
+            cmd.StartInfo.UseShellExecute = false;
+            cmd.StartInfo.CreateNoWindow = true;
+            cmd.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
+            cmd.OutputDataReceived += new DataReceivedEventHandler(SortOutputHandler);
+            cmd.Start();
+            cmd.BeginOutputReadLine();
+        }
+
+        void SortOutputHandler(object sender, DataReceivedEventArgs e)
+        {
+            Trace.WriteLine(e.Data);
+            this.BeginInvoke(new MethodInvoker(() =>
+            {
+                richTextBox1.AppendText(e.Data + Environment.NewLine);
+                richTextBox1.ScrollToCaret();
+            }));
+        }
+
+        private void Form1_Closed(object sender, System.EventArgs e)
+        {
+            this.Dispose();
+            Application.Exit();
+        }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            System.Diagnostics.Process Go = new System.Diagnostics.Process();
+            Go.StartInfo.FileName = @"libusb\libusbK-inf-wizard.exe";
+            Go.Start();
+        }
     }
-}
+}

MifareOneTool/Form1.ru.resx

@@ -124,16 +124,16 @@
     <value>Блокировка карты UFUID</value>
   </data>
   <data name="buttonBmfRead.Text" xml:space="preserve">
-    <value>Читать UID</value>
+    <value>Считать UID в дамп</value>
   </data>
   <data name="buttonBmfRead.ToolTip" xml:space="preserve">
-    <value>Прочитать UID карты</value>
+    <value>UID карты будет записан в файл дампа</value>
   </data>
   <data name="buttonBmfWrite.Text" xml:space="preserve">
-    <value>Запись UID</value>
+    <value>Записать UID из дампа</value>
   </data>
   <data name="buttonBmfWrite.ToolTip" xml:space="preserve">
-    <value>Напишите UID-карту.</value>
+    <value>UID будет записан из файла дампа карты, сделанного ранее</value>
   </data>
   <data name="buttonCheckEncrypt.Text" xml:space="preserve">
     <value>Проверка шифрования</value>
@@ -190,7 +190,7 @@
     <value>Записать обычную карту</value>
   </data>
   <data name="buttonEReadUID.Text" xml:space="preserve">
-    <value>Чтение UID</value>
+    <value>Считать UID в дамп</value>
   </data>
   <data name="buttonEscan.Text" xml:space="preserve">
     <value>Определить считыватель</value>
@@ -218,10 +218,11 @@
 (В настоящее время поддерживает PN532, ACR122U)</value>
   </data>
   <data name="buttonLockUfuid.Text" xml:space="preserve">
-    <value>Блокировка Ufuid</value>
+    <value>Блокировка UFUID</value>
   </data>
   <data name="buttonLockUfuid.ToolTip" xml:space="preserve">
-    <value>Заблокированная карта UFUID 0 блокирует данные (тестирование)</value>
+    <value>Блокировка 0-го блока данных UFUID карты (тестируется）
+</value>
   </data>
   <data name="buttonMfcuk.Text" xml:space="preserve">
     <value>MFUK</value>
@@ -240,7 +241,7 @@
     <value>Отформатируйте нормальную карту M1 (необходимо загрузить файл ключа)</value>
   </data>
   <data name="buttonMfoc.Text" xml:space="preserve">
-    <value>Чтение MFOC</value>
+    <value>MFOC</value>
   </data>
   <data name="buttonMfoc.ToolTip" xml:space="preserve">
     <value>Взлом на полушифрованных картах.
@@ -271,29 +272,28 @@
     <value>Сканирование для действительной карты.</value>
   </data>
   <data name="buttonSelectKey.Text" xml:space="preserve">
-    <value>Выбрать key.mfd</value>
+    <value>Выбрать файл ключей</value>
   </data>
   <data name="buttonSelectKey.ToolTip" xml:space="preserve">
     <value>Загрузите файл MFD с правильным ключом для чтения и записи и правильными битами управления.</value>
   </data>
   <data name="buttonUidFormat.Text" xml:space="preserve">
-    <value>Полный UID</value>
+    <value>Стереть UID</value>
   </data>
   <data name="buttonUidFormat.ToolTip" xml:space="preserve">
-    <value>Очистите карту и повторно инициализируйте ее.
+    <value>Очистите карту и повторно инициализируйте ее. Это можно использовать для оказания первой помощи в ситуациях, когда поврежден ACbit/ключи полностью изменены.</value>
-Его можно использовать для оказания первой помощи в ситуациях, когда повреждение ACbit / KEY полностью изменено.</value>
   </data>
   <data name="buttonUidReset.Text" xml:space="preserve">
     <value>Сброс UID</value>
   </data>
   <data name="buttonUidReset.ToolTip" xml:space="preserve">
-    <value>Сброс блока UID карты 0, UID случайный, а номер производителя - Fudan.</value>
+    <value>Сброс 0-го блока карты, номер UID - случайный, а данные производителя - Fudan.</value>
   </data>
   <data name="buttonUidWrite.Text" xml:space="preserve">
-    <value>Номер записи UID</value>
+    <value>Изменить UID</value>
   </data>
   <data name="buttonUidWrite.ToolTip" xml:space="preserve">
-    <value>Запишите номер верхней карты на карту UID, и производитель установит его на Fudan.</value>
+    <value>На карту записывается номер Sticky Card, производитель будет установлен на Fudan.</value>
   </data>
   <data name="checkBoxAutoABN.Text" xml:space="preserve">
     <value>Автоматически определять ключ (бета)</value>
@@ -305,7 +305,7 @@
     <value>Автоматически сохранять файлы с именем UID</value>
   </data>
   <data name="checkBoxCuidKeyOver.Text" xml:space="preserve">
-    <value>CUID запись патча пустой карты</value>
+    <value>CUID записывает пустой патч карты</value>
   </data>
   <data name="checkBoxDefIsAdv.Text" xml:space="preserve">
     <value>Автоматический переход в расширенный режим работы</value>
@@ -316,9 +316,6 @@
   </data>
   <data name="checkBoxMultiDev.Text" xml:space="preserve">
     <value>Режим нескольких устройств. Пожалуйста, укажите ваше собственное устройство</value>
-    <comment>Previous text: 多实例运行模式
-会禁用多开检测
-请自行指定设备</comment>
   </data>
   <data name="checkBoxNewScan.Text" xml:space="preserve">
     <value>Уменьшить задержку оборудования</value>
@@ -328,15 +325,17 @@
   </data>
   <data name="comboBox1.Items" xml:space="preserve">
     <value>Китайский</value>
+    <comment>Previous text: Китайский</comment>
   </data>
   <data name="comboBox1.Items1" xml:space="preserve">
     <value>Русский</value>
+    <comment>Previous text: Русский</comment>
   </data>
   <data name="groupBox1.Text" xml:space="preserve">
     <value>Управление устройством</value>
   </data>
   <data name="groupBox10.Text" xml:space="preserve">
-    <value>Взломать</value>
+    <value>Инструменты для взлома</value>
   </data>
   <data name="groupBox12.Text" xml:space="preserve">
     <value>Настройки интерфейса</value>
@@ -366,7 +365,7 @@
     <value>2. Прочитать карту</value>
   </data>
   <data name="groupBox6.Text" xml:space="preserve">
-    <value>Операция с картой</value>
+    <value>Операции с картой</value>
   </data>
   <data name="groupBox7.Text" xml:space="preserve">
     <value>3. Записать карту</value>
@@ -378,7 +377,7 @@
     <value>Работа с картой C/FUID</value>
   </data>
   <data name="label1.Text" xml:space="preserve">
-    <value>Карточка читается 
+    <value>Карта читается 
 как и обычная карта</value>
   </data>
   <data name="label10.Text" xml:space="preserve">
@@ -414,11 +413,17 @@
   </data>
   <data name="richTextBox1.Lines[0]" xml:space="preserve">
     <value>Привет!</value>
-    <comment>Previous text: ппппппппппппппппппп</comment>
+    <comment>Previous text: Привет!</comment>
+  </data>
+  <data name="richTextBox1.Text" xml:space="preserve">
+    <value>Привет!</value>
   </data>
   <data name="runTimeLabel.Text" xml:space="preserve">
     <value>Таймер</value>
   </data>
+  <data name="ShowUID.Text" xml:space="preserve">
+    <value>Показать UID</value>
+  </data>
   <data name="statusLabel.Text" xml:space="preserve">
     <value>Готов</value>
   </data>
@@ -439,189 +444,231 @@
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="tableLayoutPanel5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>160, 74</value>
+    <value>171, 74</value>
   </data>
   <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>164, 96</value>
+    <value>175, 96</value>
   </data>
   <data name="flowLayoutPanel12.Size" type="System.Drawing.Size, System.Drawing">
-    <value>133, 29</value>
+    <value>145, 31</value>
   </data>
   <data name="buttonScanCard.Size" type="System.Drawing.Size, System.Drawing">
-    <value>129, 25</value>
+    <value>141, 27</value>
   </data>
   <data name="flowLayoutPanel11.Size" type="System.Drawing.Size, System.Drawing">
-    <value>154, 29</value>
+    <value>165, 31</value>
   </data>
   <data name="buttonListDev.Size" type="System.Drawing.Size, System.Drawing">
-    <value>80, 25</value>
+    <value>86, 27</value>
   </data>
   <data name="buttonCLI.Location" type="System.Drawing.Point, System.Drawing">
-    <value>86, 2</value>
+    <value>92, 2</value>
   </data>
   <data name="buttonCLI.Size" type="System.Drawing.Size, System.Drawing">
-    <value>66, 25</value>
+    <value>71, 27</value>
+  </data>
+  <data name="richTextBox1.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Yu Gothic UI, 9.75pt</value>
+  </data>
+  <data name="richTextBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>4, 247</value>
   </data>
   <data name="richTextBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1098, 174</value>
+    <value>1098, 185</value>
+  </data>
+  <data name="buttonMfRead.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABGdBTUEAALGPC/xhBQAAAKpJREFUOE/l
+        krENwkAMRU+wAx0okxBGoQSJEdiAkiyQASjoKRiBBkGZFWhoL8/wKZwT4pQKwZNecf6xZSkOf0KMscAy
+        00JtKYQN5tKoLYXQNppl+n6j74N1t3j84AE3OFFbCmHOIPOKNxyrtR8MGOAJK5X6w5Aad3p6CNxBqmz1
+        EV5wgfbr13jHlT7xEHQPcq76/vl0VDh8NHYhcAep8mujMy5xam9Fv08ILelnWlThzMVcAAAAAElFTkSu
+        QmCC
+</value>
   </data>
   <data name="buttonMfRead.Size" type="System.Drawing.Size, System.Drawing">
-    <value>56, 25</value>
+    <value>76, 27</value>
   </data>
   <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>170, 2</value>
+    <value>181, 2</value>
   </data>
   <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>200, 96</value>
+    <value>263, 96</value>
   </data>
   <data name="tableLayoutPanel7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>196, 74</value>
+    <value>259, 74</value>
   </data>
   <data name="flowLayoutPanel14.Size" type="System.Drawing.Size, System.Drawing">
-    <value>107, 29</value>
+    <value>166, 31</value>
+  </data>
+  <data name="buttonSelectKey.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABGdBTUEAALGPC/xhBQAAANpJREFUOE/t
+        kjEOAVEQhldWEAoXWLVOFA5ASeEALqBRqoREonMAtV6i1TqFWghRqShEsb55bzasrKyt+ZKvmP/NTDLJ
+        c/4kw/f9Mg5wjB3M69N3MJDCKb6zw5K2xUPzyIxFs8G0tn6GphxeZEJZ4QSvprIsUM6NshUsqmHAEbOa
+        90wSzw09Gaia0nLATMJFdzSLXDxLokSdtsTglLkEyhbtaQJF18TRnLCgrdJbN6llrfETQvk/cu8re6xo
+        i4HaQzlHmGkchocitrGPDXT1KQR5E4eY7MP+NI7zACE9wjmZDmbMAAAAAElFTkSuQmCC
+</value>
   </data>
   <data name="buttonSelectKey.Size" type="System.Drawing.Size, System.Drawing">
-    <value>103, 25</value>
+    <value>162, 27</value>
   </data>
   <data name="flowLayoutPanel13.Size" type="System.Drawing.Size, System.Drawing">
-    <value>190, 29</value>
+    <value>253, 31</value>
+  </data>
+  <data name="buttonMfWrite.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABGdBTUEAALGPC/xhBQAAALNJREFUOE/V
+        kLEOAUEURafTqnTb+g6NikaikAgSyX6Onq/hS3Q+QCdY41x54nXjUe1JTrGz995MJrWfnPMIt9ixoziU
+        p9ig2GN8jFIXe3jENzv7/R0UBnjGCVZ4wjuOLVKG8BAvKFSeYR8XFilDWA97RY/GKouUIayRm5qOB84t
+        Uoaw3uLvEb2Bru8Jjyyt5NH32iJlCK+s5ImNCAqHV/VDfERQ8kO/jQiKG9SYrO24taT0BAzgOu74eQMU
+        AAAAAElFTkSuQmCC
+</value>
   </data>
   <data name="buttonMfWrite.Location" type="System.Drawing.Point, System.Drawing">
-    <value>62, 2</value>
+    <value>82, 2</value>
   </data>
   <data name="buttonMfWrite.Size" type="System.Drawing.Size, System.Drawing">
-    <value>56, 25</value>
+    <value>76, 27</value>
+  </data>
+  <data name="buttonMfFormat.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABGdBTUEAALGPC/xhBQAAAK9JREFUOE/l
+        kzEKwkAQRReSQ1h5ibQKNpLeM+gB7C08Qe6TLhfxEPbC+mYyK0vYMcFG0AcPkpk/AwNJ+HFijDVusMUb
+        JuR5j9KrLe5D6IhznCzuQ6jCLe4cpVdZ/D0EB/QYLNONry8eeNAFCQpLFjV4zbzgShckKMwuWoSEx5ki
+        3mmdDudQ/OS0RodzKH7ltDuudXAKjV4jZXrLpNPOWP7SacjvId/FFKm1Fvs/QngCus/tMMJAkDEAAAAA
+        SUVORK5CYII=
+</value>
   </data>
   <data name="buttonMfFormat.Location" type="System.Drawing.Point, System.Drawing">
-    <value>122, 2</value>
+    <value>162, 2</value>
   </data>
   <data name="buttonMfFormat.Size" type="System.Drawing.Size, System.Drawing">
-    <value>66, 25</value>
-  </data>
-  <data name="buttonBmfWrite.Size" type="System.Drawing.Size, System.Drawing">
-    <value>78, 27</value>
-  </data>
-  <data name="buttonBmfRead.Size" type="System.Drawing.Size, System.Drawing">
-    <value>77, 27</value>
-  </data>
-  <data name="buttonMfoc.Size" type="System.Drawing.Size, System.Drawing">
-    <value>89, 25</value>
-  </data>
-  <data name="buttonUidWrite.Location" type="System.Drawing.Point, System.Drawing">
-    <value>84, 2</value>
-  </data>
-  <data name="buttonUidWrite.Size" type="System.Drawing.Size, System.Drawing">
-    <value>114, 27</value>
-  </data>
-  <data name="buttonUidFormat.Location" type="System.Drawing.Point, System.Drawing">
-    <value>159, 2</value>
-  </data>
-  <data name="buttonUidFormat.Size" type="System.Drawing.Size, System.Drawing">
     <value>89, 27</value>
   </data>
+  <data name="buttonBmfWrite.Size" type="System.Drawing.Size, System.Drawing">
+    <value>147, 27</value>
+  </data>
+  <data name="buttonBmfRead.Size" type="System.Drawing.Size, System.Drawing">
+    <value>128, 27</value>
+  </data>
+  <data name="buttonMfoc.Size" type="System.Drawing.Size, System.Drawing">
+    <value>52, 27</value>
+  </data>
+  <data name="buttonUidWrite.Location" type="System.Drawing.Point, System.Drawing">
+    <value>153, 2</value>
+  </data>
+  <data name="buttonUidWrite.Size" type="System.Drawing.Size, System.Drawing">
+    <value>98, 27</value>
+  </data>
+  <data name="buttonUidFormat.Location" type="System.Drawing.Point, System.Drawing">
+    <value>215, 2</value>
+  </data>
+  <data name="buttonUidFormat.Size" type="System.Drawing.Size, System.Drawing">
+    <value>85, 27</value>
+  </data>
   <data name="buttonUidReset.Location" type="System.Drawing.Point, System.Drawing">
-    <value>83, 2</value>
+    <value>134, 2</value>
   </data>
   <data name="buttonUidReset.Size" type="System.Drawing.Size, System.Drawing">
-    <value>72, 27</value>
+    <value>77, 27</value>
   </data>
   <data name="groupBox3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>586, 2</value>
+    <value>630, 2</value>
   </data>
   <data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>156, 96</value>
+    <value>166, 100</value>
   </data>
   <data name="tableLayoutPanel10.Size" type="System.Drawing.Size, System.Drawing">
-    <value>152, 74</value>
+    <value>162, 78</value>
   </data>
   <data name="flowLayoutPanel20.Size" type="System.Drawing.Size, System.Drawing">
-    <value>83, 29</value>
+    <value>88, 31</value>
   </data>
   <data name="buttonKill.Size" type="System.Drawing.Size, System.Drawing">
-    <value>79, 25</value>
+    <value>84, 27</value>
   </data>
   <data name="flowLayoutPanel19.Size" type="System.Drawing.Size, System.Drawing">
-    <value>146, 29</value>
+    <value>156, 31</value>
   </data>
   <data name="buttonConClr.Size" type="System.Drawing.Size, System.Drawing">
-    <value>66, 25</value>
+    <value>71, 27</value>
   </data>
   <data name="buttonConSave.Location" type="System.Drawing.Point, System.Drawing">
-    <value>72, 2</value>
+    <value>77, 2</value>
   </data>
   <data name="buttonConSave.Size" type="System.Drawing.Size, System.Drawing">
-    <value>72, 25</value>
+    <value>77, 27</value>
   </data>
   <data name="buttonMfcuk.Location" type="System.Drawing.Point, System.Drawing">
-    <value>177, 2</value>
+    <value>148, 2</value>
   </data>
   <data name="buttonMfcuk.Size" type="System.Drawing.Size, System.Drawing">
-    <value>49, 25</value>
+    <value>51, 27</value>
   </data>
   <data name="buttonHexTool.Size" type="System.Drawing.Size, System.Drawing">
-    <value>102, 25</value>
+    <value>108, 27</value>
   </data>
   <data name="buttonDiffTool.Size" type="System.Drawing.Size, System.Drawing">
-    <value>115, 27</value>
+    <value>125, 29</value>
   </data>
   <data name="buttonCheckEncrypt.Size" type="System.Drawing.Size, System.Drawing">
-    <value>136, 25</value>
+    <value>150, 27</value>
   </data>
   <data name="buttonLockUfuid.Location" type="System.Drawing.Point, System.Drawing">
-    <value>202, 2</value>
+    <value>255, 2</value>
   </data>
   <data name="buttonLockUfuid.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 27</value>
+    <value>124, 27</value>
   </data>
   <data name="buttonCmfWrite.Size" type="System.Drawing.Size, System.Drawing">
     <value>134, 25</value>
   </data>
   <data name="buttonDictMfoc.Location" type="System.Drawing.Point, System.Drawing">
-    <value>142, 2</value>
+    <value>156, 2</value>
   </data>
   <data name="buttonDictMfoc.Size" type="System.Drawing.Size, System.Drawing">
-    <value>88, 25</value>
+    <value>92, 27</value>
   </data>
   <data name="buttonnKeysMfoc.Location" type="System.Drawing.Point, System.Drawing">
-    <value>95, 2</value>
+    <value>58, 2</value>
   </data>
   <data name="buttonnKeysMfoc.Size" type="System.Drawing.Size, System.Drawing">
-    <value>78, 25</value>
+    <value>86, 27</value>
   </data>
   <data name="groupBox4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>256, 96</value>
+    <value>276, 100</value>
   </data>
   <data name="tableLayoutPanel6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 74</value>
+    <value>272, 78</value>
   </data>
   <data name="flowLayoutPanel10.Size" type="System.Drawing.Size, System.Drawing">
-    <value>106, 29</value>
+    <value>112, 31</value>
   </data>
   <data name="flowLayoutPanel9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>246, 31</value>
+    <value>266, 33</value>
   </data>
   <data name="buttonMFF08.Location" type="System.Drawing.Point, System.Drawing">
-    <value>122, 3</value>
+    <value>132, 3</value>
   </data>
   <data name="buttonMFF08.Size" type="System.Drawing.Size, System.Drawing">
-    <value>121, 25</value>
+    <value>131, 27</value>
   </data>
   <data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1090, 225</value>
+    <value>1090, 220</value>
   </data>
   <data name="tabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1090, 225</value>
+    <value>1090, 220</value>
   </data>
   <data name="tabPage3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1090, 225</value>
+    <value>1090, 220</value>
   </data>
-  <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+  <data name="imageList2.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABk
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACu
-        CwAAAk1TRnQBSQFMAgEBBAEAAaABAAGgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CgAAAk1TRnQBSQFMAgEBAwEAAVABAAFQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
-        AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
+        AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
         AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
@@ -648,40 +695,37 @@
         AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
         AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
         AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
-        AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8A/wD/AP8AGwAE/yEA
+        AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wQAAf8B8gjwAfIB/wcA
-        BP8HAAG8AgABbQwAAQcC7QHvBwAB/wH0AfMB9AH/FAAB/wHyAewBbQHxAf8GAAHrAgABFQgABP8BbQIA
+        BP8RAAT/FAAB8wFtCAABFAHzBwABBwLtAe8QAAH/AfIB7AFtAfEB/xMAAfMBbQgAARQB8wMABP8BbQIA
-        ARUE/wMAAf8B7AEUAW0B8QH/EgAB/wHyAW0CAAHsAf8DAAHqAfABvAQAAewB8gHqAbwDAAH/AfQB7wG8
+        ARUE/wsAAf8B8gFtAgAB7AH/EwAB8wFtCAABFAHzAgAB/wH0Ae8BvAHvARECAAEOAe8B8AHvAfMB/woA
-        Ae8BEQIAAQ4B7wHwAe8B8wH/AgAB/wETAgABEgHxAf8RAAHyAeoDAAH3Af8BAAH/AewKAAETAf8CAAH/
+        AfIB6gMAAfcB/xEAAfIB8AHzAW0IAAEUAfMCAAH/AZIBDgEQAQ8EAAEOAREBDgHsAf8JAAHyARIDAAHr
-        AZIBDgEQAQ8EAAEOAREBDgHsAf8CAAH/AewDAAETAfEQAAHyARIDAAHrAfMB/wEAAfIFAAHrAZIBEAQA
+        AfMB/xEAAe8B7AHzAW0IAAEUAfMCAAHzAQ8DAAFDAfcB7wERAwABDwHxAf8HAAHyARQDAAHrAfMB/xIA
-        Ae8CAAHzAQ8DAAFDAfcB7wERAwABDwHxAf8BAAH/AfMB7AMAARUB8g4AAfIBFAMAAesB8wH/AgAB/wH3
+        AfcBbQHzAW0IAAEUAfMCAAH/AewCAAFDAfIC/wHyAQ8CAAFtAfQB/wMAAf8B8gHwAbwBFQMAAW0B8wH/
-        AQ4BAAEOAfEB/wEAAfQBDgIAAW0B9AIAAf8B7AIAAUMB8gL/AfIBDwIAAW0B9AH/AgAB/wHzAesDAAEQ
+        EwAB9wFtAfMBbQgAARQB8wMAAfQB6gEAAewB9AIAAf8B7QEAARMB8wMAAf8B8AFDBgAB6gH0FQAB9wFt
-        AfIJAAH/AfIB8AG8ARUDAAFtAfMB/wUAAW0BAAESBAAB7QIAAfMEAAH0AeoBAAHsAfQCAAH/Ae0BAAET
+        AfMBbQQAAQcC/wHvAesB9AIAAf8B8wESAQAB6wH0AgAB/wHsAQABFAHyAf8CAAHwBwAB6gH0FgAB9wFt
-        AfMGAAH0AW0DAAEQAfIGAAH/AfABQwYAAeoB9AYAAf8BFAEAAUMB/wIAAf8BbQIAAfADAAH/AfMBEgEA
+        AfMBbQQAAQcB/wHvAW0B8QH/AgAB9AFtAgABDgEHAvQBvAEPAgAB6gHzAv8BQwEAAg4EAAHxFwAB9wFt
-        AesB9AIAAf8B7AEAARQB8gH/BgAB9AFtAwABFAHyAf8EAAHwBwAB6gH0BgAB9AEOAwAB7QH/AQAB8QMA
+        AfMBbQQAAu8BbQHxAf8DAAHzAREDAAEPAesBbQEOAwABEAHyAf8B9AEAARABkgH3AUMDAAHwFwAB9wFt
-        AQ4B8gIAAfQBbQIAAQ4BBwL0AbwBDwIAAeoB8wH/BgAB9AFtAgABDgH3Av8CAAH/AUMBAAIOBAAB8QcA
+        AfMBbQQAARMB6gHxAf8EAAH/Ae8BDgFDARAEAAEOARUBDgGSAf8BAAH0AQ8BBwL/AZIBDgIAAfEXAAH3
-        AfQBDgQAARUB6gEOAwABDgHyAgAB8wERAwABDwHrAW0BDgMAARAB8gH/BwAB9AHsAQ4B7QHxAe8B8gH/
+        AW0B/wG8Be8B8QH/BQAB/wH0AbwB8QG8AUMCAAEPAQcB8gG8AfQB/wEAAf8BvAH/AQAB/wHtAQ4BAAEQ
-        AQAB9AEAARABkgH3AUMDAAHwCAAB8AoAAewDAAH/Ae8BDgFDARAEAAEOARUBDgGSAf8JAAH0AQcB8gHs
+        Af8XAAH3ARIC8wXyAfQHAAT/AW0CAAEVBP8DAAH/AQAB/wHvARACAAG8Af8XAAH3AQ4HEQHsCwAB8AL3
-        AQ4B7AH0AQAB9AEPAQcC/wGSAQ4CAAHxCQABvALzARECAAEOAfEB9AG8AfMDAAH/AfQBvAHxAbwBQwIA
+        AQcIAAH/AbwBEAEAARUB8AH/GAAB9AjyAfM1AAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUA
-        AQ8BBwHyAbwB9AH/CgAB/wG8AQ4BEAEHAf8BAAH/AbwB/wEAAf8B7QEOAQABEAH/DAAB7AIAARMIAAT/
+        AYAXAAP/AQAB4AEBAfwBPwH/AeECAAHgAQEB/AE/Af8BwAIAAeABAQHAAQMB/wGAAgAB4AEBAYABAQH/
-        AW0CAAEVBP8LAAH/AfQB9wEHAv8CAAH/AQAB/wHvARACAAG8Af8MAAHzAu8B8AwAAfAC9wEHEAAD/wUA
+        AYACAAGAAQEBgAEBAf8DAAGAAQEBgAEAAf4BAQIAAYABAQGAAQAB4AEDAgABgAEBAcEBgwGAAQ8CAAGA
-        Af8BvAEQAQABFQHwAf9HAAFCAU0BPgcAAT4DAAEoAwABQAMAASADAAEBAQABAQYAAQEWAAP/gQAC/wH8
+        AQECgQGAAR8CAAGAAQEBgAIAAT8CAAGAAQMBgAIAAT8CAAGAAQcBgAEBAQABPwIAAYABDwGAAQEBEAE/
-        AT8D/wHhAfwBPwH8AT8BgwL/AcAB/AE/AcABAwGBAv8BgAHgAQMBgAEBAYAC/wKAAQEBgAEBAYAC/wEA
+        AgABgAEfAcABAwGgAT8CAAGAAR8B/AE/AcABfwIAAYABHwT/AgAL
-        AYABAQGAAQABgAF/Af4BAQGAAYEBgAEAAcABPwHgAQMB4wHDAcEBgwHwAR8BgAEPAcEBgwKBAfgBBwGA
-        AR8BgAGBAYABAAH8AQMBAAE/AYABAQGAAQAB/gEBAQABPwHAAQMBgAEBAf8BAQEAAT8B4AEDAYABAQH/
-        AYEBEAE/AfwBPwHAAQMB/wGBAaABPwH8AT8B/AE/Af8BxwHAAX8I/ws=
 </value>
   </data>
   <data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1098, 253</value>
+    <value>1098, 248</value>
   </data>
   <data name="tableLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1086, 221</value>
+    <value>1086, 216</value>
   </data>
   <data name="flowLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
     <value>623, 3</value>
   </data>
   <data name="flowLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>92, 215</value>
+    <value>92, 210</value>
   </data>
   <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
     <value>88, 51</value>
@@ -693,53 +737,75 @@
     <value>86, 29</value>
   </data>
   <data name="groupBox16.Size" type="System.Drawing.Size, System.Drawing">
-    <value>424, 215</value>
+    <value>424, 210</value>
   </data>
   <data name="tableLayoutPanel15.Size" type="System.Drawing.Size, System.Drawing">
-    <value>406, 140</value>
+    <value>406, 138</value>
   </data>
   <data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>402, 68</value>
+    <value>402, 66</value>
+  </data>
+  <data name="label7.Location" type="System.Drawing.Point, System.Drawing">
+    <value>2, 32</value>
   </data>
   <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
     <value>95, 34</value>
   </data>
   <data name="buttonEscan.Size" type="System.Drawing.Size, System.Drawing">
-    <value>160, 30</value>
+    <value>160, 28</value>
-  </data>
-  <data name="buttonECheckEncrypt.Location" type="System.Drawing.Point, System.Drawing">
-    <value>202, 2</value>
-  </data>
-  <data name="buttonECheckEncrypt.Size" type="System.Drawing.Size, System.Drawing">
-    <value>162, 30</value>
   </data>
   <data name="buttoEScanCard.Location" type="System.Drawing.Point, System.Drawing">
-    <value>202, 36</value>
+    <value>202, 2</value>
   </data>
   <data name="buttoEScanCard.Size" type="System.Drawing.Size, System.Drawing">
-    <value>162, 30</value>
+    <value>162, 28</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="pictureBox1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
   <data name="pictureBox1.Location" type="System.Drawing.Point, System.Drawing">
     <value>167, 3</value>
   </data>
+  <data name="pictureBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>30, 26</value>
+  </data>
   <data name="pictureBox2.Location" type="System.Drawing.Point, System.Drawing">
     <value>369, 3</value>
   </data>
+  <data name="buttonECheckEncrypt.Location" type="System.Drawing.Point, System.Drawing">
+    <value>202, 34</value>
+  </data>
+  <data name="buttonECheckEncrypt.Size" type="System.Drawing.Size, System.Drawing">
+    <value>162, 30</value>
+  </data>
+  <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 70</value>
+  </data>
   <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
-    <value>400, 68</value>
+    <value>370, 68</value>
+  </data>
+  <data name="groupBox5.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left</value>
+  </data>
+  <data name="groupBox5.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>None</value>
   </data>
   <data name="groupBox5.Location" type="System.Drawing.Point, System.Drawing">
     <value>432, 2</value>
   </data>
   <data name="groupBox5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>186, 217</value>
+    <value>186, 212</value>
   </data>
   <data name="tableLayoutPanel11.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 195</value>
+    <value>182, 190</value>
   </data>
   <data name="buttonEReadUID.Size" type="System.Drawing.Size, System.Drawing">
     <value>178, 27</value>
   </data>
+  <data name="buttonEMfRead.Location" type="System.Drawing.Point, System.Drawing">
+    <value>2, 161</value>
+  </data>
   <data name="buttonEMfRead.Size" type="System.Drawing.Size, System.Drawing">
     <value>178, 27</value>
   </data>
@@ -756,7 +822,10 @@
     <value>893, 3</value>
   </data>
   <data name="tableLayoutPanel3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>190, 215</value>
+    <value>190, 210</value>
+  </data>
+  <data name="flowLayoutPanel24.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 70</value>
   </data>
   <data name="flowLayoutPanel24.Size" type="System.Drawing.Size, System.Drawing">
     <value>184, 32</value>
@@ -765,7 +834,7 @@
     <value>141, 32</value>
   </data>
   <data name="buttonEStop.Location" type="System.Drawing.Point, System.Drawing">
-    <value>104, 186</value>
+    <value>104, 181</value>
   </data>
   <data name="buttonEStop.Size" type="System.Drawing.Size, System.Drawing">
     <value>84, 27</value>
@@ -774,10 +843,10 @@
     <value>720, 2</value>
   </data>
   <data name="groupBox7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>168, 217</value>
+    <value>168, 212</value>
   </data>
   <data name="tableLayoutPanel13.Size" type="System.Drawing.Size, System.Drawing">
-    <value>164, 195</value>
+    <value>164, 190</value>
   </data>
   <data name="buttonEUIDWrite.Size" type="System.Drawing.Size, System.Drawing">
     <value>160, 27</value>
@@ -789,55 +858,64 @@
     <value>160, 27</value>
   </data>
   <data name="buttonEMfWrite.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 166</value>
+    <value>3, 161</value>
   </data>
   <data name="buttonEMfWrite.Size" type="System.Drawing.Size, System.Drawing">
     <value>158, 27</value>
   </data>
   <data name="tableLayoutPanel4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>862, 212</value>
+    <value>1012, 220</value>
   </data>
   <data name="flowLayoutPanel8.Size" type="System.Drawing.Size, System.Drawing">
-    <value>856, 100</value>
+    <value>1006, 104</value>
   </data>
   <data name="groupBox10.Location" type="System.Drawing.Point, System.Drawing">
-    <value>262, 2</value>
+    <value>282, 2</value>
   </data>
   <data name="groupBox10.Size" type="System.Drawing.Size, System.Drawing">
-    <value>320, 96</value>
+    <value>344, 100</value>
   </data>
   <data name="tableLayoutPanel8.Size" type="System.Drawing.Size, System.Drawing">
-    <value>316, 74</value>
+    <value>340, 78</value>
   </data>
   <data name="flowLayoutPanel18.Size" type="System.Drawing.Size, System.Drawing">
-    <value>312, 35</value>
+    <value>336, 37</value>
   </data>
   <data name="buttonHardNested.Location" type="System.Drawing.Point, System.Drawing">
-    <value>234, 2</value>
+    <value>252, 2</value>
   </data>
   <data name="flowLayoutPanel17.Size" type="System.Drawing.Size, System.Drawing">
-    <value>310, 29</value>
+    <value>334, 31</value>
+  </data>
+  <data name="button1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>801, 3</value>
   </data>
   <data name="flowLayoutPanel7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>856, 100</value>
+    <value>1006, 104</value>
   </data>
   <data name="groupBox8.Location" type="System.Drawing.Point, System.Drawing">
-    <value>374, 2</value>
+    <value>448, 2</value>
   </data>
   <data name="groupBox8.Size" type="System.Drawing.Size, System.Drawing">
-    <value>334, 96</value>
+    <value>410, 96</value>
   </data>
   <data name="tableLayoutPanel9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>330, 74</value>
+    <value>406, 74</value>
   </data>
   <data name="flowLayoutPanel16.Size" type="System.Drawing.Size, System.Drawing">
-    <value>324, 31</value>
+    <value>381, 31</value>
   </data>
   <data name="flowLayoutPanel15.Size" type="System.Drawing.Size, System.Drawing">
-    <value>250, 31</value>
+    <value>400, 31</value>
+  </data>
+  <data name="ShowUID.Location" type="System.Drawing.Point, System.Drawing">
+    <value>304, 2</value>
+  </data>
+  <data name="ShowUID.Size" type="System.Drawing.Size, System.Drawing">
+    <value>94, 27</value>
   </data>
   <data name="groupBox9.Location" type="System.Drawing.Point, System.Drawing">
-    <value>712, 2</value>
+    <value>862, 2</value>
   </data>
   <data name="groupBox9.Size" type="System.Drawing.Size, System.Drawing">
     <value>142, 96</value>
@@ -849,121 +927,124 @@
     <value>134, 34</value>
   </data>
   <data name="tableLayoutPanel14.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1090, 225</value>
+    <value>1090, 220</value>
   </data>
   <data name="flowLayoutPanel6.Size" type="System.Drawing.Size, System.Drawing">
     <value>1084, 120</value>
   </data>
   <data name="groupBox6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>266, 116</value>
+    <value>269, 116</value>
   </data>
   <data name="flowLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>262, 94</value>
+    <value>265, 94</value>
   </data>
   <data name="checkBoxAutoABN.Size" type="System.Drawing.Size, System.Drawing">
-    <value>240, 19</value>
+    <value>244, 19</value>
   </data>
   <data name="checkBoxAutoLoadKey.Size" type="System.Drawing.Size, System.Drawing">
-    <value>237, 19</value>
+    <value>243, 19</value>
   </data>
   <data name="checkBoxWriteProtect.Size" type="System.Drawing.Size, System.Drawing">
-    <value>258, 19</value>
+    <value>261, 19</value>
   </data>
   <data name="checkBoxCuidKeyOver.Size" type="System.Drawing.Size, System.Drawing">
-    <value>200, 19</value>
+    <value>224, 19</value>
   </data>
   <data name="groupBox12.Location" type="System.Drawing.Point, System.Drawing">
-    <value>272, 2</value>
+    <value>275, 2</value>
   </data>
   <data name="groupBox12.Size" type="System.Drawing.Size, System.Drawing">
-    <value>228, 116</value>
+    <value>220, 116</value>
   </data>
   <data name="tableLayoutPanel12.Size" type="System.Drawing.Size, System.Drawing">
-    <value>216, 56</value>
+    <value>216, 94</value>
   </data>
   <data name="numericCLIFontSize.Location" type="System.Drawing.Point, System.Drawing">
-    <value>150, 31</value>
+    <value>154, 49</value>
+  </data>
+  <data name="numericCLIFontSize.Size" type="System.Drawing.Size, System.Drawing">
+    <value>60, 23</value>
   </data>
   <data name="label9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>131, 15</value>
+    <value>148, 47</value>
-  </data>
-  <data name="label10.Size" type="System.Drawing.Size, System.Drawing">
-    <value>144, 15</value>
   </data>
   <data name="buttonCLIColor.Location" type="System.Drawing.Point, System.Drawing">
-    <value>150, 2</value>
+    <value>154, 2</value>
+  </data>
+  <data name="buttonCLIColor.Size" type="System.Drawing.Size, System.Drawing">
+    <value>60, 43</value>
+  </data>
+  <data name="label10.Size" type="System.Drawing.Size, System.Drawing">
+    <value>148, 15</value>
   </data>
   <data name="groupBox14.Location" type="System.Drawing.Point, System.Drawing">
-    <value>504, 2</value>
+    <value>499, 2</value>
   </data>
   <data name="groupBox14.Size" type="System.Drawing.Size, System.Drawing">
-    <value>487, 116</value>
+    <value>497, 116</value>
   </data>
   <data name="flowLayoutPanel5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>483, 94</value>
+    <value>493, 94</value>
   </data>
   <data name="checkBoxNewScan.Size" type="System.Drawing.Size, System.Drawing">
-    <value>223, 19</value>
+    <value>227, 19</value>
   </data>
   <data name="checkBoxMultiDev.Size" type="System.Drawing.Size, System.Drawing">
-    <value>477, 19</value>
+    <value>487, 19</value>
   </data>
   <data name="label11.Size" type="System.Drawing.Size, System.Drawing">
-    <value>118, 15</value>
+    <value>120, 15</value>
   </data>
   <data name="flowLayoutPanel22.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1084, 93</value>
+    <value>1084, 88</value>
   </data>
   <data name="groupBox15.Size" type="System.Drawing.Size, System.Drawing">
-    <value>170, 68</value>
+    <value>172, 68</value>
   </data>
   <data name="flowLayoutPanel23.Size" type="System.Drawing.Size, System.Drawing">
-    <value>164, 44</value>
+    <value>166, 44</value>
   </data>
   <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
-    <value>158, 15</value>
+    <value>160, 15</value>
   </data>
   <data name="comboBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>158, 23</value>
+    <value>160, 23</value>
   </data>
   <data name="groupBox13.Location" type="System.Drawing.Point, System.Drawing">
-    <value>178, 2</value>
+    <value>180, 2</value>
   </data>
   <data name="groupBox13.Size" type="System.Drawing.Size, System.Drawing">
-    <value>346, 70</value>
+    <value>351, 70</value>
   </data>
   <data name="flowLayoutPanel4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>342, 48</value>
+    <value>347, 48</value>
   </data>
   <data name="checkBoxDefIsAdv.Size" type="System.Drawing.Size, System.Drawing">
-    <value>338, 19</value>
+    <value>343, 19</value>
   </data>
   <data name="checkBoxAutoSave.Size" type="System.Drawing.Size, System.Drawing">
-    <value>281, 19</value>
+    <value>289, 19</value>
   </data>
   <data name="groupBox11.Location" type="System.Drawing.Point, System.Drawing">
-    <value>528, 2</value>
+    <value>535, 2</value>
   </data>
   <data name="groupBox11.Size" type="System.Drawing.Size, System.Drawing">
-    <value>186, 70</value>
+    <value>188, 70</value>
   </data>
   <data name="flowLayoutPanel3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 48</value>
+    <value>184, 48</value>
   </data>
   <data name="checkBoxHardLowCost.Size" type="System.Drawing.Size, System.Drawing">
-    <value>178, 19</value>
+    <value>180, 19</value>
-  </data>
-  <data name="statusStrip1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 434</value>
   </data>
   <data name="statusStrip1.Size" type="System.Drawing.Size, System.Drawing">
     <value>1098, 22</value>
   </data>
   <data name="statusLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>60, 23</value>
+    <value>60, 22</value>
   </data>
-  <data name="localVersionLabel.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="runTimeLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>18, 23</value>
+    <value>72, 22</value>
   </data>
   <data name="toolStripCheckUpdate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

MifareOneTool/Form1.zh.resx

@@ -120,6 +120,9 @@
   <data name="buttoEScanCard.Text" xml:space="preserve">
     <value>扫描卡片</value>
   </data>
+  <data name="button1.Text" xml:space="preserve">
+    <value>button1</value>
+  </data>
   <data name="button4.Text" xml:space="preserve">
     <value>锁UFUID卡</value>
   </data>
@@ -205,7 +208,8 @@
     <value>写(UF)UID卡</value>
   </data>
   <data name="buttonHardNested.Text" xml:space="preserve">
-    <value>HardNested</value>
+    <value>Bitsliced Cropto-1</value>
+    <comment>Previous text: HardNested</comment>
   </data>
   <data name="buttonHexTool.Text" xml:space="preserve">
     <value>Hex编辑器</value>
@@ -317,9 +321,6 @@
   </data>
   <data name="checkBoxMultiDev.Text" xml:space="preserve">
     <value>多实例运行模式 会禁用多开检测 请自行指定设备</value>
-    <comment>Previous text: 多实例运行模式
-会禁用多开检测
-请自行指定设备</comment>
   </data>
   <data name="checkBoxNewScan.Text" xml:space="preserve">
     <value>减少找设备延迟</value>
@@ -329,9 +330,11 @@
   </data>
   <data name="comboBox1.Items" xml:space="preserve">
     <value>标准</value>
+    <comment>Previous text: Китайский</comment>
   </data>
   <data name="comboBox1.Items1" xml:space="preserve">
     <value>俄语</value>
+    <comment>Previous text: Русский</comment>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>MifareOne Tool</value>
@@ -420,11 +423,17 @@
   </data>
   <data name="richTextBox1.Lines[0]" xml:space="preserve">
     <value>Hello,cardman!</value>
-    <comment>Previous text: ппппппппппппппппппп</comment>
+    <comment>Previous text: Привет!</comment>
+  </data>
+  <data name="richTextBox1.Text" xml:space="preserve">
+    <value>Hello,cardman!</value>
   </data>
   <data name="runTimeLabel.Text" xml:space="preserve">
     <value>计时器</value>
   </data>
+  <data name="ShowUID.Text" xml:space="preserve">
+    <value>显示UID</value>
+  </data>
   <data name="statusLabel.Text" xml:space="preserve">
     <value>就绪</value>
   </data>
@@ -439,7 +448,6 @@
   </data>
   <data name="tabPage2.ImageKey" xml:space="preserve">
     <value>sharp_file_copy_black_18pt_1x.png</value>
-    <comment>Previous text: round_create_black_18pt_1x.png</comment>
   </data>
   <data name="tabPage2.Text" xml:space="preserve">
     <value>复制卡模式</value>

MifareOneTool/FormDiff.Designer.cs

@@ -43,9 +43,9 @@
             // 
             // richTextBox1
             // 
-            this.richTextBox1.BackColor = System.Drawing.Color.Black;
+            this.richTextBox1.BackColor = System.Drawing.Color.AliceBlue;
             resources.ApplyResources(this.richTextBox1, "richTextBox1");
-            this.richTextBox1.ForeColor = System.Drawing.Color.Orange;
+            this.richTextBox1.ForeColor = System.Drawing.Color.Black;
             this.richTextBox1.Name = "richTextBox1";
             this.richTextBox1.ReadOnly = true;
             this.richTextBox1.TextChanged += new System.EventHandler(this.RichTextBox1_TextChanged);
@@ -53,22 +53,29 @@
             // button1
             // 
             resources.ApplyResources(this.button1, "button1");
+            this.button1.BackColor = System.Drawing.Color.White;
+            this.button1.FlatAppearance.BorderColor = System.Drawing.Color.DodgerBlue;
             this.button1.Name = "button1";
-            this.button1.UseVisualStyleBackColor = true;
+            this.button1.UseVisualStyleBackColor = false;
             this.button1.Click += new System.EventHandler(this.button1_Click);
             // 
             // button2
             // 
             resources.ApplyResources(this.button2, "button2");
+            this.button2.BackColor = System.Drawing.Color.White;
+            this.button2.FlatAppearance.BorderColor = System.Drawing.Color.DodgerBlue;
             this.button2.Name = "button2";
-            this.button2.UseVisualStyleBackColor = true;
+            this.button2.UseVisualStyleBackColor = false;
             this.button2.Click += new System.EventHandler(this.button2_Click);
             // 
             // button3
             // 
             resources.ApplyResources(this.button3, "button3");
+            this.button3.BackColor = System.Drawing.Color.DodgerBlue;
+            this.button3.FlatAppearance.BorderColor = System.Drawing.Color.DodgerBlue;
+            this.button3.ForeColor = System.Drawing.Color.White;
             this.button3.Name = "button3";
-            this.button3.UseVisualStyleBackColor = true;
+            this.button3.UseVisualStyleBackColor = false;
             this.button3.Click += new System.EventHandler(this.button3_Click);
             // 
             // tableLayoutPanel1
@@ -105,6 +112,7 @@
             this.tableLayoutPanel1.ResumeLayout(false);
             this.tableLayoutPanel1.PerformLayout();
             this.flowLayoutPanel1.ResumeLayout(false);
+            this.flowLayoutPanel1.PerformLayout();
             this.flowLayoutPanel2.ResumeLayout(false);
             this.flowLayoutPanel2.PerformLayout();
             this.ResumeLayout(false);

MifareOneTool/FormDiff.cs

@@ -108,7 +108,7 @@ namespace MifareOneTool
             int diffCount = 0;
             for (int i = 0; i < 16; i++)
             {
-                stb.AppendLine("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%");
+                stb.AppendLine(Resources.res1);
                 stb.AppendLine(Resources.扇区0 + i.ToString());
                 for (int a = 0; a < 4; a++)
                 {
@@ -117,11 +117,11 @@ namespace MifareOneTool
                     {
                         if (sa.Sectors[i].Block[a][b] == sb.Sectors[i].Block[a][b])
                         {
-                            res += "-- ";
+                            res += Resources.res2;
                         }
                         else
                         {
-                            res += "## ";
+                            res += Resources.res3;
                         }
                     }
                     stb.AppendLine("A: " + Utils.Hex2StrWithSpan(sa.Sectors[i].Block[a]));

MifareOneTool/FormDiff.resx

@@ -147,6 +147,11 @@
 点击上方的AB两个按键分别选择MFD文件。
 然后点击“比较”即可看到结果。
 </value>
+    <comment>Previous text: 欢迎使用M1T内置的差异工具！
+说明：
+点击上方的AB两个按键分别选择MFD文件。
+然后点击“比较”即可看到结果。
+</comment>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
@@ -156,17 +161,20 @@
     <value>Fill</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="richTextBox1.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Yu Gothic UI, 9.75pt</value>
+  </data>
   <data name="richTextBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>2, 69</value>
+    <value>2, 94</value>
   </data>
   <data name="richTextBox1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>2, 3, 2, 3</value>
+    <value>2, 4, 2, 4</value>
   </data>
   <data name="richTextBox1.ScrollBars" type="System.Windows.Forms.RichTextBoxScrollBars, System.Windows.Forms">
     <value>ForcedVertical</value>
   </data>
   <data name="richTextBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>348, 221</value>
+    <value>402, 288</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="richTextBox1.TabIndex" type="System.Int32, mscorlib">
@@ -184,14 +192,26 @@
   <data name="&gt;&gt;richTextBox1.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <data name="button1.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="button1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="button1.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
+    <value>Flat</value>
+  </data>
+  <data name="button1.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Yu Gothic UI, 9.75pt</value>
+  </data>
   <data name="button1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>2, 3</value>
+    <value>2, 4</value>
   </data>
   <data name="button1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>2, 3, 2, 3</value>
+    <value>2, 4, 2, 4</value>
   </data>
   <data name="button1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>291, 21</value>
+    <value>339, 29</value>
   </data>
   <data name="button1.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -211,14 +231,26 @@
   <data name="&gt;&gt;button1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="button2.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="button2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="button2.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
+    <value>Flat</value>
+  </data>
+  <data name="button2.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Yu Gothic UI, 9.75pt</value>
+  </data>
   <data name="button2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>2, 30</value>
+    <value>2, 41</value>
   </data>
   <data name="button2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>2, 3, 2, 3</value>
+    <value>2, 4, 2, 4</value>
   </data>
   <data name="button2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>291, 21</value>
+    <value>339, 29</value>
   </data>
   <data name="button2.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -247,14 +279,20 @@
   <data name="button3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
+  <data name="button3.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
+    <value>Flat</value>
+  </data>
+  <data name="button3.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Yu Gothic UI, 9.75pt</value>
+  </data>
   <data name="button3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>303, 3</value>
+    <value>351, 4</value>
   </data>
   <data name="button3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>2, 3, 2, 3</value>
+    <value>2, 4, 2, 4</value>
   </data>
   <data name="button3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>41, 54</value>
+    <value>47, 74</value>
   </data>
   <data name="button3.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -280,27 +318,6 @@
   <data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
-  <data name="flowLayoutPanel1.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="flowLayoutPanel1.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
-    <value>GrowAndShrink</value>
-  </data>
-  <data name="flowLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="flowLayoutPanel1.FlowDirection" type="System.Windows.Forms.FlowDirection, System.Windows.Forms">
-    <value>TopDown</value>
-  </data>
-  <data name="flowLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 3</value>
-  </data>
-  <data name="flowLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>295, 54</value>
-  </data>
-  <data name="flowLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
   <data name="&gt;&gt;flowLayoutPanel1.Name" xml:space="preserve">
     <value>flowLayoutPanel1</value>
   </data>
@@ -317,13 +334,16 @@
     <value>Fill</value>
   </data>
   <data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 3</value>
+    <value>3, 4</value>
+  </data>
+  <data name="tableLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 4, 3, 4</value>
   </data>
   <data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
   <data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>346, 60</value>
+    <value>400, 82</value>
   </data>
   <data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -343,6 +363,30 @@
   <data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
     <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="flowLayoutPanel1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="button3" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
   </data>
+  <data name="flowLayoutPanel1.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="flowLayoutPanel1.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
+  <data name="flowLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="flowLayoutPanel1.FlowDirection" type="System.Windows.Forms.FlowDirection, System.Windows.Forms">
+    <value>TopDown</value>
+  </data>
+  <data name="flowLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 4</value>
+  </data>
+  <data name="flowLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 4, 3, 4</value>
+  </data>
+  <data name="flowLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>343, 74</value>
+  </data>
+  <data name="flowLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
   <data name="flowLayoutPanel2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -358,8 +402,11 @@
   <data name="flowLayoutPanel2.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="flowLayoutPanel2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 4, 3, 4</value>
+  </data>
   <data name="flowLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>370, 456</value>
+    <value>432, 596</value>
   </data>
   <data name="flowLayoutPanel2.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -377,7 +424,7 @@
     <value>0</value>
   </data>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
+    <value>7, 17</value>
   </data>
   <data name="$this.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -386,10 +433,379 @@
     <value>GrowAndShrink</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>370, 456</value>
+    <value>432, 596</value>
+  </data>
+  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Yu Gothic UI, 9.75pt</value>
+  </data>
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEASEgAAAEAIACIVAAAFgAAACgAAABIAAAAkAAAAAEAIAAAAAAAAFEAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAA5wAAAGUAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI8AAAD/AAAA/wAAAO0AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAjwAAAP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACHAAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAABwAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAADpAAAAgQAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAABCAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAA0AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAACBAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAhwAAAP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AI8AAAD/AAAA/wAAAOoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAByAAAAvgAA
+        AE4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAA/wAAAP8AAAD/AAAA/wAAAO8AAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAACHAAAA/wAAAP8AAAD/AAAA/wAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAABAAAAgQAAAOgAAADoAAAAgQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAOkAAADpAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAACHAAAA/wAAAP8AAAD/AAAA/wAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADoAAAA/wAA
+        AP8AAAD/AAAA/wAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABNAAAAvgAAAHIAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADmAAAA/wAAAP8AAACPAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAH8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAABpAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAaQAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAADQAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAADwAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAEMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAACHAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAAYgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAgQAA
+        AOgAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAABpAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAH8AAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAADwAAAA/wAAAP8AAACPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABlAAAA5wAA
+        AH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8AAAD///////////8A
+        AAD///////////8AAAD///////////8AAAD///////////8AAAD///////////8AAAD///////////8A
+        AAD///////////8AAAD//8f///////8AAAD//4f///////8AAAD//wf///////8AAAD//gf///////8A
+        AAD//Af///////8AAAD/+Af///////8AAAD/8Af///////8AAAD/4AAAAAAA//8AAAD/wAAAAAAAf/8A
+        AAD/gAAAAAAAf/8AAAD/gAAAAAAAf/8AAAD/wAAAAAAAf/8AAAD/4AAAAAAAf/8AAAD/8Af////gf/8A
+        AAD/+Af////gf/8AAAD//Af////gf/8AAAD//gf////gf/8AAAD//wf////gf/8AAAD//4f////gf/8A
+        AAD//8f////gf/8AAAD////////gf/8AAAD////////gf/8AAAD////////gf/8AAAD////////gf/8A
+        AAD////////gf/8AAAD///////////8AAAD///////////8AAAD///////////8AAAD///////////8A
+        AAD///////////8AAAD///////////8AAAD//w////////8AAAD//gf///////8AAAD//gf///////8A
+        AAD//gf///////8AAAD//gf///////8AAAD//gf////j//8AAAD//gf////h//8AAAD//gf////g//8A
+        AAD//gf////gf/8AAAD//gf////gP/8AAAD//gf////gH/8AAAD//gf////gD/8AAAD//gAAAAAAB/8A
+        AAD//gAAAAAAA/8AAAD//gAAAAAAAf8AAAD//gAAAAAAAf8AAAD//gAAAAAAA/8AAAD//gAAAAAAB/8A
+        AAD////////gD/8AAAD////////gH/8AAAD////////gP/8AAAD////////gf/8AAAD////////g//8A
+        AAD////////h//8AAAD////////j//8AAAD///////////8AAAD///////////8AAAD///////////8A
+        AAD///////////8AAAD///////////8AAAD///////////8AAAD///////////8AAAD///////////8A
+        AAA=
+</value>
   </data>
   <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>2, 3, 2, 3</value>
+    <value>2, 4, 2, 4</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>FormDiff</value>

MifareOneTool/FormDiff.ru.resx

@@ -146,5 +146,10 @@
 Описание:
 1. Нажмите  А или В, чтобы выбрать файл MFD.
 2. Нажмите «Сравнить», чтобы увидеть результаты.</value>
+    <comment>Previous text: 欢迎使用M1T内置的差异工具！
+说明：
+点击上方的AB两个按键分别选择MFD文件。
+然后点击“比较”即可看到结果。
+</comment>
   </data>
 </root>

MifareOneTool/FormDiff.zh.resx

@@ -147,5 +147,10 @@
 点击上方的AB两个按键分别选择MFD文件。
 然后点击“比较”即可看到结果。
 </value>
+    <comment>Previous text: 欢迎使用M1T内置的差异工具！
+说明：
+点击上方的AB两个按键分别选择MFD文件。
+然后点击“比较”即可看到结果。
+</comment>
   </data>
 </root>

MifareOneTool/FormHTool.Designer.cs

@@ -30,6 +30,8 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormHTool));
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             this.menuStrip1 = new System.Windows.Forms.MenuStrip();
             this.文件ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.新建ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -53,60 +55,61 @@
             this.dataGridView1 = new System.Windows.Forms.DataGridView();
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.buttonSaveSectorEdit = new System.Windows.Forms.Button();
+            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
-            this.comboBox4 = new System.Windows.Forms.ComboBox();
+            this.flowLayoutPanel3 = new System.Windows.Forms.FlowLayoutPanel();
-            this.comboBox3 = new System.Windows.Forms.ComboBox();
-            this.comboBox2 = new System.Windows.Forms.ComboBox();
-            this.comboBox1 = new System.Windows.Forms.ComboBox();
-            this.label9 = new System.Windows.Forms.Label();
-            this.label8 = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
+            this.comboBox1 = new System.Windows.Forms.ComboBox();
+            this.label7 = new System.Windows.Forms.Label();
+            this.comboBox2 = new System.Windows.Forms.ComboBox();
+            this.label8 = new System.Windows.Forms.Label();
+            this.comboBox3 = new System.Windows.Forms.ComboBox();
+            this.label9 = new System.Windows.Forms.Label();
+            this.comboBox4 = new System.Windows.Forms.ComboBox();
+            this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
+            this.label4 = new System.Windows.Forms.Label();
+            this.keyAEdit = new System.Windows.Forms.TextBox();
             this.label5 = new System.Windows.Forms.Label();
             this.keyBEdit = new System.Windows.Forms.TextBox();
-            this.keyAEdit = new System.Windows.Forms.TextBox();
+            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
-            this.block2Edit = new System.Windows.Forms.TextBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.block1Edit = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.block0Edit = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
             this.labelCurSec = new System.Windows.Forms.Label();
+            this.buttonSaveSectorEdit = new System.Windows.Forms.Button();
+            this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel();
+            this.label1 = new System.Windows.Forms.Label();
+            this.block0Edit = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.block1Edit = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.block2Edit = new System.Windows.Forms.TextBox();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
-            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
-            this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel();
-            this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
-            this.flowLayoutPanel3 = new System.Windows.Forms.FlowLayoutPanel();
             this.s50BindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.menuStrip1.SuspendLayout();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             this.groupBox2.SuspendLayout();
-            this.groupBox3.SuspendLayout();
-            this.tableLayoutPanel1.SuspendLayout();
             this.tableLayoutPanel2.SuspendLayout();
+            this.flowLayoutPanel3.SuspendLayout();
+            this.tableLayoutPanel3.SuspendLayout();
             this.flowLayoutPanel1.SuspendLayout();
             this.flowLayoutPanel2.SuspendLayout();
-            this.tableLayoutPanel3.SuspendLayout();
+            this.groupBox3.SuspendLayout();
-            this.flowLayoutPanel3.SuspendLayout();
+            this.tableLayoutPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.s50BindingSource)).BeginInit();
             this.SuspendLayout();
             // 
             // menuStrip1
             // 
+            resources.ApplyResources(this.menuStrip1, "menuStrip1");
             this.menuStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
             this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.文件ToolStripMenuItem,
             this.工具ToolStripMenuItem});
-            resources.ApplyResources(this.menuStrip1, "menuStrip1");
             this.menuStrip1.Name = "menuStrip1";
             // 
             // 文件ToolStripMenuItem
             // 
+            resources.ApplyResources(this.文件ToolStripMenuItem, "文件ToolStripMenuItem");
             this.文件ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.新建ToolStripMenuItem,
             this.打开ToolStripMenuItem,
@@ -115,45 +118,45 @@
             this.toolStripSeparator1,
             this.退出ToolStripMenuItem});
             this.文件ToolStripMenuItem.Name = "文件ToolStripMenuItem";
-            resources.ApplyResources(this.文件ToolStripMenuItem, "文件ToolStripMenuItem");
             // 
             // 新建ToolStripMenuItem
             // 
-            this.新建ToolStripMenuItem.Name = "新建ToolStripMenuItem";
             resources.ApplyResources(this.新建ToolStripMenuItem, "新建ToolStripMenuItem");
+            this.新建ToolStripMenuItem.Name = "新建ToolStripMenuItem";
             this.新建ToolStripMenuItem.Click += new System.EventHandler(this.新建ToolStripMenuItem_Click);
             // 
             // 打开ToolStripMenuItem
             // 
-            this.打开ToolStripMenuItem.Name = "打开ToolStripMenuItem";
             resources.ApplyResources(this.打开ToolStripMenuItem, "打开ToolStripMenuItem");
+            this.打开ToolStripMenuItem.Name = "打开ToolStripMenuItem";
             this.打开ToolStripMenuItem.Click += new System.EventHandler(this.打开ToolStripMenuItem_Click);
             // 
             // 保存ToolStripMenuItem
             // 
-            this.保存ToolStripMenuItem.Name = "保存ToolStripMenuItem";
             resources.ApplyResources(this.保存ToolStripMenuItem, "保存ToolStripMenuItem");
+            this.保存ToolStripMenuItem.Name = "保存ToolStripMenuItem";
             this.保存ToolStripMenuItem.Click += new System.EventHandler(this.保存ToolStripMenuItem_Click);
             // 
             // 另存为ToolStripMenuItem
             // 
-            this.另存为ToolStripMenuItem.Name = "另存为ToolStripMenuItem";
             resources.ApplyResources(this.另存为ToolStripMenuItem, "另存为ToolStripMenuItem");
+            this.另存为ToolStripMenuItem.Name = "另存为ToolStripMenuItem";
             this.另存为ToolStripMenuItem.Click += new System.EventHandler(this.另存为ToolStripMenuItem_Click);
             // 
             // toolStripSeparator1
             // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
             resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
             // 
             // 退出ToolStripMenuItem
             // 
-            this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
             resources.ApplyResources(this.退出ToolStripMenuItem, "退出ToolStripMenuItem");
+            this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
             this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click);
             // 
             // 工具ToolStripMenuItem
             // 
+            resources.ApplyResources(this.工具ToolStripMenuItem, "工具ToolStripMenuItem");
             this.工具ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.修改UIDToolStripMenuItem,
             this.toolStripSeparator2,
@@ -166,87 +169,107 @@
             this.toolStripSeparator4,
             this.列出全卡密钥ToolStripMenuItem});
             this.工具ToolStripMenuItem.Name = "工具ToolStripMenuItem";
-            resources.ApplyResources(this.工具ToolStripMenuItem, "工具ToolStripMenuItem");
             // 
             // 修改UIDToolStripMenuItem
             // 
-            this.修改UIDToolStripMenuItem.Name = "修改UIDToolStripMenuItem";
             resources.ApplyResources(this.修改UIDToolStripMenuItem, "修改UIDToolStripMenuItem");
+            this.修改UIDToolStripMenuItem.Name = "修改UIDToolStripMenuItem";
             this.修改UIDToolStripMenuItem.Click += new System.EventHandler(this.修改UIDToolStripMenuItem_Click);
             // 
             // toolStripSeparator2
             // 
-            this.toolStripSeparator2.Name = "toolStripSeparator2";
             resources.ApplyResources(this.toolStripSeparator2, "toolStripSeparator2");
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
             // 
             // 检查全卡ToolStripMenuItem
             // 
-            this.检查全卡ToolStripMenuItem.Name = "检查全卡ToolStripMenuItem";
             resources.ApplyResources(this.检查全卡ToolStripMenuItem, "检查全卡ToolStripMenuItem");
+            this.检查全卡ToolStripMenuItem.Name = "检查全卡ToolStripMenuItem";
             this.检查全卡ToolStripMenuItem.Click += new System.EventHandler(this.检查全卡ToolStripMenuItem_Click);
             // 
             // 检查并纠正全卡ToolStripMenuItem
             // 
-            this.检查并纠正全卡ToolStripMenuItem.Name = "检查并纠正全卡ToolStripMenuItem";
             resources.ApplyResources(this.检查并纠正全卡ToolStripMenuItem, "检查并纠正全卡ToolStripMenuItem");
+            this.检查并纠正全卡ToolStripMenuItem.Name = "检查并纠正全卡ToolStripMenuItem";
             this.检查并纠正全卡ToolStripMenuItem.Click += new System.EventHandler(this.检查并纠正全卡ToolStripMenuItem_Click);
             // 
             // toolStripSeparator3
             // 
-            this.toolStripSeparator3.Name = "toolStripSeparator3";
             resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3");
+            this.toolStripSeparator3.Name = "toolStripSeparator3";
             // 
             // 导入MCT格式ToolStripMenuItem
             // 
-            this.导入MCT格式ToolStripMenuItem.Name = "导入MCT格式ToolStripMenuItem";
             resources.ApplyResources(this.导入MCT格式ToolStripMenuItem, "导入MCT格式ToolStripMenuItem");
+            this.导入MCT格式ToolStripMenuItem.Name = "导入MCT格式ToolStripMenuItem";
             this.导入MCT格式ToolStripMenuItem.Click += new System.EventHandler(this.导入MCT格式ToolStripMenuItem_Click);
             // 
             // 导出为MCT格式ToolStripMenuItem
             // 
-            this.导出为MCT格式ToolStripMenuItem.Name = "导出为MCT格式ToolStripMenuItem";
             resources.ApplyResources(this.导出为MCT格式ToolStripMenuItem, "导出为MCT格式ToolStripMenuItem");
+            this.导出为MCT格式ToolStripMenuItem.Name = "导出为MCT格式ToolStripMenuItem";
             this.导出为MCT格式ToolStripMenuItem.Click += new System.EventHandler(this.导出为MCT格式ToolStripMenuItem_Click);
             // 
             // 导出密钥字典ToolStripMenuItem
             // 
-            this.导出密钥字典ToolStripMenuItem.Name = "导出密钥字典ToolStripMenuItem";
             resources.ApplyResources(this.导出密钥字典ToolStripMenuItem, "导出密钥字典ToolStripMenuItem");
+            this.导出密钥字典ToolStripMenuItem.Name = "导出密钥字典ToolStripMenuItem";
             this.导出密钥字典ToolStripMenuItem.Click += new System.EventHandler(this.导出密钥字典ToolStripMenuItem_Click);
             // 
             // toolStripSeparator4
             // 
-            this.toolStripSeparator4.Name = "toolStripSeparator4";
             resources.ApplyResources(this.toolStripSeparator4, "toolStripSeparator4");
+            this.toolStripSeparator4.Name = "toolStripSeparator4";
             // 
             // 列出全卡密钥ToolStripMenuItem
             // 
-            this.列出全卡密钥ToolStripMenuItem.Name = "列出全卡密钥ToolStripMenuItem";
             resources.ApplyResources(this.列出全卡密钥ToolStripMenuItem, "列出全卡密钥ToolStripMenuItem");
+            this.列出全卡密钥ToolStripMenuItem.Name = "列出全卡密钥ToolStripMenuItem";
             this.列出全卡密钥ToolStripMenuItem.Click += new System.EventHandler(this.列出全卡密钥ToolStripMenuItem_Click);
             // 
             // groupBox1
             // 
-            this.groupBox1.Controls.Add(this.dataGridView1);
             resources.ApplyResources(this.groupBox1, "groupBox1");
+            this.groupBox1.BackColor = System.Drawing.Color.DodgerBlue;
+            this.groupBox1.Controls.Add(this.dataGridView1);
+            this.groupBox1.ForeColor = System.Drawing.Color.White;
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.TabStop = false;
             // 
             // dataGridView1
             // 
+            resources.ApplyResources(this.dataGridView1, "dataGridView1");
             this.dataGridView1.AllowUserToAddRows = false;
             this.dataGridView1.AllowUserToDeleteRows = false;
             this.dataGridView1.AllowUserToResizeColumns = false;
             this.dataGridView1.AllowUserToResizeRows = false;
+            this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
+            this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCellsExceptHeaders;
+            this.dataGridView1.BackgroundColor = System.Drawing.Color.AliceBlue;
             this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.AliceBlue;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("Yu Gothic UI Semibold", 9.75F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Column1});
-            resources.ApplyResources(this.dataGridView1, "dataGridView1");
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("Yu Gothic UI Semibold", 9.75F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2;
             this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
+            this.dataGridView1.GridColor = System.Drawing.Color.SkyBlue;
             this.dataGridView1.MultiSelect = false;
             this.dataGridView1.Name = "dataGridView1";
-            this.dataGridView1.ReadOnly = true;
             this.dataGridView1.RowTemplate.Height = 27;
             this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick);
@@ -262,226 +285,23 @@
             // groupBox2
             // 
             resources.ApplyResources(this.groupBox2, "groupBox2");
+            this.groupBox2.BackColor = System.Drawing.Color.DodgerBlue;
             this.groupBox2.Controls.Add(this.tableLayoutPanel2);
+            this.groupBox2.ForeColor = System.Drawing.Color.White;
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.TabStop = false;
             // 
-            // buttonSaveSectorEdit
-            // 
-            resources.ApplyResources(this.buttonSaveSectorEdit, "buttonSaveSectorEdit");
-            this.buttonSaveSectorEdit.Name = "buttonSaveSectorEdit";
-            this.buttonSaveSectorEdit.UseVisualStyleBackColor = true;
-            this.buttonSaveSectorEdit.Click += new System.EventHandler(this.buttonSaveSectorEdit_Click);
-            // 
-            // comboBox4
-            // 
-            this.comboBox4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBox4.DropDownWidth = 400;
-            this.comboBox4.FormattingEnabled = true;
-            this.comboBox4.Items.AddRange(new object[] {
-            resources.GetString("comboBox4.Items"),
-            resources.GetString("comboBox4.Items1"),
-            resources.GetString("comboBox4.Items2"),
-            resources.GetString("comboBox4.Items3"),
-            resources.GetString("comboBox4.Items4"),
-            resources.GetString("comboBox4.Items5"),
-            resources.GetString("comboBox4.Items6"),
-            resources.GetString("comboBox4.Items7")});
-            resources.ApplyResources(this.comboBox4, "comboBox4");
-            this.comboBox4.Name = "comboBox4";
-            this.comboBox4.Validating += new System.ComponentModel.CancelEventHandler(this.comboBox1_Validating);
-            // 
-            // comboBox3
-            // 
-            this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBox3.FormattingEnabled = true;
-            this.comboBox3.Items.AddRange(new object[] {
-            resources.GetString("comboBox3.Items"),
-            resources.GetString("comboBox3.Items1"),
-            resources.GetString("comboBox3.Items2"),
-            resources.GetString("comboBox3.Items3"),
-            resources.GetString("comboBox3.Items4"),
-            resources.GetString("comboBox3.Items5"),
-            resources.GetString("comboBox3.Items6"),
-            resources.GetString("comboBox3.Items7")});
-            resources.ApplyResources(this.comboBox3, "comboBox3");
-            this.comboBox3.Name = "comboBox3";
-            this.comboBox3.Validating += new System.ComponentModel.CancelEventHandler(this.comboBox1_Validating);
-            // 
-            // comboBox2
-            // 
-            this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBox2.FormattingEnabled = true;
-            this.comboBox2.Items.AddRange(new object[] {
-            resources.GetString("comboBox2.Items"),
-            resources.GetString("comboBox2.Items1"),
-            resources.GetString("comboBox2.Items2"),
-            resources.GetString("comboBox2.Items3"),
-            resources.GetString("comboBox2.Items4"),
-            resources.GetString("comboBox2.Items5"),
-            resources.GetString("comboBox2.Items6"),
-            resources.GetString("comboBox2.Items7")});
-            resources.ApplyResources(this.comboBox2, "comboBox2");
-            this.comboBox2.Name = "comboBox2";
-            this.comboBox2.Validating += new System.ComponentModel.CancelEventHandler(this.comboBox1_Validating);
-            // 
-            // comboBox1
-            // 
-            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Items.AddRange(new object[] {
-            resources.GetString("comboBox1.Items"),
-            resources.GetString("comboBox1.Items1"),
-            resources.GetString("comboBox1.Items2"),
-            resources.GetString("comboBox1.Items3"),
-            resources.GetString("comboBox1.Items4"),
-            resources.GetString("comboBox1.Items5"),
-            resources.GetString("comboBox1.Items6"),
-            resources.GetString("comboBox1.Items7")});
-            resources.ApplyResources(this.comboBox1, "comboBox1");
-            this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Validating += new System.ComponentModel.CancelEventHandler(this.comboBox1_Validating);
-            // 
-            // label9
-            // 
-            resources.ApplyResources(this.label9, "label9");
-            this.label9.Name = "label9";
-            // 
-            // label8
-            // 
-            resources.ApplyResources(this.label8, "label8");
-            this.label8.Name = "label8";
-            // 
-            // label7
-            // 
-            resources.ApplyResources(this.label7, "label7");
-            this.label7.Name = "label7";
-            // 
-            // label6
-            // 
-            resources.ApplyResources(this.label6, "label6");
-            this.label6.Name = "label6";
-            // 
-            // label5
-            // 
-            resources.ApplyResources(this.label5, "label5");
-            this.label5.Name = "label5";
-            // 
-            // keyBEdit
-            // 
-            resources.ApplyResources(this.keyBEdit, "keyBEdit");
-            this.keyBEdit.Name = "keyBEdit";
-            this.keyBEdit.Validating += new System.ComponentModel.CancelEventHandler(this.keyAEdit_Validating);
-            // 
-            // keyAEdit
-            // 
-            resources.ApplyResources(this.keyAEdit, "keyAEdit");
-            this.keyAEdit.Name = "keyAEdit";
-            this.keyAEdit.TextChanged += new System.EventHandler(this.keyAEdit_TextChanged);
-            this.keyAEdit.Validating += new System.ComponentModel.CancelEventHandler(this.keyAEdit_Validating);
-            // 
-            // block2Edit
-            // 
-            resources.ApplyResources(this.block2Edit, "block2Edit");
-            this.block2Edit.Name = "block2Edit";
-            this.block2Edit.Validating += new System.ComponentModel.CancelEventHandler(this.block0Edit_Validating);
-            // 
-            // label4
-            // 
-            resources.ApplyResources(this.label4, "label4");
-            this.label4.Name = "label4";
-            // 
-            // label3
-            // 
-            resources.ApplyResources(this.label3, "label3");
-            this.label3.Name = "label3";
-            // 
-            // block1Edit
-            // 
-            resources.ApplyResources(this.block1Edit, "block1Edit");
-            this.block1Edit.Name = "block1Edit";
-            this.block1Edit.Validating += new System.ComponentModel.CancelEventHandler(this.block0Edit_Validating);
-            // 
-            // label2
-            // 
-            resources.ApplyResources(this.label2, "label2");
-            this.label2.Name = "label2";
-            // 
-            // block0Edit
-            // 
-            resources.ApplyResources(this.block0Edit, "block0Edit");
-            this.block0Edit.Name = "block0Edit";
-            this.block0Edit.Validating += new System.ComponentModel.CancelEventHandler(this.block0Edit_Validating);
-            // 
-            // label1
-            // 
-            resources.ApplyResources(this.label1, "label1");
-            this.label1.Name = "label1";
-            // 
-            // labelCurSec
-            // 
-            resources.ApplyResources(this.labelCurSec, "labelCurSec");
-            this.labelCurSec.Name = "labelCurSec";
-            // 
-            // groupBox3
-            // 
-            resources.ApplyResources(this.groupBox3, "groupBox3");
-            this.groupBox3.Controls.Add(this.richTextBox1);
-            this.groupBox3.Name = "groupBox3";
-            this.groupBox3.TabStop = false;
-            // 
-            // richTextBox1
-            // 
-            this.richTextBox1.BackColor = System.Drawing.Color.Black;
-            this.richTextBox1.ForeColor = System.Drawing.Color.Cyan;
-            resources.ApplyResources(this.richTextBox1, "richTextBox1");
-            this.richTextBox1.Name = "richTextBox1";
-            this.richTextBox1.ReadOnly = true;
-            // 
-            // tableLayoutPanel1
-            // 
-            resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
-            this.tableLayoutPanel1.Controls.Add(this.groupBox1, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.groupBox3, 2, 0);
-            this.tableLayoutPanel1.Controls.Add(this.groupBox2, 1, 0);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            // 
             // tableLayoutPanel2
             // 
             resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2");
+            this.tableLayoutPanel2.BackColor = System.Drawing.Color.White;
             this.tableLayoutPanel2.Controls.Add(this.flowLayoutPanel3, 0, 3);
             this.tableLayoutPanel2.Controls.Add(this.tableLayoutPanel3, 0, 2);
             this.tableLayoutPanel2.Controls.Add(this.flowLayoutPanel1, 0, 0);
             this.tableLayoutPanel2.Controls.Add(this.flowLayoutPanel2, 0, 1);
+            this.tableLayoutPanel2.ForeColor = System.Drawing.Color.Black;
             this.tableLayoutPanel2.Name = "tableLayoutPanel2";
             // 
-            // flowLayoutPanel1
-            // 
-            resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1");
-            this.flowLayoutPanel1.Controls.Add(this.labelCurSec);
-            this.flowLayoutPanel1.Controls.Add(this.buttonSaveSectorEdit);
-            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
-            // 
-            // flowLayoutPanel2
-            // 
-            resources.ApplyResources(this.flowLayoutPanel2, "flowLayoutPanel2");
-            this.flowLayoutPanel2.Controls.Add(this.label1);
-            this.flowLayoutPanel2.Controls.Add(this.block0Edit);
-            this.flowLayoutPanel2.Controls.Add(this.label2);
-            this.flowLayoutPanel2.Controls.Add(this.block1Edit);
-            this.flowLayoutPanel2.Controls.Add(this.label3);
-            this.flowLayoutPanel2.Controls.Add(this.block2Edit);
-            this.flowLayoutPanel2.Name = "flowLayoutPanel2";
-            // 
-            // tableLayoutPanel3
-            // 
-            resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3");
-            this.tableLayoutPanel3.Controls.Add(this.label4, 0, 0);
-            this.tableLayoutPanel3.Controls.Add(this.keyAEdit, 0, 1);
-            this.tableLayoutPanel3.Controls.Add(this.label5, 1, 0);
-            this.tableLayoutPanel3.Controls.Add(this.keyBEdit, 1, 1);
-            this.tableLayoutPanel3.Name = "tableLayoutPanel3";
-            // 
             // flowLayoutPanel3
             // 
             resources.ApplyResources(this.flowLayoutPanel3, "flowLayoutPanel3");
@@ -495,6 +315,228 @@
             this.flowLayoutPanel3.Controls.Add(this.comboBox4);
             this.flowLayoutPanel3.Name = "flowLayoutPanel3";
             // 
+            // label6
+            // 
+            resources.ApplyResources(this.label6, "label6");
+            this.label6.Name = "label6";
+            // 
+            // comboBox1
+            // 
+            resources.ApplyResources(this.comboBox1, "comboBox1");
+            this.comboBox1.BackColor = System.Drawing.Color.AliceBlue;
+            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox1.FormattingEnabled = true;
+            this.comboBox1.Items.AddRange(new object[] {
+            resources.GetString("comboBox1.Items"),
+            resources.GetString("comboBox1.Items1"),
+            resources.GetString("comboBox1.Items2"),
+            resources.GetString("comboBox1.Items3"),
+            resources.GetString("comboBox1.Items4"),
+            resources.GetString("comboBox1.Items5"),
+            resources.GetString("comboBox1.Items6"),
+            resources.GetString("comboBox1.Items7")});
+            this.comboBox1.Name = "comboBox1";
+            this.comboBox1.Validating += new System.ComponentModel.CancelEventHandler(this.comboBox1_Validating);
+            // 
+            // label7
+            // 
+            resources.ApplyResources(this.label7, "label7");
+            this.label7.Name = "label7";
+            // 
+            // comboBox2
+            // 
+            resources.ApplyResources(this.comboBox2, "comboBox2");
+            this.comboBox2.BackColor = System.Drawing.Color.AliceBlue;
+            this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox2.FormattingEnabled = true;
+            this.comboBox2.Items.AddRange(new object[] {
+            resources.GetString("comboBox2.Items"),
+            resources.GetString("comboBox2.Items1"),
+            resources.GetString("comboBox2.Items2"),
+            resources.GetString("comboBox2.Items3"),
+            resources.GetString("comboBox2.Items4"),
+            resources.GetString("comboBox2.Items5"),
+            resources.GetString("comboBox2.Items6"),
+            resources.GetString("comboBox2.Items7")});
+            this.comboBox2.Name = "comboBox2";
+            this.comboBox2.Validating += new System.ComponentModel.CancelEventHandler(this.comboBox1_Validating);
+            // 
+            // label8
+            // 
+            resources.ApplyResources(this.label8, "label8");
+            this.label8.Name = "label8";
+            // 
+            // comboBox3
+            // 
+            resources.ApplyResources(this.comboBox3, "comboBox3");
+            this.comboBox3.BackColor = System.Drawing.Color.AliceBlue;
+            this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox3.FormattingEnabled = true;
+            this.comboBox3.Items.AddRange(new object[] {
+            resources.GetString("comboBox3.Items"),
+            resources.GetString("comboBox3.Items1"),
+            resources.GetString("comboBox3.Items2"),
+            resources.GetString("comboBox3.Items3"),
+            resources.GetString("comboBox3.Items4"),
+            resources.GetString("comboBox3.Items5"),
+            resources.GetString("comboBox3.Items6"),
+            resources.GetString("comboBox3.Items7")});
+            this.comboBox3.Name = "comboBox3";
+            this.comboBox3.Validating += new System.ComponentModel.CancelEventHandler(this.comboBox1_Validating);
+            // 
+            // label9
+            // 
+            resources.ApplyResources(this.label9, "label9");
+            this.label9.Name = "label9";
+            // 
+            // comboBox4
+            // 
+            resources.ApplyResources(this.comboBox4, "comboBox4");
+            this.comboBox4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox4.DropDownWidth = 400;
+            this.comboBox4.FormattingEnabled = true;
+            this.comboBox4.Items.AddRange(new object[] {
+            resources.GetString("comboBox4.Items"),
+            resources.GetString("comboBox4.Items1"),
+            resources.GetString("comboBox4.Items2"),
+            resources.GetString("comboBox4.Items3"),
+            resources.GetString("comboBox4.Items4"),
+            resources.GetString("comboBox4.Items5"),
+            resources.GetString("comboBox4.Items6"),
+            resources.GetString("comboBox4.Items7")});
+            this.comboBox4.Name = "comboBox4";
+            this.comboBox4.Validating += new System.ComponentModel.CancelEventHandler(this.comboBox1_Validating);
+            // 
+            // tableLayoutPanel3
+            // 
+            resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3");
+            this.tableLayoutPanel3.Controls.Add(this.label4, 0, 0);
+            this.tableLayoutPanel3.Controls.Add(this.keyAEdit, 0, 1);
+            this.tableLayoutPanel3.Controls.Add(this.label5, 1, 0);
+            this.tableLayoutPanel3.Controls.Add(this.keyBEdit, 1, 1);
+            this.tableLayoutPanel3.Name = "tableLayoutPanel3";
+            // 
+            // label4
+            // 
+            resources.ApplyResources(this.label4, "label4");
+            this.label4.Name = "label4";
+            // 
+            // keyAEdit
+            // 
+            resources.ApplyResources(this.keyAEdit, "keyAEdit");
+            this.keyAEdit.BackColor = System.Drawing.Color.White;
+            this.keyAEdit.Name = "keyAEdit";
+            this.keyAEdit.TextChanged += new System.EventHandler(this.keyAEdit_TextChanged);
+            this.keyAEdit.Validating += new System.ComponentModel.CancelEventHandler(this.keyAEdit_Validating);
+            // 
+            // label5
+            // 
+            resources.ApplyResources(this.label5, "label5");
+            this.label5.Name = "label5";
+            // 
+            // keyBEdit
+            // 
+            resources.ApplyResources(this.keyBEdit, "keyBEdit");
+            this.keyBEdit.BackColor = System.Drawing.Color.White;
+            this.keyBEdit.Name = "keyBEdit";
+            this.keyBEdit.Validating += new System.ComponentModel.CancelEventHandler(this.keyAEdit_Validating);
+            // 
+            // flowLayoutPanel1
+            // 
+            resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1");
+            this.flowLayoutPanel1.Controls.Add(this.labelCurSec);
+            this.flowLayoutPanel1.Controls.Add(this.buttonSaveSectorEdit);
+            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+            // 
+            // labelCurSec
+            // 
+            resources.ApplyResources(this.labelCurSec, "labelCurSec");
+            this.labelCurSec.Name = "labelCurSec";
+            // 
+            // buttonSaveSectorEdit
+            // 
+            resources.ApplyResources(this.buttonSaveSectorEdit, "buttonSaveSectorEdit");
+            this.buttonSaveSectorEdit.BackColor = System.Drawing.Color.DodgerBlue;
+            this.buttonSaveSectorEdit.FlatAppearance.BorderColor = System.Drawing.Color.DodgerBlue;
+            this.buttonSaveSectorEdit.ForeColor = System.Drawing.Color.White;
+            this.buttonSaveSectorEdit.Name = "buttonSaveSectorEdit";
+            this.buttonSaveSectorEdit.UseVisualStyleBackColor = false;
+            this.buttonSaveSectorEdit.Click += new System.EventHandler(this.buttonSaveSectorEdit_Click);
+            // 
+            // flowLayoutPanel2
+            // 
+            resources.ApplyResources(this.flowLayoutPanel2, "flowLayoutPanel2");
+            this.flowLayoutPanel2.Controls.Add(this.label1);
+            this.flowLayoutPanel2.Controls.Add(this.block0Edit);
+            this.flowLayoutPanel2.Controls.Add(this.label2);
+            this.flowLayoutPanel2.Controls.Add(this.block1Edit);
+            this.flowLayoutPanel2.Controls.Add(this.label3);
+            this.flowLayoutPanel2.Controls.Add(this.block2Edit);
+            this.flowLayoutPanel2.Name = "flowLayoutPanel2";
+            // 
+            // label1
+            // 
+            resources.ApplyResources(this.label1, "label1");
+            this.label1.Name = "label1";
+            // 
+            // block0Edit
+            // 
+            resources.ApplyResources(this.block0Edit, "block0Edit");
+            this.block0Edit.BackColor = System.Drawing.Color.White;
+            this.block0Edit.Name = "block0Edit";
+            this.block0Edit.Validating += new System.ComponentModel.CancelEventHandler(this.block0Edit_Validating);
+            // 
+            // label2
+            // 
+            resources.ApplyResources(this.label2, "label2");
+            this.label2.Name = "label2";
+            // 
+            // block1Edit
+            // 
+            resources.ApplyResources(this.block1Edit, "block1Edit");
+            this.block1Edit.BackColor = System.Drawing.Color.White;
+            this.block1Edit.Name = "block1Edit";
+            this.block1Edit.Validating += new System.ComponentModel.CancelEventHandler(this.block0Edit_Validating);
+            // 
+            // label3
+            // 
+            resources.ApplyResources(this.label3, "label3");
+            this.label3.Name = "label3";
+            // 
+            // block2Edit
+            // 
+            resources.ApplyResources(this.block2Edit, "block2Edit");
+            this.block2Edit.BackColor = System.Drawing.Color.White;
+            this.block2Edit.Name = "block2Edit";
+            this.block2Edit.Validating += new System.ComponentModel.CancelEventHandler(this.block0Edit_Validating);
+            // 
+            // groupBox3
+            // 
+            resources.ApplyResources(this.groupBox3, "groupBox3");
+            this.groupBox3.BackColor = System.Drawing.Color.DodgerBlue;
+            this.groupBox3.Controls.Add(this.richTextBox1);
+            this.groupBox3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.groupBox3.ForeColor = System.Drawing.Color.White;
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.TabStop = false;
+            // 
+            // richTextBox1
+            // 
+            resources.ApplyResources(this.richTextBox1, "richTextBox1");
+            this.richTextBox1.BackColor = System.Drawing.Color.AliceBlue;
+            this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.richTextBox1.ForeColor = System.Drawing.Color.Black;
+            this.richTextBox1.Name = "richTextBox1";
+            this.richTextBox1.ReadOnly = true;
+            // 
+            // tableLayoutPanel1
+            // 
+            resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
+            this.tableLayoutPanel1.Controls.Add(this.groupBox1, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.groupBox3, 2, 0);
+            this.tableLayoutPanel1.Controls.Add(this.groupBox2, 1, 0);
+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+            // 
             // s50BindingSource
             // 
             this.s50BindingSource.DataSource = typeof(MifareOneTool.S50);
@@ -504,6 +546,7 @@
             this.AcceptButton = this.buttonSaveSectorEdit;
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.White;
             this.Controls.Add(this.tableLayoutPanel1);
             this.Controls.Add(this.menuStrip1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
@@ -517,19 +560,19 @@
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
             this.groupBox2.ResumeLayout(false);
             this.groupBox2.PerformLayout();
-            this.groupBox3.ResumeLayout(false);
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.tableLayoutPanel1.PerformLayout();
             this.tableLayoutPanel2.ResumeLayout(false);
             this.tableLayoutPanel2.PerformLayout();
+            this.flowLayoutPanel3.ResumeLayout(false);
+            this.flowLayoutPanel3.PerformLayout();
+            this.tableLayoutPanel3.ResumeLayout(false);
+            this.tableLayoutPanel3.PerformLayout();
             this.flowLayoutPanel1.ResumeLayout(false);
             this.flowLayoutPanel1.PerformLayout();
             this.flowLayoutPanel2.ResumeLayout(false);
             this.flowLayoutPanel2.PerformLayout();
-            this.tableLayoutPanel3.ResumeLayout(false);
+            this.groupBox3.ResumeLayout(false);
-            this.tableLayoutPanel3.PerformLayout();
+            this.tableLayoutPanel1.ResumeLayout(false);
-            this.flowLayoutPanel3.ResumeLayout(false);
+            this.tableLayoutPanel1.PerformLayout();
-            this.flowLayoutPanel3.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.s50BindingSource)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();

MifareOneTool/FormHTool.cs

@@ -185,7 +185,7 @@ namespace MifareOneTool
             {
                 MessageBox.Show(ex.Message, Resources.写入出错, MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
-            logAppend(Resources.已保存到 + filename + "。");
+            logAppend(Resources.已保存到 + filename + Resources.res);
         }
 
         private void block0Edit_Validating(object sender, CancelEventArgs e)
@@ -288,7 +288,7 @@ namespace MifareOneTool
                 string msg = Resources.该文件存在以下错误;
                 for (int i = 0; i < 16; i++)
                 {
-                    msg += Resources.扇区 + i.ToString() + "：\n";
+                    msg += Resources.扇区 + i.ToString() + Resources.res4;
                     if ((res[i] & 0x01) == 0x01)
                     {
                         msg += Resources.该扇区UID校验值错误_请点击打开扇区0来自动更正;
@@ -356,7 +356,7 @@ namespace MifareOneTool
                 string msg = Resources.该文件存在以下错误;
                 for (int i = 0; i < 16; i++)
                 {
-                    msg += Resources.扇区 + i.ToString() + "：\n";
+                    msg += Resources.扇区 + i.ToString() + Resources.res4;
                     if ((res[i] & 0x01) == 0x01)
                     {
                         currentS50.Sectors[i].Block[0][4]
@@ -439,7 +439,7 @@ namespace MifareOneTool
                 return;
             }
             File.WriteAllLines(filename, this.currentS50.KeyListStr().ToArray());
-            logAppend(Resources.已导出密钥字典文件 + filename + "。");
+            logAppend(Resources.已导出密钥字典文件 + filename + Resources.res);
         }
 
         private void 导入MCT格式ToolStripMenuItem_Click(object sender, EventArgs e)

MifareOneTool/FormHTool.ru.resx

@@ -121,103 +121,135 @@
     <value>Изменить сектор (Enter)</value>
   </data>
   <data name="Column1.HeaderText" xml:space="preserve">
-    <value>Cектор</value>
+    <value>Cектор </value>
   </data>
   <data name="comboBox1.Items" xml:space="preserve">
     <value>KeyAB читать, писать, увеличивать и уменьшать</value>
+    <comment>Previous text: KeyAB读写及增减值</comment>
   </data>
   <data name="comboBox1.Items1" xml:space="preserve">
     <value>[только для чтения] KeyAB для чтения и амортизации / недоступен для записи и добавляет ценность</value>
+    <comment>Previous text: [只读]KeyAB读及减值/不可写及增值</comment>
   </data>
   <data name="comboBox1.Items2" xml:space="preserve">
     <value>[только для чтения] KeyAB для чтения / записи, а также для увеличения или уменьшения</value>
+    <comment>Previous text: [只读]KeyAB读/不可写及增减值</comment>
   </data>
   <data name="comboBox1.Items3" xml:space="preserve">
     <value>KeyB чтение / запись / не сложение и вычитание</value>
+    <comment>Previous text: KeyB读写/不可增减值</comment>
   </data>
   <data name="comboBox1.Items4" xml:space="preserve">
     <value>KeyAB чтение / KeyB запись / без увеличения или уменьшения</value>
+    <comment>Previous text: KeyAB读/KeyB写/不可增减值</comment>
   </data>
   <data name="comboBox1.Items5" xml:space="preserve">
     <value>[Только для чтения] KeyB для чтения / не для записи и увеличения или уменьшения</value>
+    <comment>Previous text: [只读]KeyB读/不可写及增减值</comment>
   </data>
   <data name="comboBox1.Items6" xml:space="preserve">
     <value>KeyAB чтение и ухудшение / KeyB написание и добавленная стоимость</value>
+    <comment>Previous text: KeyAB读及减值/KeyB写及增值</comment>
   </data>
   <data name="comboBox1.Items7" xml:space="preserve">
     <value>[только для чтения] заблокировать сектор</value>
+    <comment>Previous text: [只读]锁死该扇区</comment>
   </data>
   <data name="comboBox2.Items" xml:space="preserve">
     <value>KeyAB читать, писать, увеличивать и уменьшать</value>
+    <comment>Previous text: KeyAB读写及增减值</comment>
   </data>
   <data name="comboBox2.Items1" xml:space="preserve">
     <value>[только для чтения] KeyAB для чтения и амортизации / недоступен для записи и добавляет ценность</value>
+    <comment>Previous text: [只读]KeyAB读及减值/不可写及增值</comment>
   </data>
   <data name="comboBox2.Items2" xml:space="preserve">
     <value>[только для чтения] KeyAB для чтения / записи, а также для увеличения или уменьшения</value>
+    <comment>Previous text: [只读]KeyAB读/不可写及增减值</comment>
   </data>
   <data name="comboBox2.Items3" xml:space="preserve">
     <value>KeyB чтение / запись / не сложение и вычитание</value>
+    <comment>Previous text: KeyB读写/不可增减值</comment>
   </data>
   <data name="comboBox2.Items4" xml:space="preserve">
     <value>KeyAB чтение / KeyB запись / без увеличения или уменьшения</value>
+    <comment>Previous text: KeyAB读/KeyB写/不可增减值</comment>
   </data>
   <data name="comboBox2.Items5" xml:space="preserve">
     <value>[Только для чтения] KeyB для чтения / не для записи и увеличения или уменьшения</value>
+    <comment>Previous text: [只读]KeyB读/不可写及增减值</comment>
   </data>
   <data name="comboBox2.Items6" xml:space="preserve">
     <value>KeyAB чтение и ухудшение / KeyB написание и добавленная стоимость</value>
+    <comment>Previous text: KeyAB读及减值/KeyB写及增值</comment>
   </data>
   <data name="comboBox2.Items7" xml:space="preserve">
     <value>[только для чтения] заблокировать сектор</value>
+    <comment>Previous text: [只读]锁死该扇区</comment>
   </data>
   <data name="comboBox3.Items" xml:space="preserve">
     <value>KeyAB читать, писать, увеличивать и уменьшать</value>
+    <comment>Previous text: KeyAB读写及增减值</comment>
   </data>
   <data name="comboBox3.Items1" xml:space="preserve">
     <value>[только для чтения] KeyAB для чтения и амортизации / недоступен для записи и добавляет ценность</value>
+    <comment>Previous text: [只读]KeyAB读及减值/不可写及增值</comment>
   </data>
   <data name="comboBox3.Items2" xml:space="preserve">
     <value>[только для чтения] KeyAB для чтения / записи, а также для увеличения или уменьшения</value>
+    <comment>Previous text: [只读]KeyAB读/不可写及增减值</comment>
   </data>
   <data name="comboBox3.Items3" xml:space="preserve">
     <value>KeyB чтение / запись / не сложение и вычитание</value>
+    <comment>Previous text: KeyB读写/不可增减值</comment>
   </data>
   <data name="comboBox3.Items4" xml:space="preserve">
     <value>KeyAB чтение / KeyB запись / без увеличения или уменьшения</value>
+    <comment>Previous text: KeyAB读/KeyB写/不可增减值</comment>
   </data>
   <data name="comboBox3.Items5" xml:space="preserve">
     <value>[Только для чтения] KeyB для чтения / не для записи и увеличения или уменьшения</value>
+    <comment>Previous text: [只读]KeyB读/不可写及增减值</comment>
   </data>
   <data name="comboBox3.Items6" xml:space="preserve">
     <value>KeyAB чтение и ухудшение / KeyB написание и добавленная стоимость</value>
+    <comment>Previous text: KeyAB读及减值/KeyB写及增值</comment>
   </data>
   <data name="comboBox3.Items7" xml:space="preserve">
     <value>[только для чтения] заблокировать сектор</value>
+    <comment>Previous text: [只读]锁死该扇区</comment>
   </data>
   <data name="comboBox4.Items" xml:space="preserve">
     <value>[Необратимый] KeyA: запись / AC: только чтение / KeyB: чтение и запись</value>
+    <comment>Previous text: [不可逆]KeyA:A写/AC:A只读/KeyB:A读写</comment>
   </data>
   <data name="comboBox4.Items1" xml:space="preserve">
     <value>KeyA: запись / AC: чтение / запись / KeyB: чтение и запись</value>
+    <comment>Previous text: KeyA:A写/AC:A读写/KeyB:A读写</comment>
   </data>
   <data name="comboBox4.Items2" xml:space="preserve">
     <value>[Необратимый] KeyA: невозможно чтение / запись / AC: только для чтения / KeyB: чтение</value>
+    <comment>Previous text: [不可逆]KeyA:不能读写/AC:A只读/KeyB:A读</comment>
   </data>
   <data name="comboBox4.Items3" xml:space="preserve">
     <value>KeyA: B запись / AC: A только для чтения B чтение / запись / KeyB: B запись</value>
+    <comment>Previous text: KeyA:B写/AC:A只读B读写/KeyB:B写</comment>
   </data>
   <data name="comboBox4.Items4" xml:space="preserve">
     <value>[необратимый] KeyA: запись B / AC: только чтение AB / KeyB: запись B</value>
+    <comment>Previous text: [不可逆]KeyA:B写/AC:AB只读/KeyB:B写</comment>
   </data>
   <data name="comboBox4.Items5" xml:space="preserve">
     <value>KeyA: невозможно чтение / запись / AC: A только для чтения B чтение / запись / KeyB: невозможно чтение или запись</value>
+    <comment>Previous text: KeyA:不能读写/AC:A只读B读写/KeyB:不能读写</comment>
   </data>
   <data name="comboBox4.Items6" xml:space="preserve">
     <value>[Необратимый] KeyA: невозможно чтение / запись / AC: AB только для чтения / KeyB: невозможно чтение или запись</value>
+    <comment>Previous text: [不可逆]KeyA:不能读写/AC:AB只读/KeyB:不能读写</comment>
   </data>
   <data name="comboBox4.Items7" xml:space="preserve">
     <value>[Необратимый] KeyA: невозможно чтение / запись / AC: AB только для чтения / KeyB: невозможно чтение или запись (повторяется?)</value>
+    <comment>Previous text: [不可逆]KeyA:不能读写/AC:AB只读/KeyB:不能读写(重复了?)</comment>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Редактор дампа (бета)</value>
@@ -263,14 +295,19 @@
   </data>
   <data name="richTextBox1.Lines[0]" xml:space="preserve">
     <value>Добро пожаловать в интегрированный редактор M1T S50HTool!</value>
+    <comment>Previous text: 欢迎使用M1T的集成编辑器S50HTool！</comment>
   </data>
   <data name="richTextBox1.Lines[1]" xml:space="preserve">
     <value>Откройте файл, пожалуйста, нажмите на файл в верхнем левом углу - открыть или Ctrl + O</value>
+    <comment>Previous text: 打开文件请点左上角文件-打开或Ctrl+O</comment>
   </data>
   <data name="richTextBox1.Text" xml:space="preserve">
     <value>Добро пожаловать в интегрированный редактор дампа!
 Чтобы открыть файл, пожалуйста, нажмите на Файл в верхнем левом углу - Открыть или Ctrl + O
 Вы можете обновить данные вашей карты.</value>
+    <comment>Previous text: 欢迎使用M1T的集成编辑器S50HTool！
+打开文件请点左上角文件-打开或Ctrl+O
+</comment>
   </data>
   <data name="保存ToolStripMenuItem.Text" xml:space="preserve">
     <value>Сохранить</value>
@@ -314,4 +351,352 @@
   <data name="退出ToolStripMenuItem.Text" xml:space="preserve">
     <value>Выход</value>
   </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="新建ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>226, 22</value>
+  </data>
+  <data name="打开ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>226, 22</value>
+  </data>
+  <data name="保存ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>226, 22</value>
+  </data>
+  <data name="另存为ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>226, 22</value>
+  </data>
+  <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>223, 6</value>
+  </data>
+  <data name="退出ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>226, 22</value>
+  </data>
+  <data name="文件ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>48, 20</value>
+  </data>
+  <data name="修改UIDToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>336, 22</value>
+  </data>
+  <data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>333, 6</value>
+  </data>
+  <data name="检查全卡ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>336, 22</value>
+  </data>
+  <data name="检查并纠正全卡ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>336, 22</value>
+  </data>
+  <data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>333, 6</value>
+  </data>
+  <data name="导入MCT格式ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>336, 22</value>
+  </data>
+  <data name="导出为MCT格式ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>336, 22</value>
+  </data>
+  <data name="导出密钥字典ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>336, 22</value>
+  </data>
+  <data name="toolStripSeparator4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>333, 6</value>
+  </data>
+  <data name="列出全卡密钥ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>336, 22</value>
+  </data>
+  <data name="工具ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 20</value>
+  </data>
+  <data name="menuStrip1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>670, 24</value>
+  </data>
+  <data name="dataGridView1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 19</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="dataGridView1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="dataGridView1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>186, 560</value>
+  </data>
+  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 1</value>
+  </data>
+  <data name="groupBox1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="groupBox1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>188, 580</value>
+  </data>
+  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 0</value>
+  </data>
+  <data name="label6.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 0, 1, 0</value>
+  </data>
+  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
+    <value>147, 15</value>
+  </data>
+  <data name="comboBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 16</value>
+  </data>
+  <data name="comboBox1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="comboBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>260, 23</value>
+  </data>
+  <data name="label7.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 40</value>
+  </data>
+  <data name="label7.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 0, 1, 0</value>
+  </data>
+  <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>145, 15</value>
+  </data>
+  <data name="comboBox2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 56</value>
+  </data>
+  <data name="comboBox2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="comboBox2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>260, 23</value>
+  </data>
+  <data name="label8.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 80</value>
+  </data>
+  <data name="label8.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 0, 1, 0</value>
+  </data>
+  <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
+    <value>147, 15</value>
+  </data>
+  <data name="comboBox3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 96</value>
+  </data>
+  <data name="comboBox3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="comboBox3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>260, 23</value>
+  </data>
+  <data name="label9.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 120</value>
+  </data>
+  <data name="label9.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 0, 1, 0</value>
+  </data>
+  <data name="label9.Size" type="System.Drawing.Size, System.Drawing">
+    <value>154, 15</value>
+  </data>
+  <data name="comboBox4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 136</value>
+  </data>
+  <data name="comboBox4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="comboBox4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>260, 23</value>
+  </data>
+  <data name="flowLayoutPanel3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 211</value>
+  </data>
+  <data name="flowLayoutPanel3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="flowLayoutPanel3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>274, 348</value>
+  </data>
+  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 0</value>
+  </data>
+  <data name="label4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 0, 1, 0</value>
+  </data>
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>49, 15</value>
+  </data>
+  <data name="keyAEdit.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 16</value>
+  </data>
+  <data name="keyAEdit.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="keyAEdit.Size" type="System.Drawing.Size, System.Drawing">
+    <value>135, 23</value>
+  </data>
+  <data name="label5.Location" type="System.Drawing.Point, System.Drawing">
+    <value>138, 0</value>
+  </data>
+  <data name="label5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 0, 1, 0</value>
+  </data>
+  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>48, 15</value>
+  </data>
+  <data name="keyBEdit.Location" type="System.Drawing.Point, System.Drawing">
+    <value>138, 16</value>
+  </data>
+  <data name="keyBEdit.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="keyBEdit.Size" type="System.Drawing.Size, System.Drawing">
+    <value>135, 23</value>
+  </data>
+  <data name="tableLayoutPanel3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 169</value>
+  </data>
+  <data name="tableLayoutPanel3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="tableLayoutPanel3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>274, 40</value>
+  </data>
+  <data name="labelCurSec.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 0</value>
+  </data>
+  <data name="labelCurSec.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 0, 1, 0</value>
+  </data>
+  <data name="labelCurSec.Size" type="System.Drawing.Size, System.Drawing">
+    <value>176, 15</value>
+  </data>
+  <data name="buttonSaveSectorEdit.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 16</value>
+  </data>
+  <data name="buttonSaveSectorEdit.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="buttonSaveSectorEdit.Size" type="System.Drawing.Size, System.Drawing">
+    <value>152, 27</value>
+  </data>
+  <data name="flowLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 1</value>
+  </data>
+  <data name="flowLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="flowLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>274, 44</value>
+  </data>
+  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 0</value>
+  </data>
+  <data name="label1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 0, 1, 0</value>
+  </data>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>44, 15</value>
+  </data>
+  <data name="block0Edit.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 16</value>
+  </data>
+  <data name="block0Edit.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 40</value>
+  </data>
+  <data name="label2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 0, 1, 0</value>
+  </data>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>42, 15</value>
+  </data>
+  <data name="block1Edit.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 56</value>
+  </data>
+  <data name="block1Edit.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 80</value>
+  </data>
+  <data name="label3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 0, 1, 0</value>
+  </data>
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>44, 15</value>
+  </data>
+  <data name="block2Edit.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 96</value>
+  </data>
+  <data name="block2Edit.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="flowLayoutPanel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 47</value>
+  </data>
+  <data name="flowLayoutPanel2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="flowLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>274, 120</value>
+  </data>
+  <data name="tableLayoutPanel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1, 19</value>
+  </data>
+  <data name="tableLayoutPanel2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="tableLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>276, 560</value>
+  </data>
+  <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>191, 1</value>
+  </data>
+  <data name="groupBox2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="groupBox2.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>278, 580</value>
+  </data>
+  <data name="richTextBox1.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Yu Gothic UI, 9.75pt</value>
+  </data>
+  <data name="richTextBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 20</value>
+  </data>
+  <data name="richTextBox1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="richTextBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 386</value>
+  </data>
+  <data name="groupBox3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>471, 1</value>
+  </data>
+  <data name="groupBox3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="groupBox3.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>196, 580</value>
+  </data>
+  <data name="tableLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
+  <data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>668, 582</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="$this.AutoSize" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>670, 432</value>
+  </data>
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 1, 1, 1</value>
+  </data>
 </root>

MifareOneTool/FormHTool.zh.resx

@@ -124,100 +124,132 @@
     <value>扇区</value>
   </data>
   <data name="comboBox1.Items" xml:space="preserve">
-    <value>KeyAB读写及增减值</value>
+    <value>KeyAB читать, писать, увеличивать и уменьшать</value>
+    <comment>Previous text: KeyAB读写及增减值</comment>
   </data>
   <data name="comboBox1.Items1" xml:space="preserve">
-    <value>[只读]KeyAB读及减值/不可写及增值</value>
+    <value>[только для чтения] KeyAB для чтения и амортизации / недоступен для записи и добавляет ценность</value>
+    <comment>Previous text: [只读]KeyAB读及减值/不可写及增值</comment>
   </data>
   <data name="comboBox1.Items2" xml:space="preserve">
-    <value>[只读]KeyAB读/不可写及增减值</value>
+    <value>[только для чтения] KeyAB для чтения / записи, а также для увеличения или уменьшения</value>
+    <comment>Previous text: [只读]KeyAB读/不可写及增减值</comment>
   </data>
   <data name="comboBox1.Items3" xml:space="preserve">
-    <value>KeyB读写/不可增减值</value>
+    <value>KeyB чтение / запись / не сложение и вычитание</value>
+    <comment>Previous text: KeyB读写/不可增减值</comment>
   </data>
   <data name="comboBox1.Items4" xml:space="preserve">
-    <value>KeyAB读/KeyB写/不可增减值</value>
+    <value>KeyAB чтение / KeyB запись / без увеличения или уменьшения</value>
+    <comment>Previous text: KeyAB读/KeyB写/不可增减值</comment>
   </data>
   <data name="comboBox1.Items5" xml:space="preserve">
-    <value>[只读]KeyB读/不可写及增减值</value>
+    <value>[Только для чтения] KeyB для чтения / не для записи и увеличения или уменьшения</value>
+    <comment>Previous text: [只读]KeyB读/不可写及增减值</comment>
   </data>
   <data name="comboBox1.Items6" xml:space="preserve">
-    <value>KeyAB读及减值/KeyB写及增值</value>
+    <value>KeyAB чтение и ухудшение / KeyB написание и добавленная стоимость</value>
+    <comment>Previous text: KeyAB读及减值/KeyB写及增值</comment>
   </data>
   <data name="comboBox1.Items7" xml:space="preserve">
-    <value>[只读]锁死该扇区</value>
+    <value>[только для чтения] заблокировать сектор</value>
+    <comment>Previous text: [只读]锁死该扇区</comment>
   </data>
   <data name="comboBox2.Items" xml:space="preserve">
-    <value>KeyAB读写及增减值</value>
+    <value>KeyAB читать, писать, увеличивать и уменьшать</value>
+    <comment>Previous text: KeyAB读写及增减值</comment>
   </data>
   <data name="comboBox2.Items1" xml:space="preserve">
-    <value>[只读]KeyAB读及减值/不可写及增值</value>
+    <value>[только для чтения] KeyAB для чтения и амортизации / недоступен для записи и добавляет ценность</value>
+    <comment>Previous text: [只读]KeyAB读及减值/不可写及增值</comment>
   </data>
   <data name="comboBox2.Items2" xml:space="preserve">
-    <value>[只读]KeyAB读/不可写及增减值</value>
+    <value>[только для чтения] KeyAB для чтения / записи, а также для увеличения или уменьшения</value>
+    <comment>Previous text: [只读]KeyAB读/不可写及增减值</comment>
   </data>
   <data name="comboBox2.Items3" xml:space="preserve">
-    <value>KeyB读写/不可增减值</value>
+    <value>KeyB чтение / запись / не сложение и вычитание</value>
+    <comment>Previous text: KeyB读写/不可增减值</comment>
   </data>
   <data name="comboBox2.Items4" xml:space="preserve">
-    <value>KeyAB读/KeyB写/不可增减值</value>
+    <value>KeyAB чтение / KeyB запись / без увеличения или уменьшения</value>
+    <comment>Previous text: KeyAB读/KeyB写/不可增减值</comment>
   </data>
   <data name="comboBox2.Items5" xml:space="preserve">
-    <value>[只读]KeyB读/不可写及增减值</value>
+    <value>[Только для чтения] KeyB для чтения / не для записи и увеличения или уменьшения</value>
+    <comment>Previous text: [只读]KeyB读/不可写及增减值</comment>
   </data>
   <data name="comboBox2.Items6" xml:space="preserve">
-    <value>KeyAB读及减值/KeyB写及增值</value>
+    <value>KeyAB чтение и ухудшение / KeyB написание и добавленная стоимость</value>
+    <comment>Previous text: KeyAB读及减值/KeyB写及增值</comment>
   </data>
   <data name="comboBox2.Items7" xml:space="preserve">
-    <value>[只读]锁死该扇区</value>
+    <value>[только для чтения] заблокировать сектор</value>
+    <comment>Previous text: [只读]锁死该扇区</comment>
   </data>
   <data name="comboBox3.Items" xml:space="preserve">
-    <value>KeyAB读写及增减值</value>
+    <value>KeyAB читать, писать, увеличивать и уменьшать</value>
+    <comment>Previous text: KeyAB读写及增减值</comment>
   </data>
   <data name="comboBox3.Items1" xml:space="preserve">
-    <value>[只读]KeyAB读及减值/不可写及增值</value>
+    <value>[только для чтения] KeyAB для чтения и амортизации / недоступен для записи и добавляет ценность</value>
+    <comment>Previous text: [只读]KeyAB读及减值/不可写及增值</comment>
   </data>
   <data name="comboBox3.Items2" xml:space="preserve">
-    <value>[只读]KeyAB读/不可写及增减值</value>
+    <value>[только для чтения] KeyAB для чтения / записи, а также для увеличения или уменьшения</value>
+    <comment>Previous text: [只读]KeyAB读/不可写及增减值</comment>
   </data>
   <data name="comboBox3.Items3" xml:space="preserve">
-    <value>KeyB读写/不可增减值</value>
+    <value>KeyB чтение / запись / не сложение и вычитание</value>
+    <comment>Previous text: KeyB读写/不可增减值</comment>
   </data>
   <data name="comboBox3.Items4" xml:space="preserve">
-    <value>KeyAB读/KeyB写/不可增减值</value>
+    <value>KeyAB чтение / KeyB запись / без увеличения или уменьшения</value>
+    <comment>Previous text: KeyAB读/KeyB写/不可增减值</comment>
   </data>
   <data name="comboBox3.Items5" xml:space="preserve">
-    <value>[只读]KeyB读/不可写及增减值</value>
+    <value>[Только для чтения] KeyB для чтения / не для записи и увеличения или уменьшения</value>
+    <comment>Previous text: [只读]KeyB读/不可写及增减值</comment>
   </data>
   <data name="comboBox3.Items6" xml:space="preserve">
-    <value>KeyAB读及减值/KeyB写及增值</value>
+    <value>KeyAB чтение и ухудшение / KeyB написание и добавленная стоимость</value>
+    <comment>Previous text: KeyAB读及减值/KeyB写及增值</comment>
   </data>
   <data name="comboBox3.Items7" xml:space="preserve">
-    <value>[只读]锁死该扇区</value>
+    <value>[только для чтения] заблокировать сектор</value>
+    <comment>Previous text: [只读]锁死该扇区</comment>
   </data>
   <data name="comboBox4.Items" xml:space="preserve">
-    <value>[不可逆]KeyA:A写/AC:A只读/KeyB:A读写</value>
+    <value>[Необратимый] KeyA: запись / AC: только чтение / KeyB: чтение и запись</value>
+    <comment>Previous text: [不可逆]KeyA:A写/AC:A只读/KeyB:A读写</comment>
   </data>
   <data name="comboBox4.Items1" xml:space="preserve">
-    <value>KeyA:A写/AC:A读写/KeyB:A读写</value>
+    <value>KeyA: запись / AC: чтение / запись / KeyB: чтение и запись</value>
+    <comment>Previous text: KeyA:A写/AC:A读写/KeyB:A读写</comment>
   </data>
   <data name="comboBox4.Items2" xml:space="preserve">
-    <value>[不可逆]KeyA:不能读写/AC:A只读/KeyB:A读</value>
+    <value>[Необратимый] KeyA: невозможно чтение / запись / AC: только для чтения / KeyB: чтение</value>
+    <comment>Previous text: [不可逆]KeyA:不能读写/AC:A只读/KeyB:A读</comment>
   </data>
   <data name="comboBox4.Items3" xml:space="preserve">
-    <value>KeyA:B写/AC:A只读B读写/KeyB:B写</value>
+    <value>KeyA: B запись / AC: A только для чтения B чтение / запись / KeyB: B запись</value>
+    <comment>Previous text: KeyA:B写/AC:A只读B读写/KeyB:B写</comment>
   </data>
   <data name="comboBox4.Items4" xml:space="preserve">
-    <value>[不可逆]KeyA:B写/AC:AB只读/KeyB:B写</value>
+    <value>[необратимый] KeyA: запись B / AC: только чтение AB / KeyB: запись B</value>
+    <comment>Previous text: [不可逆]KeyA:B写/AC:AB只读/KeyB:B写</comment>
   </data>
   <data name="comboBox4.Items5" xml:space="preserve">
-    <value>KeyA:不能读写/AC:A只读B读写/KeyB:不能读写</value>
+    <value>KeyA: невозможно чтение / запись / AC: A только для чтения B чтение / запись / KeyB: невозможно чтение или запись</value>
+    <comment>Previous text: KeyA:不能读写/AC:A只读B读写/KeyB:不能读写</comment>
   </data>
   <data name="comboBox4.Items6" xml:space="preserve">
-    <value>[不可逆]KeyA:不能读写/AC:AB只读/KeyB:不能读写</value>
+    <value>[Необратимый] KeyA: невозможно чтение / запись / AC: AB только для чтения / KeyB: невозможно чтение или запись</value>
+    <comment>Previous text: [不可逆]KeyA:不能读写/AC:AB只读/KeyB:不能读写</comment>
   </data>
   <data name="comboBox4.Items7" xml:space="preserve">
-    <value>[不可逆]KeyA:不能读写/AC:AB只读/KeyB:不能读写(重复了?)</value>
+    <value>[Необратимый] KeyA: невозможно чтение / запись / AC: AB только для чтения / KeyB: невозможно чтение или запись (повторяется?)</value>
+    <comment>Previous text: [不可逆]KeyA:不能读写/AC:AB只读/KeyB:不能读写(重复了?)</comment>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>S50HTool-beta</value>
@@ -265,15 +297,23 @@
     <value>menuStrip1</value>
   </data>
   <data name="richTextBox1.Lines[0]" xml:space="preserve">
-    <value>欢迎使用M1T的集成编辑器S50HTool！</value>
+    <value>Добро пожаловать в интегрированный редактор дампа!</value>
+    <comment>Previous text: 欢迎使用M1T的集成编辑器S50HTool！</comment>
   </data>
   <data name="richTextBox1.Lines[1]" xml:space="preserve">
-    <value>打开文件请点左上角文件-打开或Ctrl+O</value>
+    <value>Чтобы открыть файл, пожалуйста, нажмите на Файл в верхнем левом углу - Открыть или Ctrl + O</value>
+    <comment>Previous text: 打开文件请点左上角文件-打开或Ctrl+O</comment>
+  </data>
+  <data name="richTextBox1.Lines[2]" xml:space="preserve">
+    <value>Вы можете обновить данные вашей карты.</value>
   </data>
   <data name="richTextBox1.Text" xml:space="preserve">
     <value>欢迎使用M1T的集成编辑器S50HTool！
 打开文件请点左上角文件-打开或Ctrl+O
 </value>
+    <comment>Previous text: 欢迎使用M1T的集成编辑器S50HTool！
+打开文件请点左上角文件-打开或Ctrl+O
+</comment>
   </data>
   <data name="保存ToolStripMenuItem.Text" xml:space="preserve">
     <value>保存</value>

MifareOneTool/FormHardNes.Designer.cs

@@ -32,48 +32,54 @@
             this.button1 = new System.Windows.Forms.Button();
             this.button2 = new System.Windows.Forms.Button();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.radioKey1B = new System.Windows.Forms.RadioButton();
+            this.label2 = new System.Windows.Forms.Label();
             this.radioKey1A = new System.Windows.Forms.RadioButton();
+            this.keyEdit = new System.Windows.Forms.TextBox();
             this.label4 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.sector1 = new System.Windows.Forms.TextBox();
-            this.keyEdit = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.radioKey2B = new System.Windows.Forms.RadioButton();
             this.radioKey2A = new System.Windows.Forms.RadioButton();
             this.label5 = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.checkBoxColOnly = new System.Windows.Forms.CheckBox();
-            this.sector2 = new System.Windows.Forms.TextBox();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
-            this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
             this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
-            this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel();
+            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
+            this.sector2 = new System.Windows.Forms.TextBox();
+            this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
             this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
+            this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel();
+            this.label7 = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
-            this.groupBox2.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
+            this.groupBox2.SuspendLayout();
+            this.tableLayoutPanel4.SuspendLayout();
             this.tableLayoutPanel2.SuspendLayout();
             this.tableLayoutPanel3.SuspendLayout();
-            this.tableLayoutPanel4.SuspendLayout();
-            this.tableLayoutPanel5.SuspendLayout();
             this.flowLayoutPanel1.SuspendLayout();
+            this.tableLayoutPanel5.SuspendLayout();
             this.SuspendLayout();
             // 
             // button1
             // 
             resources.ApplyResources(this.button1, "button1");
+            this.button1.BackColor = System.Drawing.Color.DodgerBlue;
+            this.button1.FlatAppearance.BorderColor = System.Drawing.Color.DodgerBlue;
+            this.button1.ForeColor = System.Drawing.Color.White;
             this.button1.Name = "button1";
-            this.button1.UseVisualStyleBackColor = true;
+            this.button1.UseVisualStyleBackColor = false;
             this.button1.Click += new System.EventHandler(this.button1_Click);
             // 
             // button2
             // 
             resources.ApplyResources(this.button2, "button2");
             this.button2.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.button2.FlatAppearance.BorderColor = System.Drawing.Color.DodgerBlue;
+            this.button2.FlatAppearance.BorderSize = 2;
+            this.button2.ForeColor = System.Drawing.Color.DodgerBlue;
             this.button2.Name = "button2";
             this.button2.UseVisualStyleBackColor = true;
             this.button2.Click += new System.EventHandler(this.button2_Click);
@@ -81,16 +87,39 @@
             // groupBox1
             // 
             resources.ApplyResources(this.groupBox1, "groupBox1");
+            this.groupBox1.BackColor = System.Drawing.Color.DodgerBlue;
             this.groupBox1.Controls.Add(this.tableLayoutPanel1);
+            this.groupBox1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.groupBox1.ForeColor = System.Drawing.Color.White;
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.TabStop = false;
             // 
+            // tableLayoutPanel1
+            // 
+            resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
+            this.tableLayoutPanel1.BackColor = System.Drawing.Color.White;
+            this.tableLayoutPanel1.Controls.Add(this.radioKey1B, 3, 1);
+            this.tableLayoutPanel1.Controls.Add(this.label2, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.radioKey1A, 2, 1);
+            this.tableLayoutPanel1.Controls.Add(this.keyEdit, 0, 1);
+            this.tableLayoutPanel1.Controls.Add(this.label4, 2, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label3, 1, 0);
+            this.tableLayoutPanel1.Controls.Add(this.sector1, 1, 1);
+            this.tableLayoutPanel1.ForeColor = System.Drawing.Color.DodgerBlue;
+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+            // 
             // radioKey1B
             // 
             resources.ApplyResources(this.radioKey1B, "radioKey1B");
             this.radioKey1B.Name = "radioKey1B";
             this.radioKey1B.UseVisualStyleBackColor = true;
             // 
+            // label2
+            // 
+            resources.ApplyResources(this.label2, "label2");
+            this.label2.ForeColor = System.Drawing.Color.MediumBlue;
+            this.label2.Name = "label2";
+            // 
             // radioKey1A
             // 
             resources.ApplyResources(this.radioKey1A, "radioKey1A");
@@ -99,14 +128,22 @@
             this.radioKey1A.TabStop = true;
             this.radioKey1A.UseVisualStyleBackColor = true;
             // 
+            // keyEdit
+            // 
+            this.keyEdit.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            resources.ApplyResources(this.keyEdit, "keyEdit");
+            this.keyEdit.Name = "keyEdit";
+            // 
             // label4
             // 
             resources.ApplyResources(this.label4, "label4");
+            this.label4.ForeColor = System.Drawing.Color.MediumBlue;
             this.label4.Name = "label4";
             // 
             // label3
             // 
             resources.ApplyResources(this.label3, "label3");
+            this.label3.ForeColor = System.Drawing.Color.MediumBlue;
             this.label3.Name = "label3";
             // 
             // sector1
@@ -114,20 +151,10 @@
             resources.ApplyResources(this.sector1, "sector1");
             this.sector1.Name = "sector1";
             // 
-            // keyEdit
-            // 
-            resources.ApplyResources(this.keyEdit, "keyEdit");
-            this.keyEdit.Name = "keyEdit";
-            // 
-            // label2
-            // 
-            resources.ApplyResources(this.label2, "label2");
-            this.label2.Name = "label2";
-            // 
             // label1
             // 
             resources.ApplyResources(this.label1, "label1");
-            this.label1.ForeColor = System.Drawing.Color.Blue;
+            this.label1.ForeColor = System.Drawing.Color.MediumBlue;
             this.label1.Name = "label1";
             // 
             // radioKey2B
@@ -147,42 +174,34 @@
             // label5
             // 
             resources.ApplyResources(this.label5, "label5");
+            this.label5.ForeColor = System.Drawing.Color.MediumBlue;
             this.label5.Name = "label5";
             // 
             // label6
             // 
             resources.ApplyResources(this.label6, "label6");
+            this.label6.ForeColor = System.Drawing.Color.MediumBlue;
             this.label6.Name = "label6";
             // 
             // groupBox2
             // 
             resources.ApplyResources(this.groupBox2, "groupBox2");
+            this.groupBox2.BackColor = System.Drawing.Color.DodgerBlue;
             this.groupBox2.Controls.Add(this.tableLayoutPanel4);
+            this.groupBox2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.groupBox2.ForeColor = System.Drawing.Color.White;
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.TabStop = false;
+            this.groupBox2.Enter += new System.EventHandler(this.groupBox2_Enter);
             // 
-            // checkBoxColOnly
+            // tableLayoutPanel4
             // 
-            resources.ApplyResources(this.checkBoxColOnly, "checkBoxColOnly");
+            resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4");
-            this.checkBoxColOnly.Name = "checkBoxColOnly";
+            this.tableLayoutPanel4.BackColor = System.Drawing.Color.White;
-            this.checkBoxColOnly.UseVisualStyleBackColor = true;
+            this.tableLayoutPanel4.Controls.Add(this.tableLayoutPanel2, 1, 0);
-            // 
+            this.tableLayoutPanel4.Controls.Add(this.label7, 0, 0);
-            // sector2
+            this.tableLayoutPanel4.ForeColor = System.Drawing.Color.DodgerBlue;
-            // 
+            this.tableLayoutPanel4.Name = "tableLayoutPanel4";
-            resources.ApplyResources(this.sector2, "sector2");
-            this.sector2.Name = "sector2";
-            // 
-            // tableLayoutPanel1
-            // 
-            resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
-            this.tableLayoutPanel1.Controls.Add(this.radioKey1B, 3, 1);
-            this.tableLayoutPanel1.Controls.Add(this.label2, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.radioKey1A, 2, 1);
-            this.tableLayoutPanel1.Controls.Add(this.keyEdit, 0, 1);
-            this.tableLayoutPanel1.Controls.Add(this.label4, 2, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label3, 1, 0);
-            this.tableLayoutPanel1.Controls.Add(this.sector1, 1, 1);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             // 
             // tableLayoutPanel2
             // 
@@ -194,6 +213,11 @@
             this.tableLayoutPanel2.Controls.Add(this.sector2, 1, 1);
             this.tableLayoutPanel2.Name = "tableLayoutPanel2";
             // 
+            // sector2
+            // 
+            resources.ApplyResources(this.sector2, "sector2");
+            this.sector2.Name = "sector2";
+            // 
             // tableLayoutPanel3
             // 
             resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3");
@@ -202,12 +226,12 @@
             this.tableLayoutPanel3.Controls.Add(this.groupBox2, 0, 1);
             this.tableLayoutPanel3.Name = "tableLayoutPanel3";
             // 
-            // tableLayoutPanel4
+            // flowLayoutPanel1
             // 
-            resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4");
+            resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1");
-            this.tableLayoutPanel4.Controls.Add(this.tableLayoutPanel2, 1, 0);
+            this.flowLayoutPanel1.Controls.Add(this.label1);
-            this.tableLayoutPanel4.Controls.Add(this.checkBoxColOnly, 0, 0);
+            this.flowLayoutPanel1.Controls.Add(this.tableLayoutPanel5);
-            this.tableLayoutPanel4.Name = "tableLayoutPanel4";
+            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
             // 
             // tableLayoutPanel5
             // 
@@ -216,20 +240,18 @@
             this.tableLayoutPanel5.Controls.Add(this.button1, 1, 0);
             this.tableLayoutPanel5.Name = "tableLayoutPanel5";
             // 
-            // flowLayoutPanel1
+            // label7
             // 
-            resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1");
+            resources.ApplyResources(this.label7, "label7");
-            this.flowLayoutPanel1.Controls.Add(this.label1);
+            this.label7.Name = "label7";
-            this.flowLayoutPanel1.Controls.Add(this.tableLayoutPanel5);
-            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
             // 
             // FormHardNes
             // 
             this.AcceptButton = this.button1;
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.White;
             this.CancelButton = this.button2;
-            this.ControlBox = false;
             this.Controls.Add(this.tableLayoutPanel3);
             this.KeyPreview = true;
             this.MaximizeBox = false;
@@ -237,20 +259,20 @@
             this.Name = "FormHardNes";
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
-            this.groupBox2.ResumeLayout(false);
-            this.groupBox2.PerformLayout();
             this.tableLayoutPanel1.ResumeLayout(false);
             this.tableLayoutPanel1.PerformLayout();
+            this.groupBox2.ResumeLayout(false);
+            this.groupBox2.PerformLayout();
+            this.tableLayoutPanel4.ResumeLayout(false);
+            this.tableLayoutPanel4.PerformLayout();
             this.tableLayoutPanel2.ResumeLayout(false);
             this.tableLayoutPanel2.PerformLayout();
             this.tableLayoutPanel3.ResumeLayout(false);
             this.tableLayoutPanel3.PerformLayout();
-            this.tableLayoutPanel4.ResumeLayout(false);
-            this.tableLayoutPanel4.PerformLayout();
-            this.tableLayoutPanel5.ResumeLayout(false);
-            this.tableLayoutPanel5.PerformLayout();
             this.flowLayoutPanel1.ResumeLayout(false);
             this.flowLayoutPanel1.PerformLayout();
+            this.tableLayoutPanel5.ResumeLayout(false);
+            this.tableLayoutPanel5.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -275,12 +297,12 @@
         private System.Windows.Forms.GroupBox groupBox2;
         private System.Windows.Forms.TextBox sector2;
         private System.Windows.Forms.TextBox sector1;
-        private System.Windows.Forms.CheckBox checkBoxColOnly;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5;
         private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
+        private System.Windows.Forms.Label label7;
     }
 }

MifareOneTool/FormHardNes.cs

@@ -52,11 +52,6 @@ namespace MifareOneTool
             return a;
         }
 
-        public bool collectOnly()
-        {
-            return checkBoxColOnly.Checked;
-        }
-
         private void button2_Click(object sender, EventArgs e)
         {
             this.DialogResult = DialogResult.Cancel;
@@ -122,5 +117,10 @@ namespace MifareOneTool
             this.DialogResult = DialogResult.Yes;
             this.Close();
         }
+
+        private void groupBox2_Enter(object sender, EventArgs e)
+        {
+
+        }
     }
 }

MifareOneTool/FormHardNes.zh.resx

@@ -127,7 +127,8 @@
     <value>只采集不计算</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>初始化HardNested解密</value>
+    <value>Bitsliced Crypto-1 brute-forcer</value>
+    <comment>Previous text: 初始化HardNested解密</comment>
   </data>
   <data name="groupBox1.Text" xml:space="preserve">
     <value>目标卡-已知信息</value>
@@ -159,6 +160,11 @@
   <data name="label6.Text" xml:space="preserve">
     <value>扇区号</value>
   </data>
+  <data name="label7.Text" xml:space="preserve">
+    <value>После того, как вы нажмете 
+кнопку "Начать", 
+ожидайте около 1 минуты.</value>
+  </data>
   <data name="radioKey1A.Text" xml:space="preserve">
     <value>KeyA</value>
   </data>

MifareOneTool/FormMFF08.resx

@@ -172,6 +172,12 @@ MFF08工具给了你一次修复这些损坏卡片的机会。
 ------------------------------------------------------------------------
 
 </value>
+    <comment>Previous text: 每个人使用CUID卡的时候，总会因不了解或是不经意犯下一些小错误。
+比如使用编辑器修改UID却没有改BCC，SAK=28的卡片解密后的文件直接写入，又或是从S70卡片导入数据写入1K卡却没有更正ATQA。
+MFF08工具给了你一次修复这些损坏卡片的机会。
+------------------------------------------------------------------------
+
+</comment>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>

MifareOneTool/FormMFF08.ru.resx

@@ -172,5 +172,11 @@ CUID карта</value>
 -------------------------------------------------- ----------------------
 
 </value>
+    <comment>Previous text: 每个人使用CUID卡的时候，总会因不了解或是不经意犯下一些小错误。
+比如使用编辑器修改UID却没有改BCC，SAK=28的卡片解密后的文件直接写入，又或是从S70卡片导入数据写入1K卡却没有更正ATQA。
+MFF08工具给了你一次修复这些损坏卡片的机会。
+------------------------------------------------------------------------
+
+</comment>
   </data>
 </root>

MifareOneTool/FormMFF08.zh.resx

@@ -172,5 +172,11 @@ MFF08工具给了你一次修复这些损坏卡片的机会。
 ------------------------------------------------------------------------
 
 </value>
+    <comment>Previous text: 每个人使用CUID卡的时候，总会因不了解或是不经意犯下一些小错误。
+比如使用编辑器修改UID却没有改BCC，SAK=28的卡片解密后的文件直接写入，又或是从S70卡片导入数据写入1K卡却没有更正ATQA。
+MFF08工具给了你一次修复这些损坏卡片的机会。
+------------------------------------------------------------------------
+
+</comment>
   </data>
 </root>

MifareOneTool/MifareOneTool.csproj

@@ -44,7 +44,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\Сборки\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -52,6 +52,24 @@
   <PropertyGroup>
     <ApplicationIcon>nfc_128.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'beta|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\Сборки\Beta\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MifareOneTool|x86'">
+    <OutputPath>..\..\Сборки\MifareOneTool\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="Newtonsoft.Json">
@@ -142,6 +160,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="FormMFF08.resx">
       <DependentUpon>FormMFF08.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="FormMFF08.ru.resx">
       <DependentUpon>FormMFF08.cs</DependentUpon>
@@ -161,6 +180,7 @@
     </Compile>
     <EmbeddedResource Include="Properties\Resources.ru.resx">
       <DependentUpon>Resources.resx</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.zh.resx">
       <DependentUpon>Resources.resx</DependentUpon>

MifareOneTool/Properties/Resources.Designer.cs

@@ -69,6 +69,24 @@ namespace MifareOneTool.Properties {
             }
         }
         
+        /// <summary>
+        ///   Ищет локализованную строку, похожую на false.
+        /// </summary>
+        public static string _false {
+            get {
+                return ResourceManager.GetString("_false", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Ищет локализованную строку, похожую на .mfd.
+        /// </summary>
+        public static string _mfd {
+            get {
+                return ResourceManager.GetString("_mfd", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Ищет локализованную строку, похожую на ##Nonce收集完毕##.
         /// </summary>
@@ -87,6 +105,15 @@ namespace MifareOneTool.Properties {
             }
         }
         
+        /// <summary>
+        ///   Ищет локализованную строку, похожую на true.
+        /// </summary>
+        public static string _true {
+            get {
+                return ResourceManager.GetString("_true", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Ищет локализованную строку, похожую на  个块不同
         ///.
@@ -241,6 +268,43 @@ namespace MifareOneTool.Properties {
             }
         }
         
+        /// <summary>
+        ///   Ищет локализованную строку, похожую на allow_autoscan = .
+        /// </summary>
+        public static string allow_autoscan {
+            get {
+                return ResourceManager.GetString("allow_autoscan", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Ищет локализованную строку, похожую на allow_intrusive_scan = .
+        /// </summary>
+        public static string allow_intrusive_scan {
+            get {
+                return ResourceManager.GetString("allow_intrusive_scan", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Ищет локализованную строку, похожую на device.connstring = &quot;.
+        /// </summary>
+        public static string device_connstring {
+            get {
+                return ResourceManager.GetString("device_connstring", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Ищет локализованную строку, похожую на device.name = &quot;NFC-Device&quot;
+        ///.
+        /// </summary>
+        public static string device_name_NFC_Device {
+            get {
+                return ResourceManager.GetString("device_name_NFC_Device", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Ищет локализованную строку, похожую на DUMP文件|*.dump|MFD文件|*.mfd.
         /// </summary>
@@ -277,6 +341,15 @@ namespace MifareOneTool.Properties {
             }
         }
         
+        /// <summary>
+        ///   Ищет локализованную строку, похожую на libnfc.conf.
+        /// </summary>
+        public static string libnfc_conf {
+            get {
+                return ResourceManager.GetString("libnfc_conf", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Ищет локализованную строку, похожую на MCT格式|*.*.
         /// </summary>
@@ -314,7 +387,7 @@ namespace MifareOneTool.Properties {
         }
         
         /// <summary>
-        ///   Ищет локализованную строку, похожую на MifareOne Tool - 已取消.
+        ///   Ищет локализованную строку, похожую на MifareOne Tool - отменено.
         /// </summary>
         public static string MifareOne_Tool_已取消 {
             get {
@@ -349,15 +422,6 @@ namespace MifareOneTool.Properties {
             }
         }
         
-        /// <summary>
-        ///   Ищет локализованную строку, похожую на nfc-bin/collect.exe.
-        /// </summary>
-        public static string nfc_bin_collect_exe {
-            get {
-                return ResourceManager.GetString("nfc_bin_collect_exe", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
         /// </summary>
@@ -377,6 +441,53 @@ namespace MifareOneTool.Properties {
             }
         }
         
+        /// <summary>
+        ///   Ищет локализованную строку, похожую на 
+        ///.
+        /// </summary>
+        public static string res0 {
+            get {
+                return ResourceManager.GetString("res0", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Ищет локализованную строку, похожую на %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%.
+        /// </summary>
+        public static string res1 {
+            get {
+                return ResourceManager.GetString("res1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Ищет локализованную строку, похожую на -- .
+        /// </summary>
+        public static string res2 {
+            get {
+                return ResourceManager.GetString("res2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Ищет локализованную строку, похожую на ## .
+        /// </summary>
+        public static string res3 {
+            get {
+                return ResourceManager.GetString("res3", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Ищет локализованную строку, похожую на ：
+        ///.
+        /// </summary>
+        public static string res4 {
+            get {
+                return ResourceManager.GetString("res4", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
         /// </summary>

MifareOneTool/Properties/Resources.resx

@@ -120,12 +120,21 @@
   <data name="_0_9A_Fa_f_32" xml:space="preserve">
     <value>[0-9A-Fa-f]{32}</value>
   </data>
+  <data name="_false" xml:space="preserve">
+    <value>false</value>
+  </data>
+  <data name="_mfd" xml:space="preserve">
+    <value>.mfd</value>
+  </data>
   <data name="_Nonce收集完毕" xml:space="preserve">
     <value>##Nonce收集完毕##</value>
   </data>
   <data name="_Sector" xml:space="preserve">
     <value>+Sector: </value>
   </data>
+  <data name="_true" xml:space="preserve">
+    <value>true</value>
+  </data>
   <data name="_个块不同" xml:space="preserve">
     <value> 个块不同
 </value>
@@ -178,6 +187,19 @@
   <data name="ACR122U支持已经打开过" xml:space="preserve">
     <value>ACR122U支持已经打开过。</value>
   </data>
+  <data name="allow_autoscan" xml:space="preserve">
+    <value>allow_autoscan = </value>
+  </data>
+  <data name="allow_intrusive_scan" xml:space="preserve">
+    <value>allow_intrusive_scan = </value>
+  </data>
+  <data name="device_connstring" xml:space="preserve">
+    <value>device.connstring = "</value>
+  </data>
+  <data name="device_name_NFC_Device" xml:space="preserve">
+    <value>device.name = "NFC-Device"
+</value>
+  </data>
   <data name="DUMP文件_dump_MFD文件_mfd" xml:space="preserve">
     <value>DUMP文件|*.dump|MFD文件|*.mfd</value>
   </data>
@@ -190,6 +212,9 @@
   <data name="KeyA_B_N" xml:space="preserve">
     <value>KeyA/B/N</value>
   </data>
+  <data name="libnfc_conf" xml:space="preserve">
+    <value>libnfc.conf</value>
+  </data>
   <data name="MCT格式" xml:space="preserve">
     <value>MCT格式|*.*</value>
   </data>
@@ -203,7 +228,7 @@
     <value>MifareOne Tool</value>
   </data>
   <data name="MifareOne_Tool_已取消" xml:space="preserve">
-    <value>MifareOne Tool - 已取消</value>
+    <value>MifareOne Tool - отменено</value>
   </data>
   <data name="MifareOne_Tool_已终止" xml:space="preserve">
     <value>MifareOne Tool - 已终止</value>
@@ -214,12 +239,26 @@
   <data name="MifareOne_Tool_运行完毕" xml:space="preserve">
     <value>MifareOne Tool - 运行完毕</value>
   </data>
-  <data name="nfc_bin_collect_exe" xml:space="preserve">
-    <value>nfc-bin/collect.exe</value>
-  </data>
   <data name="res" xml:space="preserve">
     <value>。</value>
   </data>
+  <data name="res0" xml:space="preserve">
+    <value>
+</value>
+  </data>
+  <data name="res1" xml:space="preserve">
+    <value>%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%</value>
+  </data>
+  <data name="res2" xml:space="preserve">
+    <value>-- </value>
+  </data>
+  <data name="res3" xml:space="preserve">
+    <value>## </value>
+  </data>
+  <data name="res4" xml:space="preserve">
+    <value>：
+</value>
+  </data>
   <data name="txt文件_txt" xml:space="preserve">
     <value>txt文件|*.txt</value>
   </data>

MifareOneTool/Properties/Resources.ru.resx

@@ -124,95 +124,103 @@
     <value>+ Сектор:</value>
   </data>
   <data name="_个块不同" xml:space="preserve">
-    <value> Разные блоки
+    <value>разных блоков
 </value>
   </data>
   <data name="_已保存" xml:space="preserve">
-    <value>## Сохранено-</value>
+    <value>## Сохранено -</value>
   </data>
   <data name="_已自动保存" xml:space="preserve">
-    <value>## Был сохранен автоматически -</value>
+    <value>## Файл был сохранен автоматически -</value>
   </data>
   <data name="_扇区" xml:space="preserve">
-    <value># сектор</value>
+    <value># сектор </value>
   </data>
   <data name="_文件中的值错误" xml:space="preserve">
-    <value>## Ошибка в значении файла ###</value>
+    <value>## Ошибказначения в файле ###</value>
   </data>
   <data name="_有数据" xml:space="preserve">
-    <value> Есть данные</value>
+    <value>  - есть данные</value>
   </data>
   <data name="_有错误" xml:space="preserve">
-    <value> Есть ошибка</value>
+    <value> - есть ошибка</value>
   </data>
   <data name="_未保存" xml:space="preserve">
-    <value>## Несохраненный ##</value>
+    <value>## Не сохранено ##</value>
   </data>
   <data name="_程序已被强制停止" xml:space="preserve">
     <value>## Программа была вынуждена остановить ##</value>
   </data>
   <data name="_空扇区" xml:space="preserve">
-    <value> Пустой сектор</value>
+    <value> - пустой сектор</value>
   </data>
   <data name="_缓存文件异常" xml:space="preserve">
     <value>## Исключение файла кэша ##</value>
   </data>
   <data name="_计算得到BCC" xml:space="preserve">
-    <value>, рассчитать BCC =</value>
+    <value>, рассчитан BCC = </value>
   </data>
   <data name="_软件版本" xml:space="preserve">
-    <value>Версия программного обеспечения - </value>
+    <value>
+Версия программы - </value>
   </data>
   <data name="_运行出错" xml:space="preserve">
     <value>## Ошибка запуска ##</value>
   </data>
   <data name="_运行完毕" xml:space="preserve">
-    <value>## Завершение работы ##</value>
+    <value>##Операция завершена##</value>
   </data>
   <data name="AB文件中一个或两个无效" xml:space="preserve">
-    <value>Один или два файла AB недействительны.</value>
+    <value>Один или два файла A/B недействительны.</value>
   </data>
   <data name="ACR122U支持已经打开过" xml:space="preserve">
     <value>Поддержка ACR122U включена.</value>
   </data>
   <data name="DUMP文件_dump_MFD文件_mfd" xml:space="preserve">
-    <value>DUMP файл | * .dump | MFD файл | * .mfd</value>
+    <value>DUMP файл | *.dump | MFD файл | *.mfd</value>
   </data>
   <data name="Information" xml:space="preserve">
-    <value>информация</value>
+    <value>Информация</value>
+  </data>
+  <data name="InputError" xml:space="preserve">
+    <value>Ошибка ввода</value>
   </data>
   <data name="KeyA_B_N" xml:space="preserve">
-    <value>Keya / B / N</value>
+    <value>Ключ A/B для новых карт</value>
   </data>
   <data name="MCT格式" xml:space="preserve">
-    <value>Формат MCT | *. *</value>
+    <value>Формат MCT|*.*</value>
   </data>
   <data name="MFD文件_mfd_dump" xml:space="preserve">
-    <value>MFD файл | * .mfd; *. Dump</value>
+    <value>MFD файл | *.mfd; *. Dump</value>
   </data>
   <data name="MFD文件_mfd_DUMP文件_dump" xml:space="preserve">
-    <value>MFD файл | * .mfd | DUMP файл | * .dump</value>
+    <value>Файл MFD|*.mfd|Файл DUMP|*.dump</value>
   </data>
   <data name="MifareOne_Tool_已取消" xml:space="preserve">
-    <value>Инструмент MifareOne - Отменено</value>
+    <value>MifareOne - отменено</value>
   </data>
   <data name="MifareOne_Tool_已终止" xml:space="preserve">
     <value>MifareOne Tool - прекращено</value>
   </data>
   <data name="MifareOne_Tool_运行中" xml:space="preserve">
-    <value>MifareOne Tool - Запуск</value>
+    <value>MifareOne Tool - выполнение операции</value>
   </data>
   <data name="MifareOne_Tool_运行完毕" xml:space="preserve">
-    <value>MifareOne Tool - Операция завершена</value>
+    <value>MifareOne Tool - операция завершена</value>
-  </data>
-  <data name="nfc_bin_collect_exe" xml:space="preserve">
-    <value>НФК-бен / Collect.exe</value>
   </data>
   <data name="res" xml:space="preserve">
-    <value>,</value>
+    <value>.</value>
+  </data>
+  <data name="res1" xml:space="preserve">
+    <value>___________________________________________</value>
+  </data>
+  <data name="res4" xml:space="preserve">
+    <value>： 
+</value>
   </data>
   <data name="txt文件_txt" xml:space="preserve">
-    <value>Txt файл | * .txt</value>
+    <value>Txt файл|*.txt</value>
   </data>
   <data name="UID已改为" xml:space="preserve">
     <value>UID был изменен на</value>
@@ -224,151 +232,152 @@
     <value>Использовать KeyA (да) или KeyB (нет)?</value>
   </data>
   <data name="使用KeyA_是_或KeyB_否_还是不使用_用于全新白卡_" xml:space="preserve">
-    <value>Использовать KeyA (да) или KeyB (нет) или нет (для новых белых карточек) (отменить)?</value>
+    <value>Использовать Ключ A (да) или Ключ B (нет) или нет (отменить)  для новых белых карточек?</value>
   </data>
   <data name="俄语" xml:space="preserve">
     <value>Русский</value>
   </data>
   <data name="共找到" xml:space="preserve">
-    <value>найденный</value>
+    <value>Найдено </value>
   </data>
   <data name="写入出错" xml:space="preserve">
     <value>Ошибка записи</value>
   </data>
   <data name="加载的S50卡文件大小异常" xml:space="preserve">
-    <value>Размер загруженного файла карты S50 ненормальный.</value>
+    <value>Размер загруженного файла карты S50 не поддерживается.</value>
   </data>
   <data name="加载的文件不存在" xml:space="preserve">
     <value>Загруженный файл не существует.</value>
   </data>
   <data name="危险操作警告" xml:space="preserve">
-    <value>Предупреждение об опасной работе</value>
+    <value>Предупреждение об опасной операции</value>
   </data>
   <data name="同时打开ACR122U支持可能会引起操作速度下降_请确认是否" xml:space="preserve">
-    <value>Одновременное открытие опоры ACR122U может привести к снижению скорости работы.
+    <value>Одновременное включение поддержки ACR122U может привести к снижению скорости работы.
-Пожалуйста, подтвердите, если вы хотите продолжить?</value>
+Подтвердите, хотите ли вы продолжить?</value>
   </data>
   <data name="字典文件_dic" xml:space="preserve">
-    <value>Файл словаря | * .dic</value>
+    <value>Файл словаря|*.dic</value>
   </data>
   <data name="密钥字典文件_dic" xml:space="preserve">
-    <value>Файл ключевого словаря | * .dic</value>
+    <value>Файл словаря ключей|*.dic</value>
   </data>
   <data name="将自动选择首个设备" xml:space="preserve">
     <value>Первое устройство будет выбрано автоматически:</value>
   </data>
   <data name="将要写入的文件存在错误_请用高级模式中的Hex工具打开查看" xml:space="preserve">
-    <value>Существует ошибка в файле, который будет записан. Откройте вид с помощью инструмента Hex в расширенном режиме.</value>
+    <value>Существует ошибка в файле, который будет записан. Откройте его с помощью редактора дампа в расширенном режиме.</value>
   </data>
   <data name="已保存到" xml:space="preserve">
     <value>Сохранено в</value>
   </data>
   <data name="已启用CUID空卡写入补丁" xml:space="preserve">
-    <value>CUID патч для записи пустой карты включен</value>
+    <value>Включить патч для записи на пустую карту CUID</value>
   </data>
   <data name="已导出MCT文件" xml:space="preserve">
     <value>MCT файл был экспортирован</value>
   </data>
   <data name="已导出密钥字典文件" xml:space="preserve">
-    <value>Файл словаря экспортированного ключа</value>
+    <value>Экспортированный файлсловаря ключей</value>
   </data>
   <data name="已打开" xml:space="preserve">
-    <value>Он открыт.</value>
+    <value>Открыт.</value>
   </data>
   <data name="已找到_K" xml:space="preserve">
-    <value>Найдено! K =</value>
+    <value>Файл ключа - </value>
   </data>
   <data name="已指定使用该NFC设备" xml:space="preserve">
     <value>Устройство NFC было указано для использования:</value>
   </data>
   <data name="已更新扇区" xml:space="preserve">
-    <value>Обновленный сектор</value>
+    <value>Обновлен сектор </value>
   </data>
   <data name="已重置并新建卡" xml:space="preserve">
-    <value>Карта была сброшена и создана.</value>
+    <value>Сброшена и создана новая карта.</value>
   </data>
   <data name="开始执行CUID_FUID卡片写入" xml:space="preserve">
-    <value>Начать выполнение записи CUID / FUID карты ...</value>
+    <value>Запись CUID/FUID карты ...</value>
   </data>
   <data name="开始执行HardNested收集数据" xml:space="preserve">
-    <value>Начните выполнять HardNested для сбора данных ...</value>
+    <value>HardNested - сбор данных ...</value>
   </data>
   <data name="开始执行HardNested解密强化卡" xml:space="preserve">
-    <value>Запустите карточку улучшения расшифровки HardNested ...</value>
+    <value>Запуск расшифровки HardNested...</value>
   </data>
   <data name="开始执行MFOC解密" xml:space="preserve">
-    <value>Начните выполнять расшифровку MFOC ...</value>
+    <value>Выполняется расшифровка MFOC ...</value>
   </data>
   <data name="开始执行UFUID卡片锁定" xml:space="preserve">
-    <value>Начать выполнение блокировки карты UFUID ...</value>
+    <value>Блокировка карты UFUID ...</value>
   </data>
   <data name="开始执行UID卡片全格" xml:space="preserve">
-    <value>Начните выполнять UID карты в полноэкранном режиме ...</value>
+    <value>Форматирование UID...</value>
   </data>
   <data name="开始执行UID卡片写入" xml:space="preserve">
     <value>Начните выполнять запись UID карты ...</value>
   </data>
   <data name="开始执行UID卡片设定卡号" xml:space="preserve">
-    <value>Начните выполнять номер карты установки карты UID ...</value>
+    <value>Начало записи номера UID...
+</value>
   </data>
   <data name="开始执行UID卡片读取" xml:space="preserve">
-    <value>Начать чтение карты UID...</value>
+    <value>Чтение UID...</value>
   </data>
   <data name="开始执行全加密卡片爆破" xml:space="preserve">
-    <value>Начните выполнять полное шифрование карты взрыва ...</value>
+    <value>Начало выполнения полной расшифровки карты ...</value>
   </data>
   <data name="开始执行写入M1卡片" xml:space="preserve">
-    <value>Начните запись на карту M1...</value>
+    <value>Запись на карту...</value>
   </data>
   <data name="开始执行字典模式MFOC解密" xml:space="preserve">
-    <value>Начать выполнение словарного режима MFOC для расшифровки ...</value>
+    <value>Начало расшифровки  MFOC в режиме словаря...</value>
   </data>
   <data name="开始执行扫描卡片" xml:space="preserve">
-    <value>Начать сканирование карт...</value>
+    <value>Сканирование карт...</value>
   </data>
   <data name="开始执行格式化M1卡片" xml:space="preserve">
-    <value>Начните выполнять отформатированную карту M1 ...</value>
+    <value>Форматирование карты...</value>
   </data>
   <data name="开始执行检测卡片加密" xml:space="preserve">
-    <value>Начните выполнять проверку карты шифрованием ...</value>
+    <value>Определение зашифрованных секторов...</value>
   </data>
   <data name="开始执行检测设备" xml:space="preserve">
-    <value>Запуск испытательного оборудования...</value>
+    <value>Поиск считвателя...</value>
   </data>
   <data name="开始执行读取卡片" xml:space="preserve">
-    <value>Начать чтение карты...</value>
+    <value>Чтение карты...</value>
   </data>
   <data name="开始执行重置UID卡片卡号" xml:space="preserve">
-    <value>Начните выполнять сброс номера карты UID ...</value>
+    <value>Сброс номера UID ...</value>
   </data>
   <data name="当前扇区数据仍有错误_不能执行修改" xml:space="preserve">
-    <value>Данные текущего сектора все еще находятся в ошибке и не могут быть изменены.</value>
+    <value>Текущие данные сектора по-прежнему имеют ошибки и не могут быть изменены.</value>
   </data>
   <data name="当前选定扇区" xml:space="preserve">
     <value>Текущий выбранный сектор: ?</value>
   </data>
   <data name="当前选定扇区0" xml:space="preserve">
-    <value>Текущий выбранный сектор:</value>
+    <value>Текущий выбранный сектор: </value>
   </data>
   <data name="您可以上传到云计算服务节点进行计算" xml:space="preserve">
     <value>Вы можете загрузить на узел службы облачных вычислений для расчета.</value>
   </data>
   <data name="您已经运行了MifareOne_Tool_打开多个本程序可能" xml:space="preserve">
-    <value>Вы уже запустили MifareOne Tool, и открытие нескольких программ может вызвать конфликты и непредсказуемые ошибки.
+    <value>Вы уже запустили MifareOne Tool. Открытие нескольких программ может вызвать конфликты и непредсказуемые ошибки.
 Вы уверены, что хотите продолжить?</value>
   </data>
   <data name="您正在试图重复运行" xml:space="preserve">
-    <value>Вы пытаетесь запустить несколько раз</value>
+    <value>Повторный запуск</value>
   </data>
   <data name="您没有给定最后一次写卡导致0块损坏的卡数据文件来作为写卡时的" xml:space="preserve">
     <value>Вы не предоставили файл данных карты, который вызвал 0 блоков повреждения, когда последняя запись была сделана в качестве ключевого источника при записи карты.
 Операция прекращена.</value>
   </data>
   <data name="扇区" xml:space="preserve">
-    <value>Cектор</value>
+    <value>Cектор </value>
   </data>
   <data name="扇区0" xml:space="preserve">
-    <value>сектор</value>
+    <value>Сектор </value>
   </data>
   <data name="打开了" xml:space="preserve">
     <value>Открыть</value>
@@ -377,10 +386,10 @@
     <value>Ошибка открытия</value>
   </data>
   <data name="提示信息" xml:space="preserve">
-    <value>Быстрое сообщение</value>
+    <value>Совет</value>
   </data>
   <data name="文件内不是含有64个块数据_可能不完整或不兼容" xml:space="preserve">
-    <value>Файл не содержит 64 блоков данных и может быть неполным или несовместимым.</value>
+    <value>Файл не содержит 64 блока данных и может быть неполным или несовместимым.</value>
   </data>
   <data name="无密钥" xml:space="preserve">
     <value>Нет ключа</value>
@@ -390,13 +399,13 @@
 Операция прекращена.</value>
   </data>
   <data name="显示扇区" xml:space="preserve">
-    <value>Показать сектор</value>
+    <value>Показать сектор </value>
   </data>
   <data name="有任务运行中_不可执行" xml:space="preserve">
-    <value>Когда задача выполняется, она не может быть выполнена.</value>
+    <value>Операция не может быть выполнена, так как сейчас выполняется другая операция.</value>
   </data>
   <data name="未知" xml:space="preserve">
-    <value>неизвестный</value>
+    <value>неизвестно</value>
   </data>
   <data name="未选择有效key_mfd" xml:space="preserve">
     <value>Действительный key.mfd не был выбран.</value>
@@ -408,10 +417,10 @@
     <value>Китайский</value>
   </data>
   <data name="正在使用智能KeyABN" xml:space="preserve">
-    <value>Использование Smart KeyABN ...</value>
+    <value>Использование файла ключей...</value>
   </data>
   <data name="正在打开ACR122U支持" xml:space="preserve">
-    <value>Открытие ACR122U поддержки ...</value>
+    <value>Включена поддержка ACR122U...</value>
   </data>
   <data name="正在检索是否存在key_mfd" xml:space="preserve">
     <value>Поиск key.mfd ...</value>
@@ -441,81 +450,76 @@
     <value>Определены следующие устройства：</value>
   </data>
   <data name="该扇区UID校验值错误_已经自动为您更正" xml:space="preserve">
-    <value>Значение проверки UID сектора неверно и было автоматически исправлено для вас.
+    <value>Ошибка проверки UID сектора была автоматически исправлена для вас.</value>
-</value>
   </data>
   <data name="该扇区UID校验值错误_已自动更正" xml:space="preserve">
     <value>Значение проверки UID сектора неверно и было автоматически исправлено.
 </value>
   </data>
   <data name="该扇区UID校验值错误_请点击打开扇区0来自动更正" xml:space="preserve">
-    <value>Неверное значение проверки UID сектора. Нажмите, чтобы открыть сектор 0 для автоматического исправления.
+    <value>Ошибка проверки UID сектора, нажмите, чтобы открыть сектор 0 для автоматического исправления.</value>
-</value>
   </data>
   <data name="该扇区一切正常" xml:space="preserve">
-    <value>Сектор все хорошо.
+    <value>В этом секторе все в порядке.</value>
-</value>
   </data>
   <data name="该扇区访问控制位损坏_写入将会损坏卡片_已重新设置" xml:space="preserve">
-    <value>Бит контроля доступа к сектору поврежден, и запись повредит карту и будет сброшена.
+    <value>Бит управления доступом сектора является недопустимым, запись повредит карту и была отменена.</value>
-</value>
   </data>
   <data name="该扇区访问控制位损坏_写入将会损坏卡片_请重新设置" xml:space="preserve">
-    <value>Бит контроля доступа к сектору поврежден, и запись повредит карту. Пожалуйста, сбросьте ее.
+    <value>Бит контроля доступа к сектору поврежден, и запись повредит карту. Пожалуйста, отмените ее.
 </value>
   </data>
   <data name="该扇区访问控制位无效_写入将会损坏卡片_已重新设置" xml:space="preserve">
-    <value>Бит контроля доступа к сектору недействителен, запись повредит карту и будет сброшена.
+    <value>Бит управления доступом сектора является недопустимым, запись повредит карту и была отменена.</value>
-</value>
   </data>
   <data name="该扇区访问控制位无效_写入将会损坏卡片_请重新设置" xml:space="preserve">
-    <value>Недопустимый бит контроля доступа к сектору. Запись повредит карту. Пожалуйста, сбросьте ее.
+    <value>Недопустимый бит контроля доступа к сектору. Запись повредит карту. Пожалуйста, отмените ее.
 </value>
   </data>
   <data name="该操作将会清空UID卡内全部数据_清空后不可恢复_请确认是否" xml:space="preserve">
-    <value>Это удалит все данные в UID-карте! ! !
+    <value>Это удалит все данные в UID карты!
-Не может быть восстановлено после опустошения! Пожалуйста, подтвердите, если вы хотите продолжить?</value>
+Восстановление после форматирования невозможно! Пожалуйста, подтвердите, если вы хотите продолжить?</value>
   </data>
   <data name="该操作将会锁死UFUID卡片_锁死后不可恢复_无法再次更改0" xml:space="preserve">
-    <value>Это заблокирует карту UFUID! ! !
+    <value>Это заблокирует карту UFUID!
-Невозможно восстановить после блокировки! Невозможно изменить 0 блоков снова! Пожалуйста, подтвердите, если вы хотите продолжить?</value>
+Восстановление после блокировки будет невозможно! Изменить 0-ой блок будет невозможно! Пожалуйста, подтвердите, если вы хотите продолжить?</value>
   </data>
   <data name="该文件一切正常" xml:space="preserve">
     <value>С файлом все нормально.</value>
   </data>
   <data name="该文件存在以下错误" xml:space="preserve">
-    <value>Файл имеет следующую ошибку:
+    <value>Файл имеет следующую ошибку: 
 </value>
   </data>
   <data name="请检查接线是否正确_驱动是否正常安装_设备电源是否已经打开_" xml:space="preserve">
-    <value>Пожалуйста, проверьте правильность подключения/драйвер правильно установлен/питание устройства включено (для моделей с выключателем питания).</value>
+    <value>Пожалуйста, проверьте правильность подключения/правильно ли установлен драйвер/питание устройства включено (для моделей с выключателем питания).</value>
   </data>
   <data name="请输入UID号" xml:space="preserve">
     <value>Пожалуйста, введите номер UID</value>
   </data>
   <data name="请输入已知Key" xml:space="preserve">
-    <value>Пожалуйста, введите известный ключ</value>
+    <value>Пожалуйста, введите известные ключи</value>
   </data>
   <data name="请输入已知的Key_以英文半角逗号分隔" xml:space="preserve">
-    <value>Пожалуйста, введите известный ключ, разделенный запятой.</value>
+    <value>Пожалуйста, введите известные ключи, разделяя их запятой.</value>
   </data>
   <data name="请输入需要写入的UID卡号_共8位十六进制数_如E44A3B" xml:space="preserve">
     <value>Пожалуйста, введите номер карты UID для записи, всего 8 шестнадцатеричных чисел, например, E44A3BF1.</value>
   </data>
   <data name="请输入需要更改的UID卡号_共8位十六进制数_如E44A3B" xml:space="preserve">
-    <value>Пожалуйста, введите номер карты UID для изменения, всего 8 шестнадцатеричных чисел, таких как E44A3BF1.</value>
+    <value>Пожалуйста, введите номер UID для изменения, всего 8 шестнадцатеричных чисел, например E44A3BF1.</value>
   </data>
   <data name="请选择MCT_txt文件保存位置及文件名" xml:space="preserve">
-    <value>Пожалуйста, выберите файл MCT.txt, чтобы сохранить местоположение и имя файла.</value>
+    <value>Пожалуйста, выберите для MCT.txt расположение и имя файла</value>
   </data>
   <data name="请选择MFD文件保存位置及文件名" xml:space="preserve">
     <value>Пожалуйста, выберите место сохранения файла MFD и имя файла</value>
   </data>
   <data name="请选择一个包含目标卡密钥的MFD文件_通常是已经破解出的该卡" xml:space="preserve">
-    <value>Выберите файл MFD, содержащий ключ целевой карты (обычно это файл MFD карты, которая была взломана)</value>
+    <value>Выберите файл MFD, содержащий ключ  карты (обычно это файл MFD карты, которая была взломана)</value>
   </data>
   <data name="请选择密钥字典文件保存位置及文件名" xml:space="preserve">
-    <value>Пожалуйста, выберите файл словаря ключа, сохраните местоположение и имя файла</value>
+    <value>Выберите расположение и имя файла словаря ключей</value>
   </data>
   <data name="请选择最后一次写卡导致0块损坏的卡数据文件" xml:space="preserve">
     <value>Пожалуйста, выберите файл данных карты, который вызвал повреждение последней 0 карты.</value>
@@ -530,13 +534,13 @@
     <value>Пожалуйста, выберите файл MFD, который вы хотите открыть.</value>
   </data>
   <data name="请选择需要打开的MFD文件_比较A" xml:space="preserve">
-    <value>Пожалуйста, выберите файл MFD, который вы хотите открыть (сравните A)</value>
+    <value>Пожалуйста, выберите файл MFD, который вы хотите открыть (сравнить A)</value>
   </data>
   <data name="请选择需要打开的MFD文件_比较B" xml:space="preserve">
-    <value>Пожалуйста, выберите файл MFD, который вы хотите открыть (сравните B)</value>
+    <value>Пожалуйста, выберите файл MFD, который вы хотите открыть (сравнит B)</value>
   </data>
   <data name="请选择需要打开的密钥字典文件" xml:space="preserve">
-    <value>Пожалуйста, выберите ключевой файл словаря, который вы хотите открыть.</value>
+    <value>Пожалуйста, выберите файл словаря ключей, который вы хотите открыть.</value>
   </data>
   <data name="输入的UID号不合法" xml:space="preserve">
     <value>Введенный номер UID недействителен.</value>
@@ -548,7 +552,7 @@
     <value>Время выполнения: </value>
   </data>
   <data name="选择key_mfd" xml:space="preserve">
-    <value>Выбрать key.mfd</value>
+    <value>Выбрать файл ключей</value>
   </data>
   <data name="错误" xml:space="preserve">
     <value>Ошибка</value>

MifareOneTool/Properties/Resources.zh.resx

@@ -120,12 +120,21 @@
   <data name="_0_9A_Fa_f_32" xml:space="preserve">
     <value>[0-9A-Fa-f]{32}</value>
   </data>
+  <data name="_false" xml:space="preserve">
+    <value>false</value>
+  </data>
+  <data name="_mfd" xml:space="preserve">
+    <value>.mfd</value>
+  </data>
   <data name="_Nonce收集完毕" xml:space="preserve">
     <value>##Nonce收集完毕##</value>
   </data>
   <data name="_Sector" xml:space="preserve">
     <value>+Sector: </value>
   </data>
+  <data name="_true" xml:space="preserve">
+    <value>true</value>
+  </data>
   <data name="_个块不同" xml:space="preserve">
     <value> 个块不同
 </value>
@@ -178,6 +187,19 @@
   <data name="ACR122U支持已经打开过" xml:space="preserve">
     <value>ACR122U支持已经打开过。</value>
   </data>
+  <data name="allow_autoscan" xml:space="preserve">
+    <value>allow_autoscan = </value>
+  </data>
+  <data name="allow_intrusive_scan" xml:space="preserve">
+    <value>allow_intrusive_scan = </value>
+  </data>
+  <data name="device_connstring" xml:space="preserve">
+    <value>device.connstring = "</value>
+  </data>
+  <data name="device_name_NFC_Device" xml:space="preserve">
+    <value>device.name = "NFC-Device"
+</value>
+  </data>
   <data name="DUMP文件_dump_MFD文件_mfd" xml:space="preserve">
     <value>DUMP文件|*.dump|MFD文件|*.mfd</value>
   </data>
@@ -190,6 +212,9 @@
   <data name="KeyA_B_N" xml:space="preserve">
     <value>KeyA/B/N</value>
   </data>
+  <data name="libnfc_conf" xml:space="preserve">
+    <value>libnfc.conf</value>
+  </data>
   <data name="MCT格式" xml:space="preserve">
     <value>MCT格式|*.*</value>
   </data>
@@ -203,7 +228,7 @@
     <value>MifareOne Tool</value>
   </data>
   <data name="MifareOne_Tool_已取消" xml:space="preserve">
-    <value>MifareOne Tool - 已取消</value>
+    <value>MifareOne Tool - отменено</value>
   </data>
   <data name="MifareOne_Tool_已终止" xml:space="preserve">
     <value>MifareOne Tool - 已终止</value>
@@ -214,12 +239,26 @@
   <data name="MifareOne_Tool_运行完毕" xml:space="preserve">
     <value>MifareOne Tool - 运行完毕</value>
   </data>
-  <data name="nfc_bin_collect_exe" xml:space="preserve">
-    <value>nfc-bin/collect.exe</value>
-  </data>
   <data name="res" xml:space="preserve">
     <value>。</value>
   </data>
+  <data name="res0" xml:space="preserve">
+    <value>
+</value>
+  </data>
+  <data name="res1" xml:space="preserve">
+    <value>%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%</value>
+  </data>
+  <data name="res2" xml:space="preserve">
+    <value>-- </value>
+  </data>
+  <data name="res3" xml:space="preserve">
+    <value>## </value>
+  </data>
+  <data name="res4" xml:space="preserve">
+    <value>：
+</value>
+  </data>
   <data name="txt文件_txt" xml:space="preserve">
     <value>txt文件|*.txt</value>
   </data>