添加英文界面02

ProxySU/MainWindow.xaml

@@ -177,7 +177,7 @@
                                 <GroupBox Header="{DynamicResource GroupBoxHeaderParameterTrojan}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3" Grid.RowSpan="2">
                                     <Grid>
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="0.4*"></ColumnDefinition>
+                                            <ColumnDefinition Width="0.5*"></ColumnDefinition>
                                             <ColumnDefinition></ColumnDefinition>
                                             <ColumnDefinition Width="0.4*"></ColumnDefinition>
 
@@ -196,7 +196,7 @@
                                         <!--<TextBlock Text="用户名：" Grid.Column="0" Grid.Row="2"></TextBlock>
                                         <TextBox x:Name="TextBoxUser" Grid.Column="1" Grid.Row="2" Margin="3"></TextBox>
                                         <Button x:Name="ButtonNaiveUser" Content="随机" Grid.Column="2" Grid.Row="2" Margin="2" Click="ButtonNaiveUser_Click"></Button>-->
-                                        <TextBlock Text="{DynamicResource TextBlockTrojanHostPassword}" Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
+                                        <TextBlock Text="{DynamicResource TextBlockTrojanHostPassword}" Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5"></TextBlock>
                                         <TextBox x:Name="TextBoxTrojanPassword"  Grid.Column="1" Grid.Row="2" Margin="3"></TextBox>
                                         <Button x:Name="ButtonTrojanPassword" Content="{DynamicResource ButtonTrojanChangePassword}" Grid.Column="2" Grid.Row="2" Margin="2" Click="ButtonTrojanPassword_Click" ></Button>
                                         

ProxySU/Translations/ProxySU.zh-CN.xaml

@@ -21,7 +21,7 @@
     <sys:String x:Key="ButtonTrojanGoCancel">取消</sys:String>
     <sys:String x:Key="GroupBoxHeaderParameterTrojan">参数设置</sys:String>
     <sys:String x:Key="TextBlockTrojanTemplateExplanation">模式：Trojan+TLS+Caddy</sys:String>
-    <sys:String x:Key="TextBlockTrojanServerDomain">服务器地址(域名)：</sys:String>
+    <sys:String x:Key="TextBlockTrojanServerDomain">服务器地址(域名):</sys:String>
     <sys:String x:Key="TextBlockTrojanPort">端口：443</sys:String>
     <sys:String x:Key="TextBoxDomainPrompt">域名不可为空</sys:String>
     <sys:String x:Key="TextBlockTrojanHostPassword">密码:</sys:String>
@@ -107,7 +107,6 @@
     <sys:String x:Key="MessageBoxShow_ErrorHostKeyNotEmpty">密钥文件为必填项，不能为空!!</sys:String>
     <sys:String x:Key="MessageBoxShow_ErrorProxyAddressPortNotEmpty">如果选择了代理，则代理地址与端口不能为空!</sys:String>
     <sys:String x:Key="MessageBoxShow_ErrorProxyUserPasswordNotEmpty">如果代理需要登录，则代理登录的用户名与密码不能为空!</sys:String>
-
     <sys:String x:Key="MessageBoxShow_ErrorHostConnection">远程主机连接信息有误，请检查!</sys:String>
     <sys:String x:Key="MessageBoxShow_ChooseTemplate">请先选择配置模板！</sys:String>
     <sys:String x:Key="DisplayInstallInfo_Login">正在登录远程主机......</sys:String>
@@ -115,11 +114,12 @@
     <sys:String x:Key="DisplayInstallInfo_DetectionRootPermission">检测是否运行在root权限下...</sys:String>
     <sys:String x:Key="MessageBoxShow_ErrorRootPermission">请使用具有root权限的账户登录主机！！</sys:String>
     <sys:String x:Key="DisplayInstallInfo_DetectionRoot_OK">检测结果：OK！</sys:String>
