diff --git a/Consts/MainMultilangConst.Designer.cs b/Consts/MainMultilangConst.Designer.cs
index 21b3415..79c4a2c 100644
--- a/Consts/MainMultilangConst.Designer.cs
+++ b/Consts/MainMultilangConst.Designer.cs
@@ -70,11 +70,11 @@ namespace Sheas_Cealer.Consts {
}
///
- /// 查找类似 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? 的本地化字符串。
///
- 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 {
}
}
- ///
- /// 查找类似 Some hosts contain syntax errors and cannot be recognized. Do you want to continue anyway? 的本地化字符串。
- ///
- public static string _HostErrorPrompt {
- get {
- return ResourceManager.GetString("_HostErrorPrompt", resourceCulture);
- }
- }
-
///
/// 查找类似 All processes of the selected browser will be closed before launching. Do you want to continue? 的本地化字符串。
///
@@ -177,6 +168,15 @@ namespace Sheas_Cealer.Consts {
}
}
+ ///
+ /// 查找类似 The mihomo conf contains syntax errors and cannot be recognized 的本地化字符串。
+ ///
+ public static string _MihomoConfErrorMsg {
+ get {
+ return ResourceManager.GetString("_MihomoConfErrorMsg", resourceCulture);
+ }
+ }
+
///
/// 查找类似 The local port 80 is occupied, which may cause the http connection to fail to automatically jump to https. Do you want to continue? 的本地化字符串。
///
@@ -187,7 +187,7 @@ namespace Sheas_Cealer.Consts {
}
///
- /// 查找类似 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? 的本地化字符串。
///
public static string _NginxHttpsPortOccupiedPrompt {
get {
diff --git a/Consts/MainMultilangConst.resx b/Consts/MainMultilangConst.resx
index 3350d0d..a973cc8 100644
--- a/Consts/MainMultilangConst.resx
+++ b/Consts/MainMultilangConst.resx
@@ -255,8 +255,11 @@
Browser
-
- 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?
+
+
+ The mihomo conf contains syntax errors and cannot be recognized
I know you would do it, but nothing will actually happen. Whee
@@ -279,9 +282,6 @@
No, please kill me, I...can't control myself...
-
- Some hosts contain syntax errors and cannot be recognized. Do you want to continue anyway?
-
All processes of the selected browser will be closed before launching. Do you want to continue?
@@ -295,7 +295,7 @@
The local port 80 is occupied, which may cause the http connection to fail to automatically jump to https. Do you want to continue?
- 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?
There is an update available. Do you want to update upstream host? If No it will only open the upstream host page for you
diff --git a/Consts/MainMultilangConst.zh.resx b/Consts/MainMultilangConst.zh.resx
index 7e55c83..ef944e8 100644
--- a/Consts/MainMultilangConst.zh.resx
+++ b/Consts/MainMultilangConst.zh.resx
@@ -255,7 +255,10 @@
浏览器
-
+
+ 伪造规则含有语法错误，部分规则无法识别，是否仍然继续?
+
+
配置文件含有语法错误，部分配置无法识别
@@ -279,9 +282,6 @@
不，求你杀了我，我...控制不住了...
-
- 伪造规则含有语法错误，部分规则无法识别，是否仍然继续?
-
启动前将关闭所选浏览器的所有进程，是否继续？
diff --git a/Wins/MainWin.xaml.cs b/Wins/MainWin.xaml.cs
index e295644..7425141 100644
--- a/Wins/MainWin.xaml.cs
+++ b/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) ||
- (NginxHttpPort != 80 && MessageBox.Show(MainConst._NginxHttpPortOccupiedPrompt, string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes) ||
+ if ((CealHostRulesDict.ContainsValue(null!) && MessageBox.Show(MainConst._CealHostErrorPrompt, 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;