github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1399 from Funny-T/master 

From V2Ray-Core to Core
pull/1435/head
2dust 2021-02-28 08:11:20 +08:00 committed by GitHub
parent b30191feb2 af000a27a6
commit bb78af8489
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
v2rayN/v2rayN/Forms/MainForm.cs
View File

@ -1272,7 +1272,7 @@ namespace v2rayN.Forms
{
if (args.Success)
{
AppendText(false, string.Format(UIRes.I18N("MsgParsingSuccessfully"), "v2rayCore"));
AppendText(false, string.Format(UIRes.I18N("MsgParsingSuccessfully"), "Core"));
string url = args.Msg;
this.Invoke((MethodInvoker)(delegate
@ -1323,7 +1323,7 @@ namespace v2rayN.Forms
};
}
AppendText(false, string.Format(UIRes.I18N("MsgStartUpdating"), "v2rayCore"));
AppendText(false, string.Format(UIRes.I18N("MsgStartUpdating"), "Core"));
downloadHandle.CheckUpdateAsync(type);
}
#endregion

10
v2rayN/v2rayN/Resx/ResUI.resx
View File

@ -238,7 +238,7 @@
<value>Clear original subscription content</value>
</data>
<data name="MsgDownloadV2rayCoreSuccessfully" xml:space="preserve">
<value>Download V2ray successfully</value>
<value>Download Core successfully</value>
</data>
<data name="MsgFailedImportSubscription" xml:space="preserve">
<value>Failed to import subscription content</value>
@ -283,10 +283,10 @@
<value>Update subscription starts</value>
</data>
<data name="MsgUpdateV2rayCoreSuccessfully" xml:space="preserve">
<value>Update V2rayCore successfully</value>
<value>Update Core successfully</value>
</data>
<data name="MsgUpdateV2rayCoreSuccessfullyMore" xml:space="preserve">
<value>Update V2rayCore successfully! Restarting service...</value>
<value>Update Core successfully! Restarting service...</value>
</data>
<data name="NeedHttpGlobalProxy" xml:space="preserve">
<value> This feature relies on the Http global proxy, please set it correctly first.</value>
@ -298,7 +298,7 @@
<value> non-Vmess service, this feature is invalid</value>
</data>
<data name="NotFoundCore" xml:space="preserve">
<value>V2ray-core not found, please download: {0}</value>
<value>Core not found, please download: {0}</value>
</data>
<data name="NoValidQRcodeFound" xml:space="preserve">
<value>Scan completed, no valid QR code found</value>
@ -385,4 +385,4 @@
<data name="MsgNeedUrl" xml:space="preserve">
<value>Please fill in the address (Url)</value>
</data>
</root>
</root>

10
v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
View File

@ -238,7 +238,7 @@
<value>清除原订阅内容</value>
</data>
<data name="MsgDownloadV2rayCoreSuccessfully" xml:space="preserve">
<value>下载V2ray成功</value>
<value>下载Core成功</value>
</data>
<data name="MsgFailedImportSubscription" xml:space="preserve">
<value>导入订阅内容失败</value>
@ -283,10 +283,10 @@
<value>更新订阅开始</value>
</data>
<data name="MsgUpdateV2rayCoreSuccessfully" xml:space="preserve">
<value>更新V2rayCore成功</value>
<value>更新Core成功</value>
</data>
<data name="MsgUpdateV2rayCoreSuccessfullyMore" xml:space="preserve">
<value>更新V2rayCore成功！正在重启服务...</value>
<value>更新Core成功！正在重启服务...</value>
</data>
<data name="NeedHttpGlobalProxy" xml:space="preserve">
<value>此功能依赖Http全局代理,请先设置正确。</value>
@ -298,7 +298,7 @@
<value>非Vmess服务，此功能无效</value>
</data>
<data name="NotFoundCore" xml:space="preserve">
<value>找不到 v2ray-core，下载地址: {0}</value>
<value>找不到Core，下载地址: {0}</value>
</data>
<data name="NoValidQRcodeFound" xml:space="preserve">
<value>扫描完成,未发现有效二维码</value>
@ -385,4 +385,4 @@
<data name="MsgNeedUrl" xml:space="preserve">
<value>请填写地址(Url)</value>
</data>
</root>
</root>