中英文完善

Common/CodeResourceControl.cs

@@ -41,7 +41,6 @@ namespace OnlineStore
             var lngjson = JsonHelper.SerializeObject(LangMap);
 
             Task.Run(() => {
-                return;
                 try
                 {
                     Task.Delay(10 * 1000).Wait();                    
@@ -101,10 +100,15 @@ namespace OnlineStore
                         continue;
 
                     string[] array = line.Split(spilt);
-                    if (array.Length >= 3)
+                    if (array.Length >= 2)
                     {
                         string key = array[0].Trim();
-                        string value = array[2];
+
+                        string value = array[1];
+                        if (array.Length >= 3)
+                        {
+                            value = array[2];
+                        }
                         if (lngMap.ContainsKey(key))
                             lngMap[key] = value;
                         else

TheMachineNView/UC/FrmPassCheck.cs

@@ -47,5 +47,13 @@ namespace TheMachineNView
             else
                 MessageBox.Show(crc.GetString("Res0057","密码不正确请重新输入!"));
         }
+
+        private void FrmPassCheck_Load(object sender, EventArgs e)
+        {
+            this.Text = crc.GetString("PEnterPwd", "请输入密码");
+            this.btn_cancel .Text= crc.GetString("Cancel", "取消");
+            this.btn_ok.Text = crc.GetString("Ok", "确定");
+
+        }
     }
 }
\ No newline at end of file

TheMachineNView/UC/FrmPassCheck.designer.cs

@@ -45,6 +45,7 @@ namespace TheMachineNView
             // 
             // btn_ok
             // 
+            this.btn_ok.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btn_ok.Location = new System.Drawing.Point(352, 189);
             this.btn_ok.Name = "btn_ok";
             this.btn_ok.Size = new System.Drawing.Size(129, 49);
@@ -55,6 +56,7 @@ namespace TheMachineNView
             // 
             // btn_cancel
             // 
+            this.btn_cancel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btn_cancel.Location = new System.Drawing.Point(40, 189);
             this.btn_cancel.Name = "btn_cancel";
             this.btn_cancel.Size = new System.Drawing.Size(129, 49);
@@ -78,6 +80,7 @@ namespace TheMachineNView
             this.ShowIcon = false;
             this.ShowInTaskbar = false;
             this.Text = "请输入密码";
+            this.Load += new System.EventHandler(this.FrmPassCheck_Load);
             this.ResumeLayout(false);
             this.PerformLayout();
 

TheMachineNView/resources/en-US.lngres

@@ -463,3 +463,7 @@ Res0068		Old password incorrect
 Res0069			 The new password is not the same, please confirm.
 Res0070		The new password cannot be empty!
 Res0071		Password changed successfully! 
+PEnterPwd	请输入密码	Please enter your password 
+Cancel	CANCEL	CANCEL
+Ok	确定	OK
+Res0057	密码不正确请重新输入!	Password is not correct, please re-enter!

TheMachineNView/resources/ja-JP.lngres

@@ -466,4 +466,8 @@ Form1_tabc_tab_axis__AxisControl_panel1_btnSAImg_Text	取图测试：	フェッ
 Res0068			旧パスワードの誤り
 Res0069			新しいパスワードが2回入力したパスワードと違います!
 Res0070			新しいパスワードを空にすることはできません!
-Res0071			パスワード変更成功! 
\ No newline at end of file
+Res0071			パスワード変更成功! 
+PEnterPwd	请输入密码		パスワードを入力してください
+Cancel	取消		キャンセル
+Ok	确定		定義する
+Res0057	密码不正确请重新输入!		パスワードが間違っています。
\ No newline at end of file

TheMachineNView/resources/zh-CN.lngres

@@ -450,4 +450,8 @@ Form1_tabc_tab_axis__AxisControl_panel1_btnSAImg_Text	盘点取图测试
 Res0068		旧密码不正确
 Res0069		两次输入的新密码不一致,请确认!
 Res0070		新密码不能为空!
-Res0071		密码修改成功! 
\ No newline at end of file
+Res0071		密码修改成功! 
+PEnterPwd	请输入密码
+Cancel	取消
+Ok	确定
+Res0057	密码不正确请重新输入!
\ No newline at end of file