diff --git a/Consts/MainMultilangConst.Designer.cs b/Consts/MainMultilangConst.Designer.cs index ad07f28..2d9a35b 100644 --- a/Consts/MainMultilangConst.Designer.cs +++ b/Consts/MainMultilangConst.Designer.cs @@ -70,7 +70,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Click to open about window 的本地化字符串。 + /// 查找类似 Click to open an about window 的本地化字符串。 /// public static string AboutButtonToolTip { get { @@ -81,9 +81,9 @@ namespace Sheas_Cealer.Consts { /// /// 查找类似 Browser Path 的本地化字符串。 /// - public static string BrowserPathModeName { + public static string BrowserPathSettingsModeName { get { - return ResourceManager.GetString("BrowserPathModeName", resourceCulture); + return ResourceManager.GetString("BrowserPathSettingsModeName", resourceCulture); } } @@ -97,7 +97,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Click to edit Cealing Host 的本地化字符串。 + /// 查找类似 Click to edit host 的本地化字符串。 /// public static string EditHostButtonToolTip { get { @@ -106,38 +106,38 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Additional Args 的本地化字符串。 + /// 查找类似 Extra Args 的本地化字符串。 /// - public static string ExtraArgsModeName { + public static string ExtraArgsSettingsModeName { get { - return ResourceManager.GetString("ExtraArgsModeName", resourceCulture); + return ResourceManager.GetString("ExtraArgsSettingsModeName", resourceCulture); } } /// - /// 查找类似 Fill in the path of a Chromium-based browser 的本地化字符串。 + /// 查找类似 Fill in a Chromium-based browser path 的本地化字符串。 /// - public static string SettingsBoxBrowserPathPlaceHolder { + public static string SettingsBoxBrowserPathToolTip { get { - return ResourceManager.GetString("SettingsBoxBrowserPathPlaceHolder", resourceCulture); + return ResourceManager.GetString("SettingsBoxBrowserPathToolTip", resourceCulture); } } /// - /// 查找类似 Fill in extra Chromium startup arguments 的本地化字符串。 + /// 查找类似 Fill in extra Chromium startup args 的本地化字符串。 /// - public static string SettingsBoxExtraArgsPlaceHolder { + public static string SettingsBoxExtraArgsToolTip { get { - return ResourceManager.GetString("SettingsBoxExtraArgsPlaceHolder", resourceCulture); + return ResourceManager.GetString("SettingsBoxExtraArgsToolTip", resourceCulture); } } /// - /// 查找类似 Fill in the link to an upstream Cealing Host 的本地化字符串。 + /// 查找类似 Fill in an upstream host URL 的本地化字符串。 /// - public static string SettingsBoxUpstreamUrlPlaceHolder { + public static string SettingsBoxUpstreamUrlToolTip { get { - return ResourceManager.GetString("SettingsBoxUpstreamUrlPlaceHolder", resourceCulture); + return ResourceManager.GetString("SettingsBoxUpstreamUrlToolTip", resourceCulture); } } @@ -160,7 +160,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Click to process the contents of the input box 的本地化字符串。 + /// 查找类似 Click to process settings 的本地化字符串。 /// public static string SettingsFunctionButtonToolTip { get { @@ -169,7 +169,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Reset Url 的本地化字符串。 + /// 查找类似 Reset URL 的本地化字符串。 /// public static string SettingsFunctionButtonUpstreamUrlContent { get { @@ -178,7 +178,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Click to switch settings mode 的本地化字符串。 + /// 查找类似 Click to switch settings 的本地化字符串。 /// public static string SettingsModeButtonToolTip { get { @@ -196,7 +196,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Click to launch the injected browser 的本地化字符串。 + /// 查找类似 Click to launch an injected browser 的本地化字符串。 /// public static string StartButtonToolTip { get { @@ -205,7 +205,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Light Theme 的本地化字符串。 + /// 查找类似 Auto Theme 的本地化字符串。 /// public static string ThemesButtonDarkThemeContent { get { @@ -214,7 +214,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Auto Theme 的本地化字符串。 + /// 查找类似 Dark Theme 的本地化字符串。 /// public static string ThemesButtonInheritThemeContent { get { @@ -223,7 +223,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Dark Theme 的本地化字符串。 + /// 查找类似 Light Theme 的本地化字符串。 /// public static string ThemesButtonLightThemeContent { get { @@ -250,7 +250,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Click to update Cealing Host 的本地化字符串。 + /// 查找类似 Click to update host 的本地化字符串。 /// public static string UpdateHostButtonToolTip { get { @@ -259,11 +259,11 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Upstream Url 的本地化字符串。 + /// 查找类似 Upstream URL 的本地化字符串。 /// - public static string UpstreamUrlModeName { + public static string UpstreamUrlSettingsModeName { get { - return ResourceManager.GetString("UpstreamUrlModeName", resourceCulture); + return ResourceManager.GetString("UpstreamUrlSettingsModeName", resourceCulture); } } } diff --git a/Consts/MainMultilangConst.resx b/Consts/MainMultilangConst.resx index 75f1f1e..9092f19 100644 --- a/Consts/MainMultilangConst.resx +++ b/Consts/MainMultilangConst.resx @@ -121,28 +121,28 @@ About Me - Click to open about window + Click to open an about window - + Browser Path Edit Host - Click to edit Cealing Host + Click to edit host - - Additional Args + + Extra Args - - Fill in the path of a Chromium-based browser + + Fill in a Chromium-based browser path - - Fill in extra Chromium startup arguments + + Fill in extra Chromium startup args - - Fill in the link to an upstream Cealing Host + + Fill in an upstream host URL Browse Path @@ -151,29 +151,29 @@ Clear Args - Click to process the contents of the input box + Click to process settings - Reset Url + Reset URL - Click to switch settings mode + Click to switch settings Start Cealing - Click to launch the injected browser + Click to launch an injected browser - Light Theme - - Auto Theme - + Dark Theme + + Light Theme + Click to switch themes @@ -181,9 +181,9 @@ Update Host - Click to update Cealing Host + Click to update host - - Upstream Url + + Upstream URL \ No newline at end of file diff --git a/Consts/MainMultilangConst.zh.resx b/Consts/MainMultilangConst.zh.resx index 6595e28..3ac8333 100644 --- a/Consts/MainMultilangConst.zh.resx +++ b/Consts/MainMultilangConst.zh.resx @@ -123,7 +123,7 @@ 点击打开关于窗口 - + 文件路径 @@ -132,17 +132,17 @@ 点击编辑伪造规则 - + 额外参数 - - 填入任意以 Chromium 为内核的浏览器的路径 + + 填入任意以 Chromium 为内核的浏览器路径 - + 填入任意额外的 Chromium 启动参数 - - 填入任意上游伪造规则的链接 + + 填入任意上游伪造规则链接 浏览路径 @@ -151,19 +151,19 @@ 清除参数 - 点击处理输入框内容 + 点击处理设置内容 重置链接 - 点击切换输入框设置模式 + 点击切换设置模式 启动伪造 - 点击启动伪造注入后的浏览器 + 点击启动参数注入完成的浏览器 跟随系统 @@ -183,7 +183,7 @@ 点击更新伪造规则 - + 上游链接 \ No newline at end of file diff --git a/Convs/MainSettingsBoxHintConv.cs b/Convs/MainSettingsBoxHintConv.cs index 2cb5324..8b077e7 100644 --- a/Convs/MainSettingsBoxHintConv.cs +++ b/Convs/MainSettingsBoxHintConv.cs @@ -14,9 +14,9 @@ internal class MainSettingsBoxHintConv : IValueConverter return settingsMode switch { - MainConst.SettingsMode.BrowserPathMode => MainConst.BrowserPathModeName, - MainConst.SettingsMode.UpstreamUrlMode => MainConst.UpstreamUrlModeName, - MainConst.SettingsMode.ExtraArgsMode => MainConst.ExtraArgsModeName, + MainConst.SettingsMode.BrowserPathMode => MainConst.BrowserPathSettingsModeName, + MainConst.SettingsMode.UpstreamUrlMode => MainConst.UpstreamUrlSettingsModeName, + MainConst.SettingsMode.ExtraArgsMode => MainConst.ExtraArgsSettingsModeName, _ => throw new UnreachableException() }; } diff --git a/Convs/MainSettingsBoxToolTipConv.cs b/Convs/MainSettingsBoxToolTipConv.cs index ed6b57e..c17470f 100644 --- a/Convs/MainSettingsBoxToolTipConv.cs +++ b/Convs/MainSettingsBoxToolTipConv.cs @@ -14,9 +14,9 @@ internal class MainSettingsBoxToolTipConv : IValueConverter return settingsMode switch { - MainConst.SettingsMode.BrowserPathMode => MainConst.SettingsBoxBrowserPathPlaceHolder, - MainConst.SettingsMode.UpstreamUrlMode => MainConst.SettingsBoxUpstreamUrlPlaceHolder, - MainConst.SettingsMode.ExtraArgsMode => MainConst.SettingsBoxExtraArgsPlaceHolder, + MainConst.SettingsMode.BrowserPathMode => MainConst.SettingsBoxBrowserPathToolTip, + MainConst.SettingsMode.UpstreamUrlMode => MainConst.SettingsBoxUpstreamUrlToolTip, + MainConst.SettingsMode.ExtraArgsMode => MainConst.SettingsBoxExtraArgsToolTip, _ => throw new UnreachableException() }; } diff --git a/Convs/MainSettingsModeButtonContentConv.cs b/Convs/MainSettingsModeButtonContentConv.cs index f52a1dc..7ecedcd 100644 --- a/Convs/MainSettingsModeButtonContentConv.cs +++ b/Convs/MainSettingsModeButtonContentConv.cs @@ -13,9 +13,9 @@ internal class MainSettingsModeButtonContentConv : IValueConverter return settingsMode switch { - MainConst.SettingsMode.BrowserPathMode => MainConst.UpstreamUrlModeName, - MainConst.SettingsMode.UpstreamUrlMode => MainConst.ExtraArgsModeName, - MainConst.SettingsMode.ExtraArgsMode => MainConst.BrowserPathModeName, + MainConst.SettingsMode.BrowserPathMode => MainConst.UpstreamUrlSettingsModeName, + MainConst.SettingsMode.UpstreamUrlMode => MainConst.ExtraArgsSettingsModeName, + MainConst.SettingsMode.ExtraArgsMode => MainConst.BrowserPathSettingsModeName, _ => throw new NotImplementedException() }; } diff --git a/Convs/MainStartButtonIsEnabledConv.cs b/Convs/MainStartButtonIsEnabledConv.cs index ef95868..9449258 100644 --- a/Convs/MainStartButtonIsEnabledConv.cs +++ b/Convs/MainStartButtonIsEnabledConv.cs @@ -13,8 +13,7 @@ internal class MainStartButtonIsEnabledConv : IMultiValueConverter string? browserPath = values[0] as string; string? extraArgs = values[1] as string; - return (File.Exists(browserPath) && Path.GetFileName(browserPath).ToLowerInvariant().EndsWith(".exe")) && - (extraArgs == MainConst.SettingsBoxExtraArgsPlaceHolder || MainConst.ExtraArgsRegex().IsMatch(extraArgs!)); + return File.Exists(browserPath) && Path.GetFileName(browserPath).ToLowerInvariant().EndsWith(".exe") && MainConst.ExtraArgsRegex().IsMatch(extraArgs!); } public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) => throw new NotImplementedException(); diff --git a/Wins/MainWin.xaml b/Wins/MainWin.xaml index e183a33..516de03 100644 --- a/Wins/MainWin.xaml +++ b/Wins/MainWin.xaml @@ -65,7 +65,7 @@ -