1.1.3 -> 1.1.4 第47次更新

Consts/MainMultilangConst.Designer.cs

@@ -79,7 +79,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 I know you would do it, but nothing will actually happen. Whee 的本地化字符串。
+        ///   查找类似 I know you would click me, but nothing will actually happen. Whee~ 的本地化字符串。
         /// </summary>
         public static string _GameClickOnceMsg {
             get {
@@ -97,7 +97,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 No no no, don&apos;t click me. Sorry, I shouldn&apos;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&apos;t click me. Sorry, I shouldn&apos;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 的本地化字符串。
         /// </summary>
         public static string _GameClickTwiceMsg {
             get {
@@ -106,7 +106,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 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! 的本地化字符串。
         /// </summary>
         public static string _GameEndingMsg {
             get {
@@ -124,7 +124,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 It&apos;s dead, and you&apos;re the hero of Sheas Cealer 的本地化字符串。
+        ///   查找类似 It&apos;s dead. You&apos;re the HERO of Sheas Cealer 的本地化字符串。
         /// </summary>
         public static string _GameReviewEndingMsg {
             get {
@@ -133,7 +133,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 No, please kill me, I...can&apos;t control myself... 的本地化字符串。
+        ///   查找类似 No, please kill me. I... can&apos;t control it... 的本地化字符串。
         /// </summary>
         public static string _GameStartMsg {
             get {
@@ -151,7 +151,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 Mihomo failed to start 的本地化字符串。
+        ///   查找类似 Mihomo failed to launch 的本地化字符串。
         /// </summary>
         public static string _LaunchMihomoErrorMsg {
             get {
@@ -160,7 +160,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 Nginx failed to start, do you want to open the error log 的本地化字符串。
+        ///   查找类似 Nginx failed to launch. Do you want to open the error log? 的本地化字符串。
         /// </summary>
         public static string _LaunchNginxErrorPrompt {
             get {
@@ -169,7 +169,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 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? 的本地化字符串。
         /// </summary>
         public static string _LaunchNginxFlashingPrompt {
             get {
@@ -196,7 +196,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <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? 的本地化字符串。
+        ///   查找类似 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 的本地化字符串。
         /// </summary>
         public static string _NginxHttpPortOccupiedPrompt {
             get {
@@ -205,7 +205,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 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 的本地化字符串。
         /// </summary>
         public static string _NginxHttpsPortOccupiedPrompt {
             get {
@@ -214,7 +214,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 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 的本地化字符串。
         /// </summary>
         public static string _OverrideUpstreamHostPrompt {
             get {
@@ -232,7 +232,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 Upstream host has been updated to the latest 的本地化字符串。
+        ///   查找类似 Upstream host is already up to date 的本地化字符串。
         /// </summary>
         public static string _UpstreamHostUtdMsg {
             get {
@@ -250,7 +250,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 Click to open an about window 的本地化字符串。
+        ///   查找类似 Click to open the about window 的本地化字符串。
         /// </summary>
         public static string AboutButtonToolTip {
             get {
@@ -376,7 +376,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 Stop Global Purging 的本地化字符串。
+        ///   查找类似 Stop GLB. Purging 的本地化字符串。
         /// </summary>
         public static string MihomoButtonIsRunningContent {
             get {
@@ -394,7 +394,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 Start Global Purging 的本地化字符串。
+        ///   查找类似 Start GLB. Purging 的本地化字符串。
         /// </summary>
         public static string MihomoButtonIsStoppedContent {
             get {
@@ -466,7 +466,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 Click the button now 的本地化字符串。
+        ///   查找类似 Click this button now 的本地化字符串。
         /// </summary>
         public static string NoClickButtonIsFlashingToolTip {
             get {
@@ -484,7 +484,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 Do not click the button 的本地化字符串。
+        ///   查找类似 Do not click this button 的本地化字符串。
         /// </summary>
         public static string NoClickButtonIsStoppedToolTip {
             get {
@@ -529,7 +529,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 Click to open an settings window 的本地化字符串。
+        ///   查找类似 Click to open the settings window 的本地化字符串。
         /// </summary>
         public static string SettingsButtonToolTip {
             get {
@@ -592,7 +592,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 Click to launch an injected browser 的本地化字符串。
+        ///   查找类似 Click to launch the injected browser 的本地化字符串。
         /// </summary>
         public static string StartButtonToolTip {
             get {

Consts/MainMultilangConst.resx

@@ -121,7 +121,7 @@
     <value>About Me</value>
   </data>
   <data name="AboutButtonToolTip" xml:space="preserve">
-    <value>Click to open an about window</value>
+    <value>Click to open the about window</value>
   </data>
   <data name="BrowserPathSettingsModeName" xml:space="preserve">
     <value>Browser Path</value>
@@ -193,13 +193,13 @@
     <value>Click Now</value>
   </data>
   <data name="NoClickButtonIsFlashingToolTip" xml:space="preserve">
-    <value>Click the button now</value>
+    <value>Click this button now</value>
   </data>
   <data name="NoClickButtonIsStoppedContent" xml:space="preserve">
     <value>No Clicking</value>
   </data>
   <data name="NoClickButtonIsStoppedToolTip" xml:space="preserve">
-    <value>Do not click the button</value>
+    <value>Do not click this button</value>
   </data>
   <data name="SettingsBoxBrowserPathToolTip" xml:space="preserve">
     <value>Fill in a Chromium-based browser path</value>
@@ -214,7 +214,7 @@
     <value>Appearance Settings</value>
   </data>
   <data name="SettingsButtonToolTip" xml:space="preserve">
-    <value>Click to open an settings window</value>
+    <value>Click to open the settings window</value>
   </data>
   <data name="SettingsFunctionButtonBrowserPathContent" xml:space="preserve">
     <value>Browse Path</value>
@@ -235,7 +235,7 @@
     <value>Start Cealing</value>
   </data>
   <data name="StartButtonToolTip" xml:space="preserve">
-    <value>Click to launch an injected browser</value>
+    <value>Click to launch the injected browser</value>
   </data>
   <data name="UpdateUpstreamHostButtonContent" xml:space="preserve">
     <value>Update Upstream Host</value>
@@ -253,37 +253,37 @@
     <value>Some cealing hosts contain syntax errors and cannot be recognized. Do you want to continue anyway?</value>
   </data>
   <data name="_GameClickOnceMsg" xml:space="preserve">
-    <value>I know you would do it, but nothing will actually happen. Whee</value>
+    <value>I know you would click me, but nothing will actually happen. Whee~</value>
   </data>
   <data name="_GameClickThreeMsg" xml:space="preserve">
     <value>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</value>
   </data>
   <data name="_GameClickTwiceMsg" xml:space="preserve">
-    <value>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?</value>
+    <value>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</value>
   </data>
   <data name="_GameEndingMsg" xml:space="preserve">
-    <value>You defeated the evil button and saved Sheas Cealer, you are hero</value>
+    <value>You defeated the evil button and saved Sheas Cealer. You are the HERO!</value>
   </data>
   <data name="_GameGradeMsg" xml:space="preserve">
     <value>Button Remaining HP.</value>
   </data>
   <data name="_GameReviewEndingMsg" xml:space="preserve">
-    <value>It's dead, and you're the hero of Sheas Cealer</value>
+    <value>It's dead. You're the HERO of Sheas Cealer</value>
   </data>
   <data name="_GameStartMsg" xml:space="preserve">
-    <value>No, please kill me, I...can't control myself...</value>
+    <value>No, please kill me. I... can't control it...</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>
   <data name="_LaunchMihomoErrorMsg" xml:space="preserve">
-    <value>Mihomo failed to start</value>
+    <value>Mihomo failed to launch</value>
   </data>
   <data name="_LaunchNginxErrorPrompt" xml:space="preserve">
-    <value>Nginx failed to start, do you want to open the error log</value>
+    <value>Nginx failed to launch. Do you want to open the error log?</value>
   </data>
   <data name="_LaunchNginxFlashingPrompt" xml:space="preserve">
-    <value>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?</value>
+    <value>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?</value>
   </data>
   <data name="_LaunchProxyPrompt" xml:space="preserve">
     <value>Please remember to come back and stop the proxy manually after use. Do you want to continue?</value>
@@ -292,18 +292,18 @@
     <value>The mihomo conf contains syntax errors and cannot be recognized</value>
   </data>
   <data name="_NginxHttpPortOccupiedPrompt" xml:space="preserve">
-    <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>
+    <value>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</value>
   </data>
   <data name="_NginxHttpsPortOccupiedPrompt" xml:space="preserve">
-    <value>The local port 443 is occupied, which may cause the global cealing to not work properly. Do you want to continue?</value>
+    <value>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</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>
+    <value>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</value>
   </data>
   <data name="_UpdateUpstreamHostSuccessMsg" xml:space="preserve">
     <value>Update successfully</value>
   </data>
   <data name="_UpstreamHostUtdMsg" xml:space="preserve">
-    <value>Upstream host has been updated to the latest</value>
+    <value>Upstream host is already up to date</value>
   </data>
 </root>

Consts/MainMultilangConst.zh.resx

@@ -253,16 +253,16 @@
     <value>伪造规则含有语法错误，部分规则无法识别，是否仍然继续?</value>
   </data>
   <data name="_GameClickOnceMsg" xml:space="preserve">
-    <value>就知道你会点，但其实什么事情都不会发生的。嘻嘻</value>
+    <value>就知道你会点，但其实什么事情都不会发生的。嘻嘻~</value>
   </data>
   <data name="_GameClickThreeMsg" xml:space="preserve">
     <value>呜，你在做什么。求求你不要再继续点了，我不想伤害大家。快停下，这是最后一次机会。呃，我快要控制不住了</value>
   </data>
   <data name="_GameClickTwiceMsg" xml:space="preserve">
-    <value>不不不，不要点我。对不起，我不该骗你的，我是一个受诅咒的按钮，继续点我会给整个 Sheas Cealer 带来灾难的。请相信我，这不是游戏，这里也没有新功能。听我的，去用正常的功能好吗</value>
+    <value>不不不，不要点我。对不起，我不该骗你的，我是一个受诅咒的按钮，继续点我会给整个 Sheas Cealer 带来灾难的。请相信我，这不是游戏，这里也没有新功能。听我的，去用正常的功能好吗，求求你了</value>
   </data>
   <data name="_GameEndingMsg" xml:space="preserve">
-    <value>你击败了邪恶的按钮，拯救了 Sheas Cealer，你是英雄</value>
+    <value>你击败了邪恶的按钮，拯救了 Sheas Cealer，你是英雄!</value>
   </data>
   <data name="_GameGradeMsg" xml:space="preserve">
     <value>按钮剩余血量:</value>
@@ -271,7 +271,7 @@
     <value>它死了，你是 Sheas Cealer 的英雄</value>
   </data>
   <data name="_GameStartMsg" xml:space="preserve">
-    <value>不，求你杀了我，我...控制不住了...</value>
+    <value>不，求你杀了我，我... 控制不住了...</value>
   </data>
   <data name="_KillBrowserProcessPrompt" xml:space="preserve">
     <value>启动前将关闭所选浏览器的所有进程，是否继续？</value>
@@ -280,7 +280,7 @@
     <value>Mihomo 启动失败</value>
   </data>
   <data name="_LaunchNginxErrorPrompt" xml:space="preserve">
-    <value>Nginx 启动失败，是否打开错误日志</value>
+    <value>Nginx 启动失败，是否打开错误日志?</value>
   </data>
   <data name="_LaunchNginxFlashingPrompt" xml:space="preserve">
     <value>Warning: 代理核心正在遭受攻击，无法伪造 SNI，已紧急开启 SNI 拔除模式，是否继续?</value>
@@ -289,13 +289,13 @@
     <value>使用完请务必记得回来手动关闭代理，是否继续?</value>
   </data>
   <data name="_MihomoConfErrorMsg" xml:space="preserve">
-    <value>配置文件含有语法错误，部分配置无法识别</value>
+    <value>Mihomo 配置文件含有语法错误，部分配置无法识别</value>
   </data>
   <data name="_NginxHttpPortOccupiedPrompt" xml:space="preserve">
-    <value>本地 80 端口被占用，这可能导致 http 连接无法自动跳转到 https，是否继续?</value>
+    <value>本地 80 端口被占用，是否换用 {0} 端口继续? 这可能导致 http 连接无法自动跳转到 https</value>
   </data>
   <data name="_NginxHttpsPortOccupiedPrompt" xml:space="preserve">
-    <value>本地 443 端口被占用，这可能导致全局伪造无法正常工作，是否继续?</value>
+    <value>本地 443 端口被占用，是否换用 {0} 端口继续? 这可能导致全局伪造无法正常工作</value>
   </data>
   <data name="_OverrideUpstreamHostPrompt" xml:space="preserve">
     <value>上游规则有更新可用，需要更新吗？否则只为你打开上游规则网页</value>

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();

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) ||
+                (NginxHttpsPort != 443 && MessageBox.Show(string.Format(MainConst._NginxHttpsPortOccupiedPrompt, NginxHttpPort), string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes) ||
-                (NginxHttpPort != 80 && MessageBox.Show(MainConst._NginxHttpPortOccupiedPrompt, 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;