diff --git a/client/protocols/protocols_defs.cpp b/client/protocols/protocols_defs.cpp index b7f6b1d8..5964bd87 100644 --- a/client/protocols/protocols_defs.cpp +++ b/client/protocols/protocols_defs.cpp @@ -66,7 +66,7 @@ QMap ProtocolProps::protocolHumanNames() { Proto::ShadowSocks, "ShadowSocks" }, { Proto::Cloak, "Cloak" }, { Proto::WireGuard, "WireGuard" }, - { Proto::WireGuard, "AmneziaWG" }, + { Proto::Awg, "AmneziaWG" }, { Proto::Ikev2, "IKEv2" }, { Proto::L2tp, "L2TP" }, diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts index 94ce0b3a..73a7dead 100644 --- a/client/translations/amneziavpn_ru.ts +++ b/client/translations/amneziavpn_ru.ts @@ -1704,22 +1704,22 @@ It's okay as long as it's from someone you trust. - + Close - + Network protocol - + Port - + Install diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts index 359655f8..2e772823 100644 --- a/client/translations/amneziavpn_zh_CN.ts +++ b/client/translations/amneziavpn_zh_CN.ts @@ -1807,22 +1807,22 @@ It's okay as long as it's from someone you trust. 更多细节 - + Close 关闭 - + Network protocol 网络协议 - + Port 端口 - + Install 安装 diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml index 4af774fa..ab02ace4 100644 --- a/client/ui/qml/Pages2/PageStart.qml +++ b/client/ui/qml/Pages2/PageStart.qml @@ -44,9 +44,9 @@ PageType { tabBar.enabled = !visible } - function onShowTopCloseButton(visible) { - topCloseButton.visible = visible - } +// function onShowTopCloseButton(visible) { +// topCloseButton.visible = visible +// } function onEnableTabBar(enabled) { tabBar.enabled = enabled @@ -137,10 +137,10 @@ PageType { tabBarStackView.push(pagePath, { "objectName" : pagePath }) } - onWidthChanged: { - topCloseButton.x = tabBarStackView.x + tabBarStackView.width - - topCloseButton.buttonWidth - topCloseButton.rightPadding - } +// onWidthChanged: { +// topCloseButton.x = tabBarStackView.x + tabBarStackView.width - +// topCloseButton.buttonWidth - topCloseButton.rightPadding +// } } TabBar { @@ -234,11 +234,12 @@ PageType { z: 1 } - TopCloseButtonType { - id: topCloseButton - x: tabBarStackView.width - topCloseButton.buttonWidth - topCloseButton.rightPadding - z: 1 - } +// TopCloseButtonType { +// id: topCloseButton + +// x: tabBarStackView.width - topCloseButton.buttonWidth - topCloseButton.rightPadding +// z: 1 +// } ConnectionTypeSelectionDrawer { id: connectionTypeSelection