diff --git a/Consts/MainMultilangConst.Designer.cs b/Consts/MainMultilangConst.Designer.cs index bbeb568..bdc6c65 100644 --- a/Consts/MainMultilangConst.Designer.cs +++ b/Consts/MainMultilangConst.Designer.cs @@ -72,9 +72,9 @@ namespace Sheas_Cealer.Consts { /// /// 查找类似 The config cannot be recognized. Check if the config contain syntax errors 的本地化字符串。 /// - public static string _ConfErrorHint { + public static string _ConfErrorMsg { get { - return ResourceManager.GetString("_ConfErrorHint", resourceCulture); + return ResourceManager.GetString("_ConfErrorMsg", resourceCulture); } } @@ -144,9 +144,9 @@ namespace Sheas_Cealer.Consts { /// /// 查找类似 The args cannot be recognized. Check if the hosts contain syntax errors 的本地化字符串。 /// - public static string _HostErrorHint { + public static string _HostErrorMsg { get { - return ResourceManager.GetString("_HostErrorHint", resourceCulture); + return ResourceManager.GetString("_HostErrorMsg", resourceCulture); } } @@ -180,18 +180,18 @@ namespace Sheas_Cealer.Consts { /// /// 查找类似 Update successfully 的本地化字符串。 /// - public static string _UpdateUpstreamHostSuccessHint { + public static string _UpdateUpstreamHostSuccessMsg { get { - return ResourceManager.GetString("_UpdateUpstreamHostSuccessHint", resourceCulture); + return ResourceManager.GetString("_UpdateUpstreamHostSuccessMsg", resourceCulture); } } /// /// 查找类似 Upstream host has been updated to the latest 的本地化字符串。 /// - public static string _UpstreamHostUtdHint { + public static string _UpstreamHostUtdMsg { get { - return ResourceManager.GetString("_UpstreamHostUtdHint", resourceCulture); + return ResourceManager.GetString("_UpstreamHostUtdMsg", resourceCulture); } } diff --git a/Consts/MainMultilangConst.resx b/Consts/MainMultilangConst.resx index c345d5e..0564c57 100644 --- a/Consts/MainMultilangConst.resx +++ b/Consts/MainMultilangConst.resx @@ -243,7 +243,7 @@ Browser - + The config cannot be recognized. Check if the config contain syntax errors @@ -267,7 +267,7 @@ No, please kill me, I...can't control myself... - + The args cannot be recognized. Check if the hosts contain syntax errors @@ -279,10 +279,10 @@ There is an update available. Do you want to update upstream host? If No it will only open the upstream host page for you - + Update successfully - + Upstream host has been updated to the latest \ No newline at end of file diff --git a/Consts/MainMultilangConst.zh.resx b/Consts/MainMultilangConst.zh.resx index 810b148..6dd09c0 100644 --- a/Consts/MainMultilangConst.zh.resx +++ b/Consts/MainMultilangConst.zh.resx @@ -243,7 +243,7 @@ 浏览器 - + 配置无法识别,请检查配置文件中是否含有语法错误 @@ -267,7 +267,7 @@ 不,求你杀了我,我...控制不住自己了... - + 规则无法识别,请检查伪造规则中是否含有语法错误 @@ -279,10 +279,10 @@ 上游规则有更新可用,需要更新吗?否则只为你打开上游规则网页 - + 更新已完成 - + 上游规则已经更到最新了 \ No newline at end of file diff --git a/Wins/MainWin.xaml.cs b/Wins/MainWin.xaml.cs index df8f190..d6da77a 100644 --- a/Wins/MainWin.xaml.cs +++ b/Wins/MainWin.xaml.cs @@ -129,7 +129,7 @@ public partial class MainWin : Window HoldButtonTimer?.Stop(); if (string.IsNullOrWhiteSpace(CealArgs)) - throw new Exception(MainConst._HostErrorHint); + throw new Exception(MainConst._HostErrorMsg); if (MessageBox.Show(MainConst._KillBrowserProcessPrompt, string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes) return; @@ -229,7 +229,7 @@ public partial class MainWin : Window configStream.Load(File.OpenText(configPath)); try { configMapNode = (YamlMappingNode)configStream.Documents[0].RootNode; } - catch { throw new Exception(MainConst._ConfErrorHint); } + catch { throw new Exception(MainConst._ConfErrorMsg); } if (!configMapNode.Children.TryGetValue("mixed-port", out mihomoPortNode!) && !configMapNode.Children.TryGetValue("port", out mihomoPortNode!)) mihomoPortNode = "7890"; @@ -282,14 +282,14 @@ public partial class MainWin : Window oldUpstreamHostString = File.ReadAllText(oldUpstreamHostPath); if (oldUpstreamHostString.Replace("\r", string.Empty) == newUpstreamHostString) - MessageBox.Show(MainConst._UpstreamHostUtdHint); + MessageBox.Show(MainConst._UpstreamHostUtdMsg); else { MessageBoxResult overrideOptionResult = MessageBox.Show(MainConst._OverrideUpstreamHostPrompt, string.Empty, MessageBoxButton.YesNoCancel); if (overrideOptionResult == MessageBoxResult.Yes) { File.WriteAllText(Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, "Cealing-Host-Upstream.json"), newUpstreamHostString); - MessageBox.Show(MainConst._UpdateUpstreamHostSuccessHint); + MessageBox.Show(MainConst._UpdateUpstreamHostSuccessMsg); } else if (overrideOptionResult == MessageBoxResult.No) Process.Start(new ProcessStartInfo(newUpstreamHostUrl) { UseShellExecute = true });