From a086db44323172cffcb0c5acf05fcfbcc3c37f15 Mon Sep 17 00:00:00 2001 From: DuckSoft Date: Fri, 8 May 2020 11:00:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=A1=E6=95=91=E4=BA=86=EF=BC=8C=E7=AD=89?= =?UTF-8?q?=E6=AD=BB=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/proxy/QvProxyConfigurator.cpp | 14 +++++++------- translations/en_US.ts | 6 +++--- translations/ja_JP.ts | 18 +++++++++++++++--- translations/ru_RU.ts | 6 +++--- translations/zh_CN.ts | 18 +++++++++++++++--- 5 files changed, 43 insertions(+), 19 deletions(-) diff --git a/src/components/proxy/QvProxyConfigurator.cpp b/src/components/proxy/QvProxyConfigurator.cpp index 8c496f0a..9c0b4895 100644 --- a/src/components/proxy/QvProxyConfigurator.cpp +++ b/src/components/proxy/QvProxyConfigurator.cpp @@ -315,16 +315,16 @@ namespace Qv2ray::components::proxy const auto deepinWarnTitle = QObject::tr("Deepin Detected"); const auto deepinWarnMessage = - QObject::tr("Deepin plays smart and sets you the wrong HTTPS_PROXY environment variable. ") + NEWLINE + // - QObject::tr("The original scheme should be http://, but he will replace with https://, causing the problem. ") + NEWLINE + // - QObject::tr("Qv2ray will help you change it back and make things work again. "); + QObject::tr("Deepin plays smart and sets you the wrong HTTPS_PROXY, FTP_PROXY environment variable.") + NEWLINE + // + QObject::tr("The origin scheme http is wrongly replaced by https and ftp, causing the problem.") + NEWLINE + // + QObject::tr("Qv2ray cannot help you change them back. Please don't blame us if things go wrong."); // QvMessageBoxWarn(nullptr, deepinWarnTitle, deepinWarnMessage); } - // set them back! - const auto httpProxyURL = QString("http://%1:%2").arg(address, QSTRN(httpPort)).toStdString(); - setenv("https_proxy", httpProxyURL.c_str(), true); - setenv("ftp_proxy", httpProxyURL.c_str(), true); + // set them back! - NOPE. setenv only works within your little program. + // const auto httpProxyURL = QString("http://%1:%2").arg(address, QSTRN(httpPort)).toStdString(); + // setenv("https_proxy", httpProxyURL.c_str(), true); + // setenv("ftp_proxy", httpProxyURL.c_str(), true); } #else diff --git a/translations/en_US.ts b/translations/en_US.ts index 7bcc9616..ebfea120 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -2114,15 +2114,15 @@ For example, for updating subscriptions. - Deepin plays smart and sets you the wrong HTTPS_PROXY environment variable. + Deepin plays smart and sets you the wrong HTTPS_PROXY, FTP_PROXY environment variable. - The original scheme should be http://, but he will replace with https://, causing the problem. + The origin scheme http is wrongly replaced by https and ftp, causing the problem. - Qv2ray will help you change it back and make things work again. + Qv2ray cannot help you change them back. Please don't blame us if things go wrong. diff --git a/translations/ja_JP.ts b/translations/ja_JP.ts index a0ec5922..a55747b8 100644 --- a/translations/ja_JP.ts +++ b/translations/ja_JP.ts @@ -2919,15 +2919,27 @@ For example, for updating subscriptions. Deepin plays smart and sets you the wrong HTTPS_PROXY environment variable. - Deepinのバカ、間違ったHTTPS_PROXY環境変数を設定します。 + Deepinのバカ、間違ったHTTPS_PROXY環境変数を設定します。 The original scheme should be http://, but he will replace with https://, causing the problem. - 本来のスキームは http:// であるべきなのですが、彼は https:// に置き換えて問題を引き起こします。 + 本来のスキームは http:// であるべきなのですが、彼は https:// に置き換えて問題を引き起こします。 Qv2ray will help you change it back and make things work again. - Qv2rayはそれを元に戻して、またうまくいくようにしてくれます。 + Qv2rayはそれを元に戻して、またうまくいくようにしてくれます。 + + + Deepin plays smart and sets you the wrong HTTPS_PROXY, FTP_PROXY environment variable. + Deepinのバカ、間違ったHTTPS_PROXYとFTP_PROXYの環境変数を設定します。 + + + The origin scheme http is wrongly replaced by https and ftp, causing the problem. + 元のスキームのhttpがhttpsとftpに間違って置き換えられてしまい、問題が発生しています。 + + + Qv2ray cannot help you change them back. Please don't blame us if things go wrong. + Qv2rayでは元に戻すことはできません。何かあっても私たちのせいにしないでください。 diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 1ccbdfcf..b82073f9 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -2801,15 +2801,15 @@ For example, for updating subscriptions. - Deepin plays smart and sets you the wrong HTTPS_PROXY environment variable. + Deepin plays smart and sets you the wrong HTTPS_PROXY, FTP_PROXY environment variable. - The original scheme should be http://, but he will replace with https://, causing the problem. + The origin scheme http is wrongly replaced by https and ftp, causing the problem. - Qv2ray will help you change it back and make things work again. + Qv2ray cannot help you change them back. Please don't blame us if things go wrong. diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index ed8cbf39..c2b03b9c 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -2497,15 +2497,27 @@ For example, for updating subscriptions. Deepin plays smart and sets you the wrong HTTPS_PROXY environment variable. - 默认情况下，Deepin 自作聪明，会给你设置错误的 HTTPS_PROXY 环境变量。 + 默认情况下，Deepin 自作聪明，会给你设置错误的 HTTPS_PROXY 环境变量。 The original scheme should be http://, but he will replace with https://, causing the problem. - 原 scheme 应为 http://，但 Deepin 将其替换成了 https://，导致 HTTPS 代理无法正常使用。 + 原 scheme 应为 http://，但 Deepin 将其替换成了 https://，导致 HTTPS 代理无法正常使用。 Qv2ray will help you change it back and make things work again. - Qv2ray 会尝试帮你改回去，以期解决此问题。 + Qv2ray 会尝试帮你改回去，以期解决此问题。 + + + Deepin plays smart and sets you the wrong HTTPS_PROXY, FTP_PROXY environment variable. + Deepin可能自作聪明，为你设置了错误的 HTTPS_PROXY 和 FTP_PROXY 环境变量。 + + + The origin scheme http is wrongly replaced by https and ftp, causing the problem. + 原来正确的 http:// 可能被错误地替换为 https:// 和 ftp://，导致这个问题。 + + + Qv2ray cannot help you change them back. Please don't blame us if things go wrong. + Qv2ray 很遗憾无法帮你改回来。若因此遇到问题，请勿指责吾等。