diff --git a/client/configurators/wireguard_configurator.cpp b/client/configurators/wireguard_configurator.cpp index a526e109..e22c8282 100644 --- a/client/configurators/wireguard_configurator.cpp +++ b/client/configurators/wireguard_configurator.cpp @@ -28,7 +28,7 @@ WireguardConfigurator::WireguardConfigurator(std::shared_ptr settings, : amnezia::protocols::wireguard::serverPublicKeyPath; m_serverPskKeyPath = m_isAwg ? amnezia::protocols::awg::serverPskKeyPath : amnezia::protocols::wireguard::serverPskKeyPath; - m_configTemplate = m_isAwg ? ProtocolScriptType::amnezia_wireguard_template + m_configTemplate = m_isAwg ? ProtocolScriptType::awg_template : ProtocolScriptType::wireguard_template; m_protocolName = m_isAwg ? config_key::awg : config_key::wireguard; diff --git a/client/core/scripts_registry.cpp b/client/core/scripts_registry.cpp index 82ae1fce..f209a2b1 100644 --- a/client/core/scripts_registry.cpp +++ b/client/core/scripts_registry.cpp @@ -11,7 +11,7 @@ QString amnezia::scriptFolder(amnezia::DockerContainer container) case DockerContainer::Cloak: return QLatin1String("openvpn_cloak"); case DockerContainer::ShadowSocks: return QLatin1String("openvpn_shadowsocks"); case DockerContainer::WireGuard: return QLatin1String("wireguard"); - case DockerContainer::Awg: return QLatin1String("amnezia_wireguard"); + case DockerContainer::Awg: return QLatin1String("awg"); case DockerContainer::Ipsec: return QLatin1String("ipsec"); case DockerContainer::TorWebSite: return QLatin1String("website_tor"); @@ -46,7 +46,7 @@ QString amnezia::scriptName(ProtocolScriptType type) case ProtocolScriptType::container_startup: return QLatin1String("start.sh"); case ProtocolScriptType::openvpn_template: return QLatin1String("template.ovpn"); case ProtocolScriptType::wireguard_template: return QLatin1String("template.conf"); - case ProtocolScriptType::amnezia_wireguard_template: return QLatin1String("template.conf"); + case ProtocolScriptType::awg_template: return QLatin1String("template.conf"); } } diff --git a/client/core/scripts_registry.h b/client/core/scripts_registry.h index 5c7a1b6a..02fc94fd 100644 --- a/client/core/scripts_registry.h +++ b/client/core/scripts_registry.h @@ -27,7 +27,7 @@ enum ProtocolScriptType { container_startup, openvpn_template, wireguard_template, - amnezia_wireguard_template + awg_template }; diff --git a/client/resources.qrc b/client/resources.qrc index 1b639266..4c63383c 100644 --- a/client/resources.qrc +++ b/client/resources.qrc @@ -217,10 +217,10 @@ ui/qml/Controls2/TopCloseButtonType.qml images/controls/x-circle.svg ui/qml/Pages2/PageProtocolAwgSettings.qml - server_scripts/amnezia_wireguard/template.conf - server_scripts/amnezia_wireguard/start.sh - server_scripts/amnezia_wireguard/configure_container.sh - server_scripts/amnezia_wireguard/run_container.sh - server_scripts/amnezia_wireguard/Dockerfile + server_scripts/awg/template.conf + server_scripts/awg/start.sh + server_scripts/awg/configure_container.sh + server_scripts/awg/run_container.sh + server_scripts/awg/Dockerfile diff --git a/client/server_scripts/amnezia_wireguard/Dockerfile b/client/server_scripts/awg/Dockerfile similarity index 100% rename from client/server_scripts/amnezia_wireguard/Dockerfile rename to client/server_scripts/awg/Dockerfile diff --git a/client/server_scripts/amnezia_wireguard/configure_container.sh b/client/server_scripts/awg/configure_container.sh similarity index 100% rename from client/server_scripts/amnezia_wireguard/configure_container.sh rename to client/server_scripts/awg/configure_container.sh diff --git a/client/server_scripts/amnezia_wireguard/run_container.sh b/client/server_scripts/awg/run_container.sh similarity index 100% rename from client/server_scripts/amnezia_wireguard/run_container.sh rename to client/server_scripts/awg/run_container.sh diff --git a/client/server_scripts/amnezia_wireguard/start.sh b/client/server_scripts/awg/start.sh similarity index 100% rename from client/server_scripts/amnezia_wireguard/start.sh rename to client/server_scripts/awg/start.sh diff --git a/client/server_scripts/amnezia_wireguard/template.conf b/client/server_scripts/awg/template.conf similarity index 100% rename from client/server_scripts/amnezia_wireguard/template.conf rename to client/server_scripts/awg/template.conf diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts index 27cb25e2..c46bebd9 100644 --- a/client/translations/amneziavpn_ru.ts +++ b/client/translations/amneziavpn_ru.ts @@ -1149,7 +1149,12 @@ Already installed containers were found on the server. All installed containers - Split site tunneling + Split tunneling + + + + + App-based split tunneling @@ -1157,11 +1162,6 @@ Already installed containers were found on the server. All installed containers Allows you to choose which sites you want to use the VPN for. - - - Separate application tunneling - - Allows you to use the VPN only for certain applications @@ -1444,17 +1444,17 @@ Already installed containers were found on the server. All installed containers PageSettingsSplitTunneling - Only the addresses in the list must be opened via VPN + Addresses from the list should be accessed via VPN - Addresses from the list should never be opened via VPN + Addresses from the list should not be accessed via VPN - Split site tunneling + Split tunneling @@ -2542,16 +2542,6 @@ It's okay as long as it's from someone you trust. error 0x%1: %2 - - - WireGuard Configuration Highlighter - - - - - &Randomize colors - - SelectLanguageDrawer diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts index 32d2d742..b4855a72 100644 --- a/client/translations/amneziavpn_zh_CN.ts +++ b/client/translations/amneziavpn_zh_CN.ts @@ -1197,8 +1197,17 @@ And if you don't like the app, all the more support it - the donation will + Split tunneling + + + + + App-based split tunneling + + + Split site tunneling - 网站级VPN分流 + 网站级VPN分流 @@ -1210,9 +1219,8 @@ And if you don't like the app, all the more support it - the donation will 使用VPN访问指定网站，其他的则绕过 - Separate application tunneling - 应用级VPN分流 + 应用级VPN分流 @@ -1503,19 +1511,31 @@ And if you don't like the app, all the more support it - the donation will PageSettingsSplitTunneling - Only the addresses in the list must be opened via VPN - 仅列表中的地址须通过VPN访问 + 仅列表中的地址须通过VPN访问 + + + Addresses from the list should never be opened via VPN + 勿通过VPN访问列表中的地址 + + + Split site tunneling + 网站级VPN分流 + + + + Addresses from the list should be accessed via VPN + - Addresses from the list should never be opened via VPN - 勿通过VPN访问列表中的地址 + Addresses from the list should not be accessed via VPN + - Split site tunneling - 网站级VPN分流 + Split tunneling + @@ -2615,16 +2635,6 @@ It's okay as long as it's from someone you trust. error 0x%1: %2 错误 0x%1: %2 - - - WireGuard Configuration Highlighter - - - - - &Randomize colors - - SelectLanguageDrawer diff --git a/client/ui/qml/Pages2/PageSettings.qml b/client/ui/qml/Pages2/PageSettings.qml index a806d472..d90f3ec8 100644 --- a/client/ui/qml/Pages2/PageSettings.qml +++ b/client/ui/qml/Pages2/PageSettings.qml @@ -95,6 +95,7 @@ PageType { DividerType {} LabelWithButtonType { + id: about Layout.fillWidth: true text: qsTr("About AmneziaVPN") @@ -110,6 +111,7 @@ PageType { LabelWithButtonType { Layout.fillWidth: true + Layout.preferredHeight: about.height text: qsTr("Close application") leftImageSource: "qrc:/images/controls/x-circle.svg" diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml index 374e1ce4..b5343d24 100644 --- a/client/ui/qml/Pages2/PageSettingsConnection.qml +++ b/client/ui/qml/Pages2/PageSettingsConnection.qml @@ -96,8 +96,8 @@ PageType { LabelWithButtonType { Layout.fillWidth: true - text: qsTr("Split site tunneling") - descriptionText: qsTr("Allows you to choose which sites you want to use the VPN for.") + text: qsTr("Site-based split tunneling") + descriptionText: qsTr("Allows you to select which sites you want to access through the VPN") rightImageSource: "qrc:/images/controls/chevron-right.svg" clickedFunction: function() { @@ -109,8 +109,9 @@ PageType { LabelWithButtonType { Layout.fillWidth: true + visible: false - text: qsTr("Separate application tunneling") + text: qsTr("App-based split tunneling") descriptionText: qsTr("Allows you to use the VPN only for certain applications") rightImageSource: "qrc:/images/controls/chevron-right.svg" @@ -118,7 +119,7 @@ PageType { } } - DividerType {} + // DividerType {} } } } diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml index b79d5d22..45f2dae9 100644 --- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml +++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml @@ -46,12 +46,12 @@ PageType { QtObject { id: onlyForwardSites - property string name: qsTr("Only the addresses in the list must be opened via VPN") + property string name: qsTr("Addresses from the list should be accessed via VPN") property int type: routeMode.onlyForwardSites } QtObject { id: allExceptSites - property string name: qsTr("Addresses from the list should never be opened via VPN") + property string name: qsTr("Addresses from the list should not be accessed via VPN") property int type: routeMode.allExceptSites } @@ -81,7 +81,7 @@ PageType { Layout.fillWidth: true Layout.leftMargin: 16 - headerText: qsTr("Split site tunneling") + headerText: qsTr("Split tunneling") } SwitcherType { diff --git a/deploy/build_windows.bat b/deploy/build_windows.bat index c4b7b8cf..7ac37f14 100644 --- a/deploy/build_windows.bat +++ b/deploy/build_windows.bat @@ -47,7 +47,7 @@ cd %PROJECT_DIR% call "%QT_BIN_DIR:"=%\qt-cmake" . -B %WORK_DIR% cd %WORK_DIR% -cmake --build . --config release +cmake --build . --config release -- /p:UseMultiToolTask=true /m if %errorlevel% neq 0 exit /b %errorlevel% cmake --build . --target clean