1.1.3 -> 1.1.4 第21次更新

Consts/MainMultilangConst.Designer.cs

@@ -70,11 +70,11 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 The config contains syntax errors and cannot be recognized 的本地化字符串。
+        ///   查找类似 Some cealing hosts contain syntax errors and cannot be recognized. Do you want to continue anyway? 的本地化字符串。
         /// </summary>
-        public static string _ConfErrorMsg {
+        public static string _CealHostErrorPrompt {
             get {
-                return ResourceManager.GetString("_ConfErrorMsg", resourceCulture);
+                return ResourceManager.GetString("_CealHostErrorPrompt", resourceCulture);
             }
         }
         
@@ -141,15 +141,6 @@ namespace Sheas_Cealer.Consts {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Some hosts contain syntax errors and cannot be recognized. Do you want to continue anyway? 的本地化字符串。
-        /// </summary>
-        public static string _HostErrorPrompt {
-            get {
-                return ResourceManager.GetString("_HostErrorPrompt", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 All processes of the selected browser will be closed before launching. Do you want to continue? 的本地化字符串。
         /// </summary>
@@ -177,6 +168,15 @@ namespace Sheas_Cealer.Consts {
             }
         }
         
+        /// <summary>
+        ///   查找类似 The mihomo conf contains syntax errors and cannot be recognized 的本地化字符串。
+        /// </summary>
+        public static string _MihomoConfErrorMsg {
+            get {
+                return ResourceManager.GetString("_MihomoConfErrorMsg", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 The local port 80 is occupied, which may cause the http connection to fail to automatically jump to https. Do you want to continue? 的本地化字符串。
         /// </summary>
@@ -187,7 +187,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 The local port 443 is occupied, which may cause the global forgery to fail to take effect. Do you want to continue? 的本地化字符串。
+        ///   查找类似 The local port 443 is occupied, which may cause the global cealing to not work properly. Do you want to continue? 的本地化字符串。
         /// </summary>
         public static string _NginxHttpsPortOccupiedPrompt {
             get {

Consts/MainMultilangConst.resx

@@ -255,8 +255,11 @@
   <data name="_BrowserPathDialogFilterFileType" xml:space="preserve">
     <value>Browser</value>
   </data>
-  <data name="_ConfErrorMsg" xml:space="preserve">
+  <data name="_CealHostErrorPrompt" xml:space="preserve">
-    <value>The config contains syntax errors and cannot be recognized</value>
+    <value>Some cealing hosts contain syntax errors and cannot be recognized. Do you want to continue anyway?</value>
+  </data>
+  <data name="_MihomoConfErrorMsg" xml:space="preserve">
+    <value>The mihomo conf contains syntax errors and cannot be recognized</value>
   </data>
   <data name="_GameClickOnceMsg" xml:space="preserve">
     <value>I know you would do it, but nothing will actually happen. Whee</value>
@@ -279,9 +282,6 @@
   <data name="_GameStartMsg" xml:space="preserve">
     <value>No, please kill me, I...can't control myself...</value>
   </data>
-  <data name="_HostErrorPrompt" xml:space="preserve">
-    <value>Some hosts contain syntax errors and cannot be recognized. Do you want to continue anyway?</value>
-  </data>
   <data name="_KillBrowserProcessPrompt" xml:space="preserve">
     <value>All processes of the selected browser will be closed before launching. Do you want to continue?</value>
   </data>
@@ -295,7 +295,7 @@
     <value>The local port 80 is occupied, which may cause the http connection to fail to automatically jump to https. Do you want to continue?</value>
   </data>
   <data name="_NginxHttpsPortOccupiedPrompt" xml:space="preserve">
-    <value>The local port 443 is occupied, which may cause the global forgery to fail to take effect. Do you want to continue?</value>
+    <value>The local port 443 is occupied, which may cause the global cealing to not work properly. Do you want to continue?</value>
   </data>
   <data name="_OverrideUpstreamHostPrompt" xml:space="preserve">
     <value>There is an update available. Do you want to update upstream host? If No it will only open the upstream host page for you</value>

Consts/MainMultilangConst.zh.resx

@@ -255,7 +255,10 @@
   <data name="_BrowserPathDialogFilterFileType" xml:space="preserve">
     <value>浏览器</value>
   </data>
-  <data name="_ConfErrorMsg" xml:space="preserve">
+  <data name="_CealHostErrorPrompt" xml:space="preserve">
+    <value>伪造规则含有语法错误，部分规则无法识别，是否仍然继续?</value>
+  </data>
+  <data name="_MihomoConfErrorMsg" xml:space="preserve">
     <value>配置文件含有语法错误，部分配置无法识别</value>
   </data>
   <data name="_GameClickOnceMsg" xml:space="preserve">
@@ -279,9 +282,6 @@
   <data name="_GameStartMsg" xml:space="preserve">
     <value>不，求你杀了我，我...控制不住了...</value>
   </data>
-  <data name="_HostErrorPrompt" xml:space="preserve">
-    <value>伪造规则含有语法错误，部分规则无法识别，是否仍然继续?</value>
-  </data>
   <data name="_KillBrowserProcessPrompt" xml:space="preserve">
     <value>启动前将关闭所选浏览器的所有进程，是否继续？</value>
   </data>

Wins/MainWin.xaml.cs

@@ -156,7 +156,7 @@ public partial class MainWin : Window
     {
         HoldButtonTimer?.Stop();
 
-        if ((CealHostRulesDict.ContainsValue(null!) && MessageBox.Show(MainConst._HostErrorPrompt, string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes) ||
+        if ((CealHostRulesDict.ContainsValue(null!) && MessageBox.Show(MainConst._CealHostErrorPrompt, string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes) ||
             (MessageBox.Show(MainConst._KillBrowserProcessPrompt, string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes))
             return;
 
@@ -188,9 +188,9 @@ public partial class MainWin : Window
 
         if (!MainPres!.IsNginxRunning)
         {
-            if ((CealHostRulesDict.ContainsValue(null!) && MessageBox.Show(MainConst._HostErrorPrompt, string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes) ||
+            if ((CealHostRulesDict.ContainsValue(null!) && MessageBox.Show(MainConst._CealHostErrorPrompt, string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes) ||
-                (NginxHttpPort != 80 && MessageBox.Show(MainConst._NginxHttpPortOccupiedPrompt, string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes) ||
                 (NginxHttpsPort != 443 && MessageBox.Show(MainConst._NginxHttpsPortOccupiedPrompt, string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes) ||
+                (NginxHttpPort != 80 && MessageBox.Show(MainConst._NginxHttpPortOccupiedPrompt, string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes) ||
                 (MessageBox.Show(MainConst._LaunchProxyPrompt, string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes) ||
                 (MainPres.IsFlashing && MessageBox.Show(MainConst._LaunchNginxFlashingPrompt, string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes))
                 return;
@@ -304,7 +304,7 @@ public partial class MainWin : Window
         if (!MainPres!.IsMihomoRunning)
         {
             if (string.IsNullOrWhiteSpace(MihomoConfs))
-                throw new Exception(MainConst._ConfErrorMsg);
+                throw new Exception(MainConst._MihomoConfErrorMsg);
             if (MessageBox.Show(MainConst._LaunchProxyPrompt, string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes)
                 return;