From 3a95e8cbea2d2abd05a09254a8365511956aa7b3 Mon Sep 17 00:00:00 2001 From: Space Time Date: Wed, 11 Dec 2024 12:57:02 +0800 Subject: [PATCH] =?UTF-8?q?1.1.3=20->=201.1.4=20=E7=AC=AC47=E6=AC=A1?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Consts/MainMultilangConst.Designer.cs | 38 +++++++++++++-------------- Consts/MainMultilangConst.resx | 34 ++++++++++++------------ Consts/MainMultilangConst.zh.resx | 16 +++++------ Convs/MainWinWidthConv.cs | 2 +- Wins/MainWin.xaml.cs | 4 +-- 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Consts/MainMultilangConst.Designer.cs b/Consts/MainMultilangConst.Designer.cs index 13ac8bc..7cb82b5 100644 --- a/Consts/MainMultilangConst.Designer.cs +++ b/Consts/MainMultilangConst.Designer.cs @@ -79,7 +79,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 I know you would do it, but nothing will actually happen. Whee 的本地化字符串。 + /// 查找类似 I know you would click me, but nothing will actually happen. Whee~ 的本地化字符串。 /// public static string _GameClickOnceMsg { get { @@ -97,7 +97,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 No no no, don't click me. Sorry, I shouldn't have lied to you, I am a cursed button, and continuing to click me will bring disaster to the entire Sheas Cealer. Please believe me, this is not a game, and there are no new features here. Listen to me and use the normal functions, okay? 的本地化字符串。 + /// 查找类似 No no no, don't click me. Sorry, I shouldn't have lied to you, I am a cursed button, and continuing to click me will bring disaster to the entire Sheas Cealer. Please believe me. This is not a game, and there are no new features here. Listen to me and use the normal functions. Please 的本地化字符串。 /// public static string _GameClickTwiceMsg { get { @@ -106,7 +106,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 You defeated the evil button and saved Sheas Cealer, you are hero 的本地化字符串。 + /// 查找类似 You defeated the evil button and saved Sheas Cealer. You are the HERO! 的本地化字符串。 /// public static string _GameEndingMsg { get { @@ -124,7 +124,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 It's dead, and you're the hero of Sheas Cealer 的本地化字符串。 + /// 查找类似 It's dead. You're the HERO of Sheas Cealer 的本地化字符串。 /// public static string _GameReviewEndingMsg { get { @@ -133,7 +133,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 No, please kill me, I...can't control myself... 的本地化字符串。 + /// 查找类似 No, please kill me. I... can't control it... 的本地化字符串。 /// public static string _GameStartMsg { get { @@ -151,7 +151,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Mihomo failed to start 的本地化字符串。 + /// 查找类似 Mihomo failed to launch 的本地化字符串。 /// public static string _LaunchMihomoErrorMsg { get { @@ -160,7 +160,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Nginx failed to start, do you want to open the error log 的本地化字符串。 + /// 查找类似 Nginx failed to launch. Do you want to open the error log? 的本地化字符串。 /// public static string _LaunchNginxErrorPrompt { get { @@ -169,7 +169,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Warning: The proxy core is under attack and cannot ceal SNI. The SNI removal mode has been turned on urgently. Do you want to continue? 的本地化字符串。 + /// 查找类似 Warning: The proxy core is under attack and failes to conceal SNI. The SNI removal mode has been turned on urgently. Do you want to continue? 的本地化字符串。 /// public static string _LaunchNginxFlashingPrompt { get { @@ -196,7 +196,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 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 80 is occupied. Do you want to use port {0} to continue? This may cause the http connection to fail to automatically jump to https 的本地化字符串。 /// public static string _NginxHttpPortOccupiedPrompt { get { @@ -205,7 +205,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 The local port 443 is occupied, which may cause the global cealing to not work properly. Do you want to continue? 的本地化字符串。 + /// 查找类似 The local port 443 is occupied. Do you want to use port {0} to continue? This may cause the global cealing to not work properly 的本地化字符串。 /// public static string _NginxHttpsPortOccupiedPrompt { get { @@ -214,7 +214,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 There is an update available. Do you want to update upstream host? If No it will only open the upstream host page for you 的本地化字符串。 + /// 查找类似 There is an update available. Do you want to update upstream host? If No it will only open the upstream host web page for you 的本地化字符串。 /// public static string _OverrideUpstreamHostPrompt { get { @@ -232,7 +232,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Upstream host has been updated to the latest 的本地化字符串。 + /// 查找类似 Upstream host is already up to date 的本地化字符串。 /// public static string _UpstreamHostUtdMsg { get { @@ -250,7 +250,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Click to open an about window 的本地化字符串。 + /// 查找类似 Click to open the about window 的本地化字符串。 /// public static string AboutButtonToolTip { get { @@ -376,7 +376,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Stop Global Purging 的本地化字符串。 + /// 查找类似 Stop GLB. Purging 的本地化字符串。 /// public static string MihomoButtonIsRunningContent { get { @@ -394,7 +394,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Start Global Purging 的本地化字符串。 + /// 查找类似 Start GLB. Purging 的本地化字符串。 /// public static string MihomoButtonIsStoppedContent { get { @@ -466,7 +466,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Click the button now 的本地化字符串。 + /// 查找类似 Click this button now 的本地化字符串。 /// public static string NoClickButtonIsFlashingToolTip { get { @@ -484,7 +484,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Do not click the button 的本地化字符串。 + /// 查找类似 Do not click this button 的本地化字符串。 /// public static string NoClickButtonIsStoppedToolTip { get { @@ -529,7 +529,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Click to open an settings window 的本地化字符串。 + /// 查找类似 Click to open the settings window 的本地化字符串。 /// public static string SettingsButtonToolTip { get { @@ -592,7 +592,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Click to launch an injected browser 的本地化字符串。 + /// 查找类似 Click to launch the injected browser 的本地化字符串。 /// public static string StartButtonToolTip { get { diff --git a/Consts/MainMultilangConst.resx b/Consts/MainMultilangConst.resx index f251274..157b1f3 100644 --- a/Consts/MainMultilangConst.resx +++ b/Consts/MainMultilangConst.resx @@ -121,7 +121,7 @@ About Me - Click to open an about window + Click to open the about window Browser Path @@ -193,13 +193,13 @@ Click Now - Click the button now + Click this button now No Clicking - Do not click the button + Do not click this button Fill in a Chromium-based browser path @@ -214,7 +214,7 @@ Appearance Settings - Click to open an settings window + Click to open the settings window Browse Path @@ -235,7 +235,7 @@ Start Cealing - Click to launch an injected browser + Click to launch the injected browser Update Upstream Host @@ -253,37 +253,37 @@ Some cealing hosts contain syntax errors and cannot be recognized. Do you want to continue anyway? - I know you would do it, but nothing will actually happen. Whee + I know you would click me, but nothing will actually happen. Whee~ Ugh, what are you doing. Please stop, I don't want to hurt anyone. Stop please, this is your last chance. Ugh, I can't control it anymore - No no no, don't click me. Sorry, I shouldn't have lied to you, I am a cursed button, and continuing to click me will bring disaster to the entire Sheas Cealer. Please believe me, this is not a game, and there are no new features here. Listen to me and use the normal functions, okay? + No no no, don't click me. Sorry, I shouldn't have lied to you, I am a cursed button, and continuing to click me will bring disaster to the entire Sheas Cealer. Please believe me. This is not a game, and there are no new features here. Listen to me and use the normal functions. Please - You defeated the evil button and saved Sheas Cealer, you are hero + You defeated the evil button and saved Sheas Cealer. You are the HERO! Button Remaining HP. - It's dead, and you're the hero of Sheas Cealer + It's dead. You're the HERO of Sheas Cealer - No, please kill me, I...can't control myself... + No, please kill me. I... can't control it... All processes of the selected browser will be closed before launching. Do you want to continue? - Mihomo failed to start + Mihomo failed to launch - Nginx failed to start, do you want to open the error log + Nginx failed to launch. Do you want to open the error log? - Warning: The proxy core is under attack and cannot ceal SNI. The SNI removal mode has been turned on urgently. Do you want to continue? + Warning: The proxy core is under attack and failes to conceal SNI. The SNI removal mode has been turned on urgently. Do you want to continue? Please remember to come back and stop the proxy manually after use. Do you want to continue? @@ -292,18 +292,18 @@ The mihomo conf contains syntax errors and cannot be recognized - 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 80 is occupied. Do you want to use port {0} to continue? This may cause the http connection to fail to automatically jump to https - The local port 443 is occupied, which may cause the global cealing to not work properly. Do you want to continue? + The local port 443 is occupied. Do you want to use port {0} to continue? This may cause the global cealing to not work properly - There is an update available. Do you want to update upstream host? If No it will only open the upstream host page for you + There is an update available. Do you want to update upstream host? If No it will only open the upstream host web page for you Update successfully - Upstream host has been updated to the latest + Upstream host is already up to date \ No newline at end of file diff --git a/Consts/MainMultilangConst.zh.resx b/Consts/MainMultilangConst.zh.resx index 11db246..e0f14a9 100644 --- a/Consts/MainMultilangConst.zh.resx +++ b/Consts/MainMultilangConst.zh.resx @@ -253,16 +253,16 @@ 伪造规则含有语法错误，部分规则无法识别，是否仍然继续? - 就知道你会点，但其实什么事情都不会发生的。嘻嘻 + 就知道你会点，但其实什么事情都不会发生的。嘻嘻~ 呜，你在做什么。求求你不要再继续点了，我不想伤害大家。快停下，这是最后一次机会。呃，我快要控制不住了 - 不不不，不要点我。对不起，我不该骗你的，我是一个受诅咒的按钮，继续点我会给整个 Sheas Cealer 带来灾难的。请相信我，这不是游戏，这里也没有新功能。听我的，去用正常的功能好吗 + 不不不，不要点我。对不起，我不该骗你的，我是一个受诅咒的按钮，继续点我会给整个 Sheas Cealer 带来灾难的。请相信我，这不是游戏，这里也没有新功能。听我的，去用正常的功能好吗，求求你了 - 你击败了邪恶的按钮，拯救了 Sheas Cealer，你是英雄 + 你击败了邪恶的按钮，拯救了 Sheas Cealer，你是英雄! 按钮剩余血量: @@ -271,7 +271,7 @@ 它死了，你是 Sheas Cealer 的英雄 - 不，求你杀了我，我...控制不住了... + 不，求你杀了我，我... 控制不住了... 启动前将关闭所选浏览器的所有进程，是否继续？ @@ -280,7 +280,7 @@ Mihomo 启动失败 - Nginx 启动失败，是否打开错误日志 + Nginx 启动失败，是否打开错误日志? Warning: 代理核心正在遭受攻击，无法伪造 SNI，已紧急开启 SNI 拔除模式，是否继续? @@ -289,13 +289,13 @@ 使用完请务必记得回来手动关闭代理，是否继续? - 配置文件含有语法错误，部分配置无法识别 + Mihomo 配置文件含有语法错误，部分配置无法识别 - 本地 80 端口被占用，这可能导致 http 连接无法自动跳转到 https，是否继续? + 本地 80 端口被占用，是否换用 {0} 端口继续? 这可能导致 http 连接无法自动跳转到 https - 本地 443 端口被占用，这可能导致全局伪造无法正常工作，是否继续? + 本地 443 端口被占用，是否换用 {0} 端口继续? 这可能导致全局伪造无法正常工作 上游规则有更新可用，需要更新吗？否则只为你打开上游规则网页 diff --git a/Convs/MainWinWidthConv.cs b/Convs/MainWinWidthConv.cs index 6f3818d..0d2542a 100644 --- a/Convs/MainWinWidthConv.cs +++ b/Convs/MainWinWidthConv.cs @@ -10,7 +10,7 @@ internal class MainWinWidthConv : IValueConverter { bool isAdmin = (bool)value; - return isAdmin ? 700 : 500; + return isAdmin ? 708 : 500; } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException(); diff --git a/Wins/MainWin.xaml.cs b/Wins/MainWin.xaml.cs index d9b1faf..53dcb19 100644 --- a/Wins/MainWin.xaml.cs +++ b/Wins/MainWin.xaml.cs @@ -188,8 +188,8 @@ public partial class MainWin : Window if (!MainPres.IsNginxRunning) { 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) || + (NginxHttpsPort != 443 && MessageBox.Show(string.Format(MainConst._NginxHttpsPortOccupiedPrompt, NginxHttpPort), string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes) || + (NginxHttpPort != 80 && MessageBox.Show(string.Format(MainConst._NginxHttpPortOccupiedPrompt, NginxHttpsPort), 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;