-    <sys:String x:Key="DisplayInstallInfo_TestExistV2Ray">检测系统是否已经安装V2ray......</sys:String>
-    <sys:String x:Key="MessageBoxShow_ExistedV2Ray">远程主机已安装V2ray,是否强制重新安装？</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_TestExistSoft">检测系统是否已经安装</sys:String>
+    <sys:String x:Key="MessageBoxShow_ExistedSoft">远程主机已安装</sys:String>
+    <sys:String x:Key="MessageBoxShow_ForceInstallSoft">,是否强制重新安装？</sys:String>
     <sys:String x:Key="DisplayInstallInfo_InstallationCanceledExit">安装取消，退出</sys:String>
-    <sys:String x:Key="DisplayInstallInfo_ForceInstallV2Ray">已选择强制安装V2Ray！</sys:String>
-    <sys:String x:Key="DisplayInstallInfo_NoInstalledV2Ray">检测结果：未安装V2Ray！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_ForceInstallSoft">已选择强制安装</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_NoInstalledSoft">检测结果：未安装</sys:String>
     <sys:String x:Key="DisplayInstallInfo_CheckSystemRequirements">检测系统是否符合安装要求......</sys:String>
     <sys:String x:Key="MessageBoxShow_CurrentKernelVersion">当前系统内核版本为</sys:String>
     <sys:String x:Key="MessageBoxShow_RequiredKernelVersionExplain">，V2ray要求内核为2.6.23及以上。请升级内核再安装！</sys:String>
@@ -133,9 +133,86 @@
     <sys:String x:Key="MessageBoxShow_TimeError">本地时间与远程主机时间相差超过限制(90秒)，请先用 '系统工具-->时间校对' 校对时间后再设置</sys:String>
     <sys:String x:Key="DisplayInstallInfo_TimeError">时间较对失败......</sys:String>
     <sys:String x:Key="DisplayInstallInfo_TimeOK">时间差符合要求，OK!</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_TestDomainResolve">正在检测域名是否解析到当前VPS的IP上......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_DomainResolveOK">解析正确！OK!</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_ErrorDomainResolve">域名未能正确解析到当前VPS的IP上!安装失败！</sys:String>
+    <sys:String x:Key="MessageBoxShow_ErrorDomainResolve">域名未能正确解析到当前VPS的IP上，请检查！若解析设置正确，请等待生效后再重试安装。如果域名使用了CDN，请先关闭！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_TestPortUsed">检测端口占用情况......</sys:String>
+    <sys:String x:Key="MessageBoxShow_ErrorPortUsed">80/443端口之一，或全部被占用，将强制停止占用80/443端口的程序?</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_ErrorPortUsedFail">端口被占用，安装失败......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_ReleasePort">正在释放80/443端口......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_ReleasePortOK">80/443端口释放完毕！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_PortNotUsed">检测结果：未被占用！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_StartInstalling">系统环境检测完毕，符合安装要求,开始布署......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_OpenFireWallPort">开启防火墙相应端口......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_StartInstallSoft">正在安装</sys:String>
+    <sys:String x:Key="MessageBoxShow_ErrorInstallSoftFail">安装失败,官方脚本运行出错！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_SoftInstallSuccess">安装成功！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_UploadSoftConfig">上传配置文件......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_StartInstallAcmeSh">正在安装acme.sh......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_AcmeShInstallSuccess">acme.sh安装成功！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_ErrorAcmeShInstallFail">acme.sh安装失败！原因未知，请向开发者提问！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_StartApplyCert">申请域名证书......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_ApplyCertSuccess">证书申请成功！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_ApplyCertFail">证书申请失败！原因未知，请向开发者提问！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_IntallCertToSoft">安装证书到</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_IntallCertToSoftOK">证书成功安装到</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_IntallCertToV2RayFail">证书安装到V2ray失败，原因未知，可以向开发者提问！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_StartInstallCaddy">安装Caddy......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_ErrorInstallCaddyFail">安装Caddy失败！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_InstalledCaddyOK">Caddy安装成功！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_UpgradeCaddy">正在为Http2Web模式升级Caddy v2.2.0测试版！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_UploadCaddyConfig">上传Caddy配置文件......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_UploadCaddyConfigOK">Caddy配置文件上传成功,OK!</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_StartCaddyService">正在启动Caddy......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_StartCaddyServiceOK">Caddy启动成功！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_StartCaddyServiceFail">Caddy启动失败！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_StartCaddyServiceSecond">正在启动Caddy（第二次尝试）！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_StartCaddyServiceSecondFail">Caddy启动失败(第二次)！退出安装！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_CaddyServiceFailedExit">Caddy启动失败，原因未知！请向开发者问询！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_StartV2Ray">正在启动V2ray......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_StartV2RayOK">V2ray启动成功！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_StartV2RayFail">V2ray启动失败！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_StartV2RaySecond">正在启动V2ray（第二次尝试）！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_StartV2RaySecondFail">V2ray启动失败(第二次)！退出安装！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_StartV2RayFailedExit">V2Ray启动失败，原因未知！请向开发者问询！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_TestBBR">BBR测试......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_EnableBBR">正在启用BBR......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_BBRisEnabled">BBR已经启用了！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_BBRFailed">系统不满足启用BBR的条件，启用失败！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_GenerateClientConfig">生成客户端配置......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_V2RayProxyInstalledOK">V2Ray安装成功,祝你玩的愉快！！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_LoginFailed">主机登录失败!</sys:String>
+    <sys:String x:Key="MessageBoxShow_ErrorLoginOccurred">发生错误!</sys:String>
+    <sys:String x:Key="MessageBoxShow_ErrorLoginUserOrPassword">密码错误或用户名错误!</sys:String>
+    <sys:String x:Key="MessageBoxShow_ErrorLoginHostOrPort">请检查主机地址及端口是否正确，如果通过代理，请检查代理是否正常工作</sys:String>
+    <sys:String x:Key="MessageBoxShow_ErrorLoginKey">所选密钥文件错误或者格式不对!</sys:String>
+    <sys:String x:Key="MessageBoxShow_ErrorLoginKeyOrUser">使用密钥登录，密钥文件错误或用户名错误!</sys:String>
+    <sys:String x:Key="MessageBoxShow_ErrorLoginHostOrProxyPort">主机地址错误，如果使用了代理，也可能是连接代理的端口错误!</sys:String>
+    <sys:String x:Key="MessageBoxShow_ErrorUpgradeV2RayNotInstall">远程主机未安装V2ray，退出！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_OldScriptInstalledV2Ray">检测到使用旧安装脚本的V2Ray......</sys:String>
+    <sys:String x:Key="MessageBoxShow_OldScriptInstalledV2Ray">检测到使用旧安装脚本的V2Ray,是否卸载旧版本并使用新安装脚本重新安装？</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_RemoveOldScriptInstalledV2Ray">正在卸载旧版本......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_RemoveOldVersionOK">卸载旧版本，OK!</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_InstallNewVersion">安装新版本......</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_MoveOriginalConfig">迁移原配置文件。</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_UpgradedNewVersion">已更新到最新版本。</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_CurrentVersion">远程主机当前版本为：v</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_NewVersion">最新版本为：</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_IsOrNoUpgradeNewVersion">是否升级为最新版本？</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_StartUpgradeNewVersion">正在升级到最新版本</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_UpgradeNewVersionOK">升级成功！当前已是最新版本！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_UpgradeNewVersionFail">升级失败，原因未知，请向开发者提问！</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_UpgradeVersionCancel">升级取消，退出!</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_IsNewVersion">远程主机当前已是最新版本：</sys:String>
+    <sys:String x:Key="DisplayInstallInfo_NotUpgradeVersion">无需升级！退出！</sys:String>
+    <sys:String x:Key="MessageBoxShow_DomainNotEmpty">空域名，请检查相关参数设置！</sys:String>
 
-
-
-  <sys:String x:Key="HdTel1">Tel</sys:String>
+   
+    <sys:String x:Key="HdName1">Name</sys:String>
+    <sys:String x:Key="HdGender1">Gender</sys:String>
+    <sys:String x:Key="HdDept1">Dept</sys:String>
+    <sys:String x:Key="HdEmail1">Email</sys:String>
+    <sys:String x:Key="HdTel1">Tel</sys:String>
     <sys:String x:Key="MsgShowTime1">Now</sys:String>
 </ResourceDictionary>