diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index bcefd30f..6c4f1ae4 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -74,7 +74,6 @@ qt6_add_resources(QRC ${I18NQRC} ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc) # -- i18n end if(IOS) - #execute_process(COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/scripts/run-build-cloak.sh) execute_process(COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/ios/scripts/openvpn.sh args WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) endif() diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp index 4bd3b0ef..b6f1b111 100644 --- a/client/containers/containers_defs.cpp +++ b/client/containers/containers_defs.cpp @@ -89,7 +89,6 @@ QMap ContainerProps::containerHumanNames() { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") }, { DockerContainer::Dns, QObject::tr("Amnezia DNS") }, - //{DockerContainer::FileShare, QObject::tr("SMB file sharing service")}, { DockerContainer::Sftp, QObject::tr("Sftp file sharing service") } }; } @@ -108,9 +107,10 @@ QMap ContainerProps::containerDescriptions() { DockerContainer::WireGuard, QObject::tr("WireGuard - New popular VPN protocol with high performance, high speed and low power " "consumption. Recommended for regions with low levels of censorship.") }, - { DockerContainer::Awg, - QObject::tr("AmneziaWG - Special protocol from Amnezia, based on WireGuard. It's fast like WireGuard, but very resistant to blockages. " - "Recommended for regions with high levels of censorship.") }, + { DockerContainer::Awg, + QObject::tr("AmneziaWG - Special protocol from Amnezia, based on WireGuard. It's fast like WireGuard, " + "but very resistant to blockages. " + "Recommended for regions with high levels of censorship.") }, { DockerContainer::Ipsec, QObject::tr("IKEv2 - Modern stable protocol, a bit faster than others, restores connection after " "signal loss. It has native support on the latest versions of Android and iOS.") }, @@ -118,44 +118,108 @@ QMap ContainerProps::containerDescriptions() { DockerContainer::TorWebSite, QObject::tr("Deploy a WordPress site on the Tor network in two clicks.") }, { DockerContainer::Dns, QObject::tr("Replace the current DNS server with your own. This will increase your privacy level.") }, - //{DockerContainer::FileShare, QObject::tr("SMB file sharing service - is Window file sharing protocol")}, { DockerContainer::Sftp, QObject::tr("Creates a file vault on your server to securely store and transfer files.") } }; } QMap ContainerProps::containerDetailedDescriptions() { - return { { DockerContainer::OpenVpn, QObject::tr("OpenVPN container") }, - { DockerContainer::ShadowSocks, QObject::tr("Container with OpenVpn and ShadowSocks") }, - { DockerContainer::Cloak, - QObject::tr("Container with OpenVpn and ShadowSocks protocols " - "configured with traffic masking by Cloak plugin") }, - { DockerContainer::WireGuard, QObject::tr("WireGuard container") }, - { DockerContainer::WireGuard, QObject::tr("AmneziaWG container") }, - { DockerContainer::Ipsec, QObject::tr("IPsec container") }, + return { + { DockerContainer::OpenVpn, + QObject::tr( + "OpenVPN stands as one of the most popular and time-tested VPN protocols available.\n" + "It employs its unique security protocol, " + "leveraging the strength of SSL/TLS for encryption and key exchange. " + "Furthermore, OpenVPN's support for a multitude of authentication methods makes it versatile and adaptable, " + "catering to a wide range of devices and operating systems. " + "Due to its open-source nature, OpenVPN benefits from extensive scrutiny by the global community, " + "which continually reinforces its security. " + "With a strong balance of performance, security, and compatibility, " + "OpenVPN remains a top choice for privacy-conscious individuals and businesses alike.\n\n" + "* Available in the AmneziaVPN across all platforms\n" + "* Normal power consumption on mobile devices\n" + "* Flexible customisation to suit user needs to work with different operating systems and devices\n" + "* Recognised by DPI analysis systems and therefore susceptible to blocking\n" + "* Can operate over both TCP and UDP network protocols.") }, + { DockerContainer::ShadowSocks, + QObject::tr("Shadowsocks, inspired by the SOCKS5 protocol, safeguards the connection using the AEAD cipher. " + "Although Shadowsocks is designed to be discreet and challenging to identify, it isn't identical to a standard HTTPS connection." + "However, certain traffic analysis systems might still detect a Shadowsocks connection. " + "Due to limited support in Amnezia, it's recommended to use AmneziaWG protocol.\n\n" + "* Available in the AmneziaVPN only on desktop platforms\n" + "* Normal power consumption on mobile devices\n\n" + "* Configurable encryption protocol\n" + "* Detectable by some DPI systems\n" + "* Works over TCP network protocol.") }, + { DockerContainer::Cloak, + QObject::tr("This is a combination of the OpenVPN protocol and the Cloak plugin designed specifically for " + "blocking protection.\n\n" + "OpenVPN provides a secure VPN connection by encrypting all Internet traffic between the client " + "and the server.\n\n" + "Cloak protects OpenVPN from detection and blocking. \n\n" + "Cloak can modify packet metadata so that it completely masks VPN traffic as normal web traffic, " + "and also protects the VPN from detection by Active Probing. This makes it very resistant to " + "being detected\n\n" + "Immediately after receiving the first data packet, Cloak authenticates the incoming connection. " + "If authentication fails, the plugin masks the server as a fake website and your VPN becomes " + "invisible to analysis systems.\n\n" + "If there is a extreme level of Internet censorship in your region, we advise you to use only " + "OpenVPN over Cloak from the first connection\n\n" + "* Available in the AmneziaVPN across all platforms\n" + "* High power consumption on mobile devices\n" + "* Flexible settings\n" + "* Not recognised by DPI analysis systems\n" + "* Works over TCP network protocol, 443 port.\n") }, + { DockerContainer::WireGuard, + QObject::tr("A relatively new popular VPN protocol with a simplified architecture.\n" + "Provides stable VPN connection, high performance on all devices. Uses hard-coded encryption " + "settings. WireGuard compared to OpenVPN has lower latency and better data transfer throughput.\n" + "WireGuard is very susceptible to blocking due to its distinct packet signatures. " + "Unlike some other VPN protocols that employ obfuscation techniques, " + "the consistent signature patterns of WireGuard packets can be more easily identified and " + "thus blocked by advanced Deep Packet Inspection (DPI) systems and other network monitoring tools.\n\n" + "* Available in the AmneziaVPN across all platforms\n" + "* Low power consumption\n" + "* Minimum number of settings\n" + "* Easily recognised by DPI analysis systems, susceptible to blocking\n" + "* Works over UDP network protocol.") }, + { DockerContainer::Awg, + QObject::tr("A modern iteration of the popular VPN protocol, " + "AmneziaWG builds upon the foundation set by WireGuard, " + "retaining its simplified architecture and high-performance capabilities across devices.\n" + "While WireGuard is known for its efficiency, " + "it had issues with being easily detected due to its distinct packet signatures. " + "AmneziaWG solves this problem by using better obfuscation methods, " + "making its traffic blend in with regular internet traffic.\n" + "This means that AmneziaWG keeps the fast performance of the original " + "while adding an extra layer of stealth, " + "making it a great choice for those wanting a fast and discreet VPN connection.\n\n" + "* Available in the AmneziaVPN across all platforms\n" + "* Low power consumption\n" + "* Minimum number of settings\n" + "* Not recognised by DPI analysis systems, resistant to blocking\n" + "* Works over UDP network protocol.") }, + { DockerContainer::Ipsec, + QObject::tr("IKEv2, paired with the IPSec encryption layer, stands as a modern and stable VPN protocol.\n" + "One of its distinguishing features is its ability to swiftly switch between networks and devices, " + "making it particularly adaptive in dynamic network environments. \n" + "While it offers a blend of security, stability, and speed, " + "it's essential to note that IKEv2 can be easily detected and is susceptible to blocking.\n\n" + "* Available in the AmneziaVPN only on Windows\n" + "* Low power consumption, on mobile devices\n" + "* Minimal configuration\n" + "* Recognised by DPI analysis systems\n" + "* Works over UDP network protocol, ports 500 and 4500.") }, - { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") }, - { DockerContainer::Dns, QObject::tr("DNS Service") }, - //{DockerContainer::FileShare, QObject::tr("SMB file sharing service - is Window file sharing protocol")}, - { DockerContainer::Sftp, QObject::tr("Sftp file sharing service - is secure FTP service") } }; + { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") }, + { DockerContainer::Dns, QObject::tr("DNS Service") }, + { DockerContainer::Sftp, QObject::tr("Sftp file sharing service - is secure FTP service") } + }; } amnezia::ServiceType ContainerProps::containerService(DockerContainer c) { - switch (c) { - case DockerContainer::None: return ServiceType::None; - case DockerContainer::OpenVpn: return ServiceType::Vpn; - case DockerContainer::Cloak: return ServiceType::Vpn; - case DockerContainer::ShadowSocks: return ServiceType::Vpn; - case DockerContainer::WireGuard: return ServiceType::Vpn; - case DockerContainer::Awg: return ServiceType::Vpn; - case DockerContainer::Ipsec: return ServiceType::Vpn; - case DockerContainer::TorWebSite: return ServiceType::Other; - case DockerContainer::Dns: return ServiceType::Other; - // case DockerContainer::FileShare : return ServiceType::Other; - case DockerContainer::Sftp: return ServiceType::Other; - default: return ServiceType::Other; - } + return ProtocolProps::protocolService(defaultProtocol(c)); } Proto ContainerProps::defaultProtocol(DockerContainer c) @@ -171,7 +235,6 @@ Proto ContainerProps::defaultProtocol(DockerContainer c) case DockerContainer::TorWebSite: return Proto::TorWebSite; case DockerContainer::Dns: return Proto::Dns; - // case DockerContainer::FileShare : return Protocol::FileShare; case DockerContainer::Sftp: return Proto::Sftp; default: return Proto::Any; } @@ -254,7 +317,8 @@ QString ContainerProps::easySetupDescription(DockerContainer container) switch (container) { case DockerContainer::WireGuard: return tr("I just want to increase the level of my privacy."); case DockerContainer::Awg: return tr("I want to bypass censorship. This option recommended in most cases."); - case DockerContainer::Cloak: return tr("Most VPN protocols are blocked. Recommended if other options are not working."); + case DockerContainer::Cloak: + return tr("Most VPN protocols are blocked. Recommended if other options are not working."); default: return ""; } } diff --git a/client/containers/containers_defs.h b/client/containers/containers_defs.h index ce8a2683..b9cb760d 100644 --- a/client/containers/containers_defs.h +++ b/client/containers/containers_defs.h @@ -26,7 +26,6 @@ namespace amnezia // non-vpn TorWebSite, Dns, - // FileShare, Sftp }; Q_ENUM_NS(DockerContainer) diff --git a/client/core/scripts_registry.cpp b/client/core/scripts_registry.cpp index f209a2b1..61ae8962 100644 --- a/client/core/scripts_registry.cpp +++ b/client/core/scripts_registry.cpp @@ -16,7 +16,6 @@ QString amnezia::scriptFolder(amnezia::DockerContainer container) case DockerContainer::TorWebSite: return QLatin1String("website_tor"); case DockerContainer::Dns: return QLatin1String("dns"); - // case DockerContainer::FileShare: return QLatin1String("file_share"); case DockerContainer::Sftp: return QLatin1String("sftp"); default: return ""; } diff --git a/client/protocols/protocols_defs.cpp b/client/protocols/protocols_defs.cpp index b7f6b1d8..b3823a11 100644 --- a/client/protocols/protocols_defs.cpp +++ b/client/protocols/protocols_defs.cpp @@ -66,13 +66,12 @@ QMap ProtocolProps::protocolHumanNames() { Proto::ShadowSocks, "ShadowSocks" }, { Proto::Cloak, "Cloak" }, { Proto::WireGuard, "WireGuard" }, - { Proto::WireGuard, "AmneziaWG" }, + { Proto::Awg, "AmneziaWG" }, { Proto::Ikev2, "IKEv2" }, { Proto::L2tp, "L2TP" }, { Proto::TorWebSite, "Website in Tor network" }, { Proto::Dns, "DNS Service" }, - { Proto::FileShare, "File Sharing Service" }, { Proto::Sftp, QObject::tr("Sftp service") } }; } @@ -90,9 +89,11 @@ amnezia::ServiceType ProtocolProps::protocolService(Proto p) case Proto::ShadowSocks: return ServiceType::Vpn; case Proto::WireGuard: return ServiceType::Vpn; case Proto::Awg: return ServiceType::Vpn; + case Proto::Ikev2: return ServiceType::Vpn; + case Proto::TorWebSite: return ServiceType::Other; case Proto::Dns: return ServiceType::Other; - case Proto::FileShare: return ServiceType::Other; + case Proto::Sftp: return ServiceType::Other; default: return ServiceType::Other; } } @@ -111,7 +112,6 @@ int ProtocolProps::defaultPort(Proto p) case Proto::TorWebSite: return -1; case Proto::Dns: return 53; - case Proto::FileShare: return 139; case Proto::Sftp: return 222; default: return -1; } @@ -129,10 +129,10 @@ bool ProtocolProps::defaultPortChangeable(Proto p) case Proto::Ikev2: return false; case Proto::L2tp: return false; - case Proto::TorWebSite: return true; + case Proto::TorWebSite: return false; case Proto::Dns: return false; - case Proto::FileShare: return false; - default: return -1; + case Proto::Sftp: return true; + default: return false; } } @@ -150,7 +150,6 @@ TransportProto ProtocolProps::defaultTransportProto(Proto p) // non-vpn case Proto::TorWebSite: return TransportProto::Tcp; case Proto::Dns: return TransportProto::Udp; - case Proto::FileShare: return TransportProto::Udp; case Proto::Sftp: return TransportProto::Tcp; } } @@ -169,7 +168,6 @@ bool ProtocolProps::defaultTransportProtoChangeable(Proto p) // non-vpn case Proto::TorWebSite: return false; case Proto::Dns: return false; - case Proto::FileShare: return false; case Proto::Sftp: return false; default: return false; } diff --git a/client/protocols/protocols_defs.h b/client/protocols/protocols_defs.h index d6af132b..ed2ed313 100644 --- a/client/protocols/protocols_defs.h +++ b/client/protocols/protocols_defs.h @@ -195,7 +195,6 @@ namespace amnezia // non-vpn TorWebSite, Dns, - FileShare, Sftp }; Q_ENUM_NS(Proto) diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts index d2ad31b7..7ba02dcb 100644 --- a/client/translations/amneziavpn_ru.ts +++ b/client/translations/amneziavpn_ru.ts @@ -69,31 +69,19 @@ ConnectionTypeSelectionDrawer - Connection data - Данные для подлкючения - - - Server IP, login and password - IP сервера, логин и пароль - - - QR code, key or configuration file - QR-код, ключ, файл настроек или бекап - - - + Add new connection - + Добавить новое соединение - + Configure your server - + Настроить ваш сервер - - Open QR code, key or config file - + + Open config file, key or QR code + Открыть файл конфига, ключ или QR код @@ -177,32 +165,32 @@ Already installed containers were found on the server. All installed containers На сервере обнаружены установленные протоколы и сервисы, все они добавлены в приложение - + Settings updated successfully Настройки успешно обновлены - + Server '%1' was removed Сервер '%1' был удален - + All containers from server '%1' have been removed Все протоклы и сервисы были удалены с сервера '%1' - + %1 has been removed from the server '%2' %1 был удален с сервера '%2' - + Please login as the user Пожалуйста, войдите в систему от имени пользователя - + Server added successfully Сервер успешно добавлен @@ -743,49 +731,49 @@ Already installed containers were found on the server. All installed containers Пароль - + Mount folder on device Смонтировать папку на вашем устройстве - + In order to mount remote SFTP folder as local drive, perform following steps: <br> Чтобы смонтировать SFTP-папку как локальный диск на вашем устройстве, выполните следующие действия - - + + <br>1. Install the latest version of <br>1. Установите последнюю версию - - + + <br>2. Install the latest version of <br>2. Установите последнюю версию - + Detailed instructions Подробные инструкции - + Remove SFTP and all data stored there Удалите SFTP-хранилище со всеми данными - + Remove SFTP and all data stored there? Удалить SFTP-хранилище и все хранящиеся на нем данные? - + Continue Продолжить - + Cancel Отменить @@ -813,37 +801,41 @@ Already installed containers were found on the server. All installed containers Скопировано - + Use <a href="https://www.torproject.org/download/" style="color: #FBB26A;">Tor Browser</a> to open this url. Используйте <a href="https://www.torproject.org/download/" style="color: #FBB26A;">Tor Browser</a> для открытия этой ссылки. - + After installation it takes several minutes while your onion site will become available in the Tor Network. Через несколько минут после установки ваш Onion сайт станет доступен в сети Tor. - - When configuring WordPress set the domain as this onion address. - При настройке WordPress, укажите этот адрес в качестве домена. + + When configuring WordPress set the this onion address as domain. + При настройке WordPress укажите этот onion адрес в качестве домена. - + When configuring WordPress set the this address as domain. + При настройке WordPress укажите этот onion адрес в качестве домена. + + + Remove website Удалить сайт - + The site with all data will be removed from the tor network. Сайт со всеми данными будет удален из сети tor. - + Continue Продолжить - + Cancel Отменить @@ -881,7 +873,7 @@ Already installed containers were found on the server. All installed containers Об AmneziaVPN - + Close application Закрыть приложение @@ -1086,37 +1078,42 @@ Already installed containers were found on the server. All installed containers - + Backup files (*.backup) Файлы резервного копирования (*.backup) - + + Backup file saved + + + + Restore from backup Восстановить из бэкапа - + Open backup file Открыть бэкап файл - + Import settings from a backup file? Импортировать настройки из бэкап файла? - + All current settings will be reset Все текущие настройки будут сброшены - + Continue Продолжить - + Cancel Отменить @@ -1159,22 +1156,22 @@ Already installed containers were found on the server. All installed containers Эти серверы будут использоваться, если не включен AmneziaDNS - + Site-based split tunneling Раздельное туннелирование сайтов - + Allows you to select which sites you want to access through the VPN Позволяет подключаться к одним сайтам через VPN, а к другим в обход него - + App-based split tunneling Раздельное VPN-туннелирование приложений - + Allows you to use the VPN only for certain applications Позволяет использовать VPN только для определённых приложений @@ -1265,32 +1262,37 @@ Already installed containers were found on the server. All installed containers Logs files (*.log) - + + Logs file saved + + + + Save logs to file Сохранить логи в файл - + Clear logs? Очистить логи? - + Continue Продолжить - + Cancel Отменить - + Logs have been cleaned up Логи удалены - + Clear logs Удалить логи @@ -1454,90 +1456,90 @@ Already installed containers were found on the server. All installed containers PageSettingsSplitTunneling - + Addresses from the list should be accessed via VPN Только адреса из списка должны открываться через VPN - + Addresses from the list should not be accessed via VPN Адреса из списка не должны открываться через VPN - + Split tunneling Раздельно VPN-туннелирование - + Mode Режим - + Remove Удалить - + Continue Продолжить - + Cancel Отменить - + Site or IP Сайт или IP - + Import/Export Sites Импорт/экспорт Сайтов - + Import Импорт - + Save site list Сохранить список сайтов - + Save sites Сохранить - - - + + + Sites files (*.json) Sites files (*.json) - + Import a list of sites Импортировать список с сайтами - + Replace site list Заменить список сайтов - - + + Open sites file Открыть список с сайтами - + Add imported sites to existing ones Добавление импортированных сайтов к существующим @@ -1592,9 +1594,8 @@ It's okay as long as it's from someone you trust. PageSetupWizardCredentials - Server connection - Подключение к серверу + Подключение к серверу @@ -1617,7 +1618,13 @@ It's okay as long as it's from someone you trust. Продолжить - + + All data you enter will remain strictly confidential +and will not be shared or disclosed to the Amnezia or any third parties + Все данные, которые вы вводите, останутся строго конфиденциальными и не будут переданы или раскрыты Amnezia или каким-либо третьим сторонам + + + Enter the address in the format 255.255.255.255:88 Введите адрес в формате 255.255.255.255:88 @@ -1627,17 +1634,22 @@ It's okay as long as it's from someone you trust. Login to connect via SSH - + + Configure your server + Настроить ваш сервер + + + Ip address cannot be empty Поле Ip address не может быть пустым - + Login cannot be empty Поле Login не может быть пустым - + Password/private key cannot be empty Поле Password/private key не может быть пустым @@ -1678,14 +1690,22 @@ It's okay as long as it's from someone you trust. Сервер уже был добавлен в приложение - Amnesia has detected that your server is currently - Amnesia обнаружила, что ваш сервер в настоящее время + Amnesia обнаружила, что ваш сервер в настоящее время + + + busy installing other software. Amnesia installation + занят установкой других протоколов или сервисов. Установка Amnesia + + + + Amnezia has detected that your server is currently + - busy installing other software. Amnesia installation - занят установкой других протоколов или сервисов. Установка Amnesia + busy installing other software. Amnezia installation + @@ -1717,22 +1737,22 @@ It's okay as long as it's from someone you trust. Подробнее - + Close Закрыть - + Network protocol Сетевой протокол - + Port Порт - + Install Установка @@ -1869,6 +1889,11 @@ It's okay as long as it's from someone you trust. VPN access without the ability to manage the server Доступ к VPN, без возможности управления сервером + + + Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the server, as well as change settings. + Доступ к управлению сервером. Пользователь, с которым вы делитесь полным доступом к соединению, сможет добавлять и удалять ваши протоколы и службы на сервере, а также изменять настройки. + @@ -1915,11 +1940,6 @@ It's okay as long as it's from someone you trust. Full access Полный доступ - - - Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the servers, as well as change settings. - Доступ к управлению серверами. Пользователь, с которым вы поделились полным доступ к VPN, сможет добавлять и удалять ваши протоколы и сервисы на сервере, а также менять настройки. - @@ -2394,18 +2414,18 @@ It's okay as long as it's from someone you trust. IPsec - + DNS Service DNS Сервис - + Sftp file sharing service Сервис обмена файлами Sftp - + Website in Tor network Веб-сайт в сети Tor @@ -2415,27 +2435,27 @@ It's okay as long as it's from someone you trust. Amnezia DNS - + OpenVPN is the most popular VPN protocol, with flexible configuration options. It uses its own security protocol with SSL/TLS for key exchange. OpenVPN - популярный VPN-протокол, с гибкой настройкой. Имеет собственный протокол безопасности с SSL/TLS для обмена ключами. - + ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but is recognised by analysis systems in some highly censored regions. ShadowSocks - маскирует VPN-трафик под обычный веб-трафик, но распознается системами анализа в некоторых регионах с высоким уровнем цензуры. - + OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probbing detection. Ideal for bypassing blocking in regions with the highest levels of censorship. OpenVPN over Cloak - OpenVPN с маскировкой VPN под web-трафик и защитой от обнаружения active-probbing. Подходит для регионов с самым высоким уровнем цензуры. - + WireGuard - New popular VPN protocol with high performance, high speed and low power consumption. Recommended for regions with low levels of censorship. WireGuard - Популярный VPN-протокол с высокой производительностью, высокой скоростью и низким энергопотреблением. Для регионов с низким уровнем цензуры. - + AmneziaWG - Special protocol from Amnezia, based on WireGuard. It's fast like WireGuard, but very resistant to blockages. Recommended for regions with high levels of censorship. @@ -2455,47 +2475,106 @@ It's okay as long as it's from someone you trust. Замените адрес DNS-сервера на собственный. Это повысит уровень конфиденциальности. - + Creates a file vault on your server to securely store and transfer files. Создайте на сервере файловое хранилище для безопасного хранения и передачи файлов. - - - OpenVPN container - OpenVPN протокол - - Container with OpenVpn and ShadowSocks - Связка протоколов OpenVPN и ShadowSocks + OpenVPN stands as one of the most popular and time-tested VPN protocols available. +It employs its unique security protocol, leveraging the strength of SSL/TLS for encryption and key exchange. Furthermore, OpenVPN's support for a multitude of authentication methods makes it versatile and adaptable, catering to a wide range of devices and operating systems. Due to its open-source nature, OpenVPN benefits from extensive scrutiny by the global community, which continually reinforces its security. With a strong balance of performance, security, and compatibility, OpenVPN remains a top choice for privacy-conscious individuals and businesses alike. + +* Available in the AmneziaVPN across all platforms +* Normal power consumption on mobile devices +* Flexible customisation to suit user needs to work with different operating systems and devices +* Recognised by DPI analysis systems and therefore susceptible to blocking +* Can operate over both TCP and UDP network protocols. + - - Container with OpenVpn and ShadowSocks protocols configured with traffic masking by Cloak plugin - Протоколы OpenVpn и ShadowSocks, с плагином маскировки трафика Cloak + + Shadowsocks, inspired by the SOCKS5 protocol, safeguards the connection using the AEAD cipher. Although Shadowsocks is designed to be discreet and challenging to identify, it isn't identical to a standard HTTPS connection.However, certain traffic analysis systems might still detect a Shadowsocks connection. Due to limited support in Amnezia, it's recommended to use AmneziaWG protocol. + +* Available in the AmneziaVPN only on desktop platforms +* Normal power consumption on mobile devices + +* Configurable encryption protocol +* Detectable by some DPI systems +* Works over TCP network protocol. + - - WireGuard container - WireGuard протокол + + This is a combination of the OpenVPN protocol and the Cloak plugin designed specifically for blocking protection. + +OpenVPN provides a secure VPN connection by encrypting all Internet traffic between the client and the server. + +Cloak protects OpenVPN from detection and blocking. + +Cloak can modify packet metadata so that it completely masks VPN traffic as normal web traffic, and also protects the VPN from detection by Active Probing. This makes it very resistant to being detected + +Immediately after receiving the first data packet, Cloak authenticates the incoming connection. If authentication fails, the plugin masks the server as a fake website and your VPN becomes invisible to analysis systems. + +If there is a extreme level of Internet censorship in your region, we advise you to use only OpenVPN over Cloak from the first connection + +* Available in the AmneziaVPN across all platforms +* High power consumption on mobile devices +* Flexible settings +* Not recognised by DPI analysis systems +* Works over TCP network protocol, 443 port. + + + + + + A relatively new popular VPN protocol with a simplified architecture. +Provides stable VPN connection, high performance on all devices. Uses hard-coded encryption settings. WireGuard compared to OpenVPN has lower latency and better data transfer throughput. +WireGuard is very susceptible to blocking due to its distinct packet signatures. Unlike some other VPN protocols that employ obfuscation techniques, the consistent signature patterns of WireGuard packets can be more easily identified and thus blocked by advanced Deep Packet Inspection (DPI) systems and other network monitoring tools. + +* Available in the AmneziaVPN across all platforms +* Low power consumption +* Minimum number of settings +* Easily recognised by DPI analysis systems, susceptible to blocking +* Works over UDP network protocol. + + + + + A modern iteration of the popular VPN protocol, AmneziaWG builds upon the foundation set by WireGuard, retaining its simplified architecture and high-performance capabilities across devices. +While WireGuard is known for its efficiency, it had issues with being easily detected due to its distinct packet signatures. AmneziaWG solves this problem by using better obfuscation methods, making its traffic blend in with regular internet traffic. +This means that AmneziaWG keeps the fast performance of the original while adding an extra layer of stealth, making it a great choice for those wanting a fast and discreet VPN connection. + +* Available in the AmneziaVPN across all platforms +* Low power consumption +* Minimum number of settings +* Not recognised by DPI analysis systems, resistant to blocking +* Works over UDP network protocol. + + + + + A modern stable protocol. + +IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4500 protecting them with strong 3DES and AES crypto algorithms. Allows very fast switching between networks and devices. Due to its security, stability and speed, IKEv2 is currently one of the best VPN solutions for mobile devices. Vulnerable to detection and blocking. + +* Available in the AmneziaVPN only on Windows +* Low power consumption, on mobile devices +* Minimal configuration +* Recognised by DPI analysis systems +* Works over UDP network protocol + - AmneziaWG container - AmneziaWG протокол + AmneziaWG протокол - - IPsec container - IPsec протокол - - - + Sftp file sharing service - is secure FTP service Сервис обмена файлами Sftp - безопасный FTP-сервис - + Sftp service Сервис SFTP @@ -2777,34 +2856,34 @@ It's okay as long as it's from someone you trust. amnezia::ContainerProps - + Low Низкий - + Medium or High - + Спедний или Высокий - + Extreme - + Экстремальный - + I just want to increase the level of my privacy. - + Я просто хочу повысить уровень своей приватности. - + I want to bypass censorship. This option recommended in most cases. - + Я хочу обойти блокировки. Этот вариант рекомендуется в большинстве случаев. - + Most VPN protocols are blocked. Recommended if other options are not working. - + Большинство VPN протоколов заблокированы. Рекомендуется, если другие варианты не работают. High diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts index 7a08682c..d68981c4 100644 --- a/client/translations/amneziavpn_zh_CN.ts +++ b/client/translations/amneziavpn_zh_CN.ts @@ -68,19 +68,31 @@ ConnectionTypeSelectionDrawer - Connection data - 连接方式 + 连接方式 + + + + Add new connection + + + + + Configure your server + + + + + Open config file, key or QR code + - Server IP, login and password - 服务器IP，用户名和密码 + 服务器IP，用户名和密码 - QR code, key or configuration file - 二维码，授权码或者配置文件 + 二维码，授权码或者配置文件 @@ -171,22 +183,22 @@ Already installed containers were found on the server. All installed containers 在服务上发现已经安装协议并添加至应用 - + Settings updated successfully 配置更新成功 - + Server '%1' was removed 已移除服务器 '%1' - + All containers from server '%1' have been removed 服务器 '%1' 的所有容器已移除 - + %1 has been removed from the server '%2' %1 已从服务器 '%2' 上移除 @@ -207,12 +219,12 @@ Already installed containers were found on the server. All installed containers 协议已从 - + Please login as the user 请以用户身份登录 - + Server added successfully 增加服务器成功 @@ -766,49 +778,49 @@ Already installed containers were found on the server. All installed containers 密码 - + Mount folder on device 挂载文件夹 - + In order to mount remote SFTP folder as local drive, perform following steps: <br> 为将远程 SFTP 文件夹挂载到本地，请执行以下步骤: <br> - - + + <br>1. Install the latest version of <br>1. 安装最新版的 - - + + <br>2. Install the latest version of <br>2. 安装最新版的 - + Detailed instructions 详细说明 - + Remove SFTP and all data stored there 移除SFTP和其本地所有数据 - + Remove SFTP and all data stored there? 移除SFTP和其本地所有数据？ - + Continue 继续 - + Cancel 取消 @@ -836,37 +848,41 @@ Already installed containers were found on the server. All installed containers 已拷贝 - + Use <a href="https://www.torproject.org/download/" style="color: #FBB26A;">Tor Browser</a> to open this url. 用 <a href="https://www.torproject.org/download/" style="color: #FBB26A;">Tor 浏览器</a> 打开上面网址 - + After installation it takes several minutes while your onion site will become available in the Tor Network. 完成安装几分钟后,洋葱站点才会在 Tor 网络中生效。 - - When configuring WordPress set the domain as this onion address. - 配置 WordPress 时，将域设置为此洋葱地址。 + + When configuring WordPress set the this onion address as domain. + - + When configuring WordPress set the domain as this onion address. + 配置 WordPress 时，将域设置为此洋葱地址。 + + + Remove website 移除网站 - + The site with all data will be removed from the tor network. 网站及其所有数据将从 Tor 网络中删除 - + Continue 继续 - + Cancel 取消 @@ -904,7 +920,7 @@ Already installed containers were found on the server. All installed containers 关于 - + Close application 关闭应用 @@ -1128,37 +1144,42 @@ And if you don't like the app, all the more support it - the donation will - + Backup files (*.backup) - + + Backup file saved + + + + Restore from backup 从备份还原 - + Open backup file 打开备份文件 - + Import settings from a backup file? 从备份文件导入设置？ - + All current settings will be reset 当前所有设置将重置 - + Continue 继续 - + Cancel 取消 @@ -1205,17 +1226,17 @@ And if you don't like the app, all the more support it - the donation will 如果未使用或未安装AmneziaDNS - + Site-based split tunneling 基于网站的隧道分离 - + Allows you to select which sites you want to access through the VPN 配置想要通过VPN访问网站 - + App-based split tunneling 基于应用的隧道分离 @@ -1232,7 +1253,7 @@ And if you don't like the app, all the more support it - the donation will 应用级VPN分流 - + Allows you to use the VPN only for certain applications 仅指定应用使用VPN @@ -1323,32 +1344,37 @@ And if you don't like the app, all the more support it - the donation will - + + Logs file saved + + + + Save logs to file 保存日志到文件 - + Clear logs? 清理日志？ - + Continue 继续 - + Cancel 取消 - + Logs have been cleaned up 日志已清理 - + Clear logs 清理日志 @@ -1532,90 +1558,90 @@ And if you don't like the app, all the more support it - the donation will 网站级VPN分流 - + Addresses from the list should be accessed via VPN 仅使用VPN访问 - + Addresses from the list should not be accessed via VPN 不使用VPN访问 - + Split tunneling 隧道分离 - + Mode 规则 - + Remove 移除 - + Continue 继续 - + Cancel 取消 - + Site or IP 网站或IP地址 - + Import/Export Sites 导入/导出网站 - + Import 导入 - + Save site list 保存网址 - + Save sites 保存网址 - - - + + + Sites files (*.json) - + Import a list of sites 导入网址列表 - + Replace site list 替换网址列表 - - + + Open sites file 打开网址文件 - + Add imported sites to existing ones 将导入的网址添加到现有网址中 @@ -1669,9 +1695,13 @@ It's okay as long as it's from someone you trust. PageSetupWizardCredentials - Server connection - 连接服务器 + 连接服务器 + + + + Configure your server + @@ -1699,22 +1729,28 @@ It's okay as long as it's from someone you trust. 继续 - + + All data you enter will remain strictly confidential +and will not be shared or disclosed to the Amnezia or any third parties + + + + Ip address cannot be empty IP不能为空 - + Enter the address in the format 255.255.255.255:88 按照这种格式输入 255.255.255.255:88 - + Login cannot be empty 账号不能为空 - + Password/private key cannot be empty 密码或私钥不能为空 @@ -1762,13 +1798,21 @@ It's okay as long as it's from someone you trust. - Amnesia has detected that your server is currently - Amnezia 检测到您的服务器当前 + Amnezia has detected that your server is currently + + busy installing other software. Amnezia installation + + + + Amnesia has detected that your server is currently + Amnezia 检测到您的服务器当前 + + busy installing other software. Amnesia installation - 正安装其他软件。Amnezia安装 + 正安装其他软件。Amnezia安装 @@ -1794,22 +1838,22 @@ It's okay as long as it's from someone you trust. 更多细节 - + Close 关闭 - + Network protocol 网络协议 - + Port 端口 - + Install 安装 @@ -1968,8 +2012,12 @@ It's okay as long as it's from someone you trust. + Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the server, as well as change settings. + + + Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the servers, as well as change settings. - 除访问VPN外，用户还能添加和删除协议、服务以及更改配置信息 + 除访问VPN外，用户还能添加和删除协议、服务以及更改配置信息 Full access to server @@ -2273,7 +2321,7 @@ It's okay as long as it's from someone you trust. QObject - + Sftp service Sftp 服务 @@ -2489,7 +2537,7 @@ It's okay as long as it's from someone you trust. - + Website in Tor network 在 Tor 网络中架设网站 @@ -2499,31 +2547,35 @@ It's okay as long as it's from someone you trust. - + Sftp file sharing service SFTP文件共享服务 - + OpenVPN is the most popular VPN protocol, with flexible configuration options. It uses its own security protocol with SSL/TLS for key exchange. OpenVPN 是最流行的 VPN 协议，具有灵活的配置选项。它使用自己的安全协议与 SSL/TLS 进行密钥交换。 - + ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but is recognised by analysis systems in some highly censored regions. ShadowSocks - 混淆 VPN 流量，使其与正常的 Web 流量相似，但在一些审查力度高的地区可以被分析系统识别。 - + OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probbing detection. Ideal for bypassing blocking in regions with the highest levels of censorship. OpenVPN over Cloak - OpenVPN 与 VPN 具有伪装成网络流量和防止主动探测检测的保护。非常适合绕过审查力度特别强的地区的封锁。 - - + WireGuard - New popular VPN protocol with high performance, high speed and low power consumption. Recommended for regions with low levels of censorship. WireGuard - 新型流行的VPN协议，具有高性能、高速度和低功耗。建议用于审查力度较低的地区 + + + AmneziaWG - Special protocol from Amnezia, based on WireGuard. It's fast like WireGuard, but very resistant to blockages. Recommended for regions with high levels of censorship. + + IKEv2 - Modern stable protocol, a bit faster than others, restores connection after signal loss. It has native support on the latest versions of Android and iOS. @@ -2540,47 +2592,122 @@ It's okay as long as it's from someone you trust. 将当前的 DNS 服务器替换为您自己的。这将提高您的隐私保护级别。 - + Creates a file vault on your server to securely store and transfer files. 在您的服务器上创建文件仓库，以便安全地存储和传输文件 - - - OpenVPN container - OpenVPN容器 - + OpenVPN stands as one of the most popular and time-tested VPN protocols available. +It employs its unique security protocol, leveraging the strength of SSL/TLS for encryption and key exchange. Furthermore, OpenVPN's support for a multitude of authentication methods makes it versatile and adaptable, catering to a wide range of devices and operating systems. Due to its open-source nature, OpenVPN benefits from extensive scrutiny by the global community, which continually reinforces its security. With a strong balance of performance, security, and compatibility, OpenVPN remains a top choice for privacy-conscious individuals and businesses alike. + +* Available in the AmneziaVPN across all platforms +* Normal power consumption on mobile devices +* Flexible customisation to suit user needs to work with different operating systems and devices +* Recognised by DPI analysis systems and therefore susceptible to blocking +* Can operate over both TCP and UDP network protocols. + + + + + Shadowsocks, inspired by the SOCKS5 protocol, safeguards the connection using the AEAD cipher. Although Shadowsocks is designed to be discreet and challenging to identify, it isn't identical to a standard HTTPS connection.However, certain traffic analysis systems might still detect a Shadowsocks connection. Due to limited support in Amnezia, it's recommended to use AmneziaWG protocol. + +* Available in the AmneziaVPN only on desktop platforms +* Normal power consumption on mobile devices + +* Configurable encryption protocol +* Detectable by some DPI systems +* Works over TCP network protocol. + + + + + This is a combination of the OpenVPN protocol and the Cloak plugin designed specifically for blocking protection. + +OpenVPN provides a secure VPN connection by encrypting all Internet traffic between the client and the server. + +Cloak protects OpenVPN from detection and blocking. + +Cloak can modify packet metadata so that it completely masks VPN traffic as normal web traffic, and also protects the VPN from detection by Active Probing. This makes it very resistant to being detected + +Immediately after receiving the first data packet, Cloak authenticates the incoming connection. If authentication fails, the plugin masks the server as a fake website and your VPN becomes invisible to analysis systems. + +If there is a extreme level of Internet censorship in your region, we advise you to use only OpenVPN over Cloak from the first connection + +* Available in the AmneziaVPN across all platforms +* High power consumption on mobile devices +* Flexible settings +* Not recognised by DPI analysis systems +* Works over TCP network protocol, 443 port. + + + + + + A relatively new popular VPN protocol with a simplified architecture. +Provides stable VPN connection, high performance on all devices. Uses hard-coded encryption settings. WireGuard compared to OpenVPN has lower latency and better data transfer throughput. +WireGuard is very susceptible to blocking due to its distinct packet signatures. Unlike some other VPN protocols that employ obfuscation techniques, the consistent signature patterns of WireGuard packets can be more easily identified and thus blocked by advanced Deep Packet Inspection (DPI) systems and other network monitoring tools. + +* Available in the AmneziaVPN across all platforms +* Low power consumption +* Minimum number of settings +* Easily recognised by DPI analysis systems, susceptible to blocking +* Works over UDP network protocol. + + + + + A modern iteration of the popular VPN protocol, AmneziaWG builds upon the foundation set by WireGuard, retaining its simplified architecture and high-performance capabilities across devices. +While WireGuard is known for its efficiency, it had issues with being easily detected due to its distinct packet signatures. AmneziaWG solves this problem by using better obfuscation methods, making its traffic blend in with regular internet traffic. +This means that AmneziaWG keeps the fast performance of the original while adding an extra layer of stealth, making it a great choice for those wanting a fast and discreet VPN connection. + +* Available in the AmneziaVPN across all platforms +* Low power consumption +* Minimum number of settings +* Not recognised by DPI analysis systems, resistant to blocking +* Works over UDP network protocol. + + + + + A modern stable protocol. + +IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4500 protecting them with strong 3DES and AES crypto algorithms. Allows very fast switching between networks and devices. Due to its security, stability and speed, IKEv2 is currently one of the best VPN solutions for mobile devices. Vulnerable to detection and blocking. + +* Available in the AmneziaVPN only on Windows +* Low power consumption, on mobile devices +* Minimal configuration +* Recognised by DPI analysis systems +* Works over UDP network protocol + + + + OpenVPN container + OpenVPN容器 + + Container with OpenVpn and ShadowSocks - 含 OpenVpn 和 ShadowSocks 的容器 + 含 OpenVpn 和 ShadowSocks 的容器 - Container with OpenVpn and ShadowSocks protocols configured with traffic masking by Cloak plugin - 含 OpenVpn 和 ShadowSocks 协议的容器，通过 Cloak 插件配置混淆流量 + 含 OpenVpn 和 ShadowSocks 协议的容器，通过 Cloak 插件配置混淆流量 - WireGuard container - WireGuard 容器 + WireGuard 容器 - - AmneziaWG container - - - - IPsec container - IPsec 容器 + IPsec 容器 - + DNS Service DNS 服务 - + Sftp file sharing service - is secure FTP service Sftp 文件共享服务 - 安全的 FTP 服务 @@ -2866,34 +2993,54 @@ It's okay as long as it's from someone you trust. amnezia::ContainerProps - + Low 低 - + + Medium or High + + + + + Extreme + + + + + I just want to increase the level of my privacy. + + + + + I want to bypass censorship. This option recommended in most cases. + + + + + Most VPN protocols are blocked. Recommended if other options are not working. + + + High - 高 + 高 - Medium - 中 + 中 - I just want to increase the level of privacy - 我只是想提高隐私保护级别 + 我只是想提高隐私保护级别 - Many foreign websites and VPN providers are blocked - 大多国外网站和VPN提供商被屏蔽 + 大多国外网站和VPN提供商被屏蔽 - Some foreign sites are blocked, but VPN providers are not blocked - 一些国外网站被屏蔽，但VPN提供商未被屏蔽 + 一些国外网站被屏蔽，但VPN提供商未被屏蔽 diff --git a/client/ui/controllers/installController.cpp b/client/ui/controllers/installController.cpp index 34917cac..6eec9c6b 100644 --- a/client/ui/controllers/installController.cpp +++ b/client/ui/controllers/installController.cpp @@ -183,7 +183,9 @@ void InstallController::installContainer(DockerContainer container, QJsonObject "All installed containers have been added to the application"); } - m_containersModel->setData(m_containersModel->index(0, 0), container, ContainersModel::Roles::IsDefaultRole); + if (ContainerProps::containerService(container) == ServiceType::Vpn) { + m_containersModel->setData(m_containersModel->index(0, 0), container, ContainersModel::Roles::IsDefaultRole); + } emit installContainerFinished(finishMessage, ContainerProps::containerService(container) == ServiceType::Other); return; } diff --git a/client/ui/models/protocols_model.cpp b/client/ui/models/protocols_model.cpp index 8c999470..5826025e 100644 --- a/client/ui/models/protocols_model.cpp +++ b/client/ui/models/protocols_model.cpp @@ -78,12 +78,11 @@ PageLoader::PageEnum ProtocolsModel::protocolPage(Proto protocol) const case Proto::ShadowSocks: return PageLoader::PageEnum::PageProtocolShadowSocksSettings; case Proto::WireGuard: return PageLoader::PageEnum::PageProtocolWireGuardSettings; case Proto::Ikev2: return PageLoader::PageEnum::PageProtocolIKev2Settings; - case Proto::L2tp: return PageLoader::PageEnum::PageProtocolOpenVpnSettings; + case Proto::L2tp: return PageLoader::PageEnum::PageProtocolIKev2Settings; // non-vpn - case Proto::TorWebSite: return PageLoader::PageEnum::PageProtocolOpenVpnSettings; - case Proto::Dns: return PageLoader::PageEnum::PageProtocolOpenVpnSettings; - case Proto::FileShare: return PageLoader::PageEnum::PageProtocolOpenVpnSettings; - case Proto::Sftp: return PageLoader::PageEnum::PageProtocolOpenVpnSettings; + case Proto::TorWebSite: return PageLoader::PageEnum::PageServiceTorWebsiteSettings; + case Proto::Dns: return PageLoader::PageEnum::PageServiceDnsSettings; + case Proto::Sftp: return PageLoader::PageEnum::PageServiceSftpSettings; default: return PageLoader::PageEnum::PageProtocolOpenVpnSettings; } } diff --git a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml index 81ccd245..1f7b2f29 100644 --- a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml +++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml @@ -20,16 +20,14 @@ DrawerType { anchors.right: parent.right spacing: 0 - Header2TextType { + Header2Type { Layout.fillWidth: true Layout.topMargin: 24 Layout.rightMargin: 16 Layout.leftMargin: 16 - Layout.bottomMargin: 32 - Layout.alignment: Qt.AlignHCenter + Layout.bottomMargin: 16 - text: qsTr("Add new connection") - wrapMode: Text.WordWrap + headerText: qsTr("Add new connection") } LabelWithButtonType { @@ -51,7 +49,7 @@ DrawerType { LabelWithButtonType { Layout.fillWidth: true - text: qsTr("Open QR code, key or config file") + text: qsTr("Open config file, key or QR code") rightImageSource: "qrc:/images/controls/chevron-right.svg" clickedFunction: function() { diff --git a/client/ui/qml/Config/GlobalConfig.qml b/client/ui/qml/Config/GlobalConfig.qml index a9edd543..0855101c 100644 --- a/client/ui/qml/Config/GlobalConfig.qml +++ b/client/ui/qml/Config/GlobalConfig.qml @@ -26,4 +26,16 @@ Item { } return false } + + TextEdit{ + id: clipboard + visible: false + } + + function copyToClipBoard(text) { + clipboard.text = text + clipboard.selectAll() + clipboard.copy() + clipboard.select(0, 0) + } } diff --git a/client/ui/qml/Controls2/LabelWithButtonType.qml b/client/ui/qml/Controls2/LabelWithButtonType.qml index 6bc45a8c..8b85d591 100644 --- a/client/ui/qml/Controls2/LabelWithButtonType.qml +++ b/client/ui/qml/Controls2/LabelWithButtonType.qml @@ -20,7 +20,9 @@ Item { property bool isLeftImageHoverEnabled: true //todo separete this qml file to 3 property string textColor: "#d7d8db" + property string textDisabledColor: "#878B91" property string descriptionColor: "#878B91" + property string descriptionDisabledColor: "#494B50" property real textOpacity: 1.0 property string rightImageColor: "#d7d8db" @@ -71,7 +73,14 @@ Item { ListItemTitleType { text: root.text - color: root.descriptionOnTop ? root.descriptionColor : root.textColor + color: { + if (root.enabled) { + return root.descriptionOnTop ? root.descriptionColor : root.textColor + } else { + return root.descriptionOnTop ? root.descriptionDisabledColor : root.textDisabledColor + } + } + maximumLineCount: root.textMaximumLineCount elide: root.textElide @@ -96,7 +105,13 @@ Item { id: description text: root.descriptionText - color: root.descriptionOnTop ? root.textColor : root.descriptionColor + color: { + if (root.enabled) { + return root.descriptionOnTop ? root.textColor : root.descriptionColor + } else { + return root.descriptionOnTop ? root.textDisabledColor : root.descriptionDisabledColor + } + } opacity: root.textOpacity @@ -157,7 +172,7 @@ Item { MouseArea { anchors.fill: parent cursorShape: Qt.PointingHandCursor - hoverEnabled: true + hoverEnabled: root.enabled onEntered: { if (rightImageSource) { diff --git a/client/ui/qml/Pages2/PageServiceSftpSettings.qml b/client/ui/qml/Pages2/PageServiceSftpSettings.qml index 61ba663d..b12302dd 100644 --- a/client/ui/qml/Pages2/PageServiceSftpSettings.qml +++ b/client/ui/qml/Pages2/PageServiceSftpSettings.qml @@ -96,7 +96,7 @@ PageType { rightImageColor: "#D7D8DB" clickedFunction: function() { - col.copyToClipBoard(descriptionText) + GC.copyToClipBoard(descriptionText) PageController.showNotificationMessage(qsTr("Copied")) } } @@ -113,7 +113,7 @@ PageType { rightImageColor: "#D7D8DB" clickedFunction: function() { - col.copyToClipBoard(descriptionText) + GC.copyToClipBoard(descriptionText) PageController.showNotificationMessage(qsTr("Copied")) } } @@ -130,7 +130,7 @@ PageType { rightImageColor: "#D7D8DB" clickedFunction: function() { - col.copyToClipBoard(descriptionText) + GC.copyToClipBoard(descriptionText) PageController.showNotificationMessage(qsTr("Copied")) } } @@ -147,23 +147,11 @@ PageType { rightImageColor: "#D7D8DB" clickedFunction: function() { - col.copyToClipBoard(descriptionText) + GC.copyToClipBoard(descriptionText) PageController.showNotificationMessage(qsTr("Copied")) } } - TextEdit{ - id: clipboard - visible: false - } - - function copyToClipBoard(text) { - clipboard.text = text - clipboard.selectAll() - clipboard.copy() - clipboard.select(0, 0) - } - BasicButtonType { visible: !GC.isMobile() diff --git a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml index 04d7076c..3bfa5bb0 100644 --- a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml +++ b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml @@ -78,23 +78,11 @@ PageType { rightImageColor: "#D7D8DB" clickedFunction: function() { - content.copyToClipBoard(descriptionText) + GC.copyToClipBoard(descriptionText) PageController.showNotificationMessage(qsTr("Copied")) } } - TextEdit{ - id: clipboard - visible: false - } - - function copyToClipBoard(text) { - clipboard.text = text - clipboard.selectAll() - clipboard.copy() - clipboard.select(0, 0) - } - ParagraphTextType { Layout.fillWidth: true Layout.topMargin: 40 @@ -121,7 +109,7 @@ PageType { Layout.leftMargin: 16 Layout.rightMargin: 16 - text: qsTr("When configuring WordPress set the domain as this onion address.") + text: qsTr("When configuring WordPress set the this onion address as domain.") } BasicButtonType { diff --git a/client/ui/qml/Pages2/PageSettings.qml b/client/ui/qml/Pages2/PageSettings.qml index d90f3ec8..92575dda 100644 --- a/client/ui/qml/Pages2/PageSettings.qml +++ b/client/ui/qml/Pages2/PageSettings.qml @@ -110,6 +110,7 @@ PageType { DividerType {} LabelWithButtonType { + visible: GC.isDesktop() Layout.fillWidth: true Layout.preferredHeight: about.height @@ -122,7 +123,9 @@ PageType { } } - DividerType {} + DividerType { + visible: GC.isDesktop() + } } } } diff --git a/client/ui/qml/Pages2/PageSettingsBackup.qml b/client/ui/qml/Pages2/PageSettingsBackup.qml index 96214893..81be0465 100644 --- a/client/ui/qml/Pages2/PageSettingsBackup.qml +++ b/client/ui/qml/Pages2/PageSettingsBackup.qml @@ -103,6 +103,7 @@ PageType { PageController.showBusyIndicator(true) SettingsController.backupAppConfig(fileName) PageController.showBusyIndicator(false) + PageController.showNotificationMessage(qsTr("Backup file saved")) } } } diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml index b5343d24..7f0262f9 100644 --- a/client/ui/qml/Pages2/PageSettingsConnection.qml +++ b/client/ui/qml/Pages2/PageSettingsConnection.qml @@ -94,6 +94,8 @@ PageType { DividerType {} LabelWithButtonType { + visible: !GC.isMobile() + Layout.fillWidth: true text: qsTr("Site-based split tunneling") @@ -105,11 +107,14 @@ PageType { } } - DividerType {} + DividerType { + visible: !GC.isMobile() + } LabelWithButtonType { + visible: !GC.isMobile() + Layout.fillWidth: true - visible: false text: qsTr("App-based split tunneling") descriptionText: qsTr("Allows you to use the VPN only for certain applications") @@ -119,7 +124,9 @@ PageType { } } - // DividerType {} + DividerType { + visible: !GC.isMobile() + } } } } diff --git a/client/ui/qml/Pages2/PageSettingsLogging.qml b/client/ui/qml/Pages2/PageSettingsLogging.qml index 4141f51f..840c41d4 100644 --- a/client/ui/qml/Pages2/PageSettingsLogging.qml +++ b/client/ui/qml/Pages2/PageSettingsLogging.qml @@ -115,6 +115,7 @@ PageType { PageController.showBusyIndicator(true) SettingsController.exportLogsFile(fileName) PageController.showBusyIndicator(false) + PageController.showNotificationMessage(qsTr("Logs file saved")) } } } diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml index 45f2dae9..cc4973f1 100644 --- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml +++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml @@ -20,6 +20,10 @@ import "../Components" PageType { id: root + property bool pageEnabled: { + return !ConnectionController.isConnected + } + Connections { target: SitesController @@ -78,6 +82,8 @@ PageType { RowLayout { HeaderType { + enabled: root.pageEnabled + Layout.fillWidth: true Layout.leftMargin: 16 @@ -89,6 +95,8 @@ PageType { property int lastActiveRouteMode: routeMode.onlyForwardSites + enabled: root.pageEnabled + Layout.fillWidth: true Layout.rightMargin: 16 @@ -115,7 +123,7 @@ PageType { drawerHeight: 0.4375 - enabled: switcher.checked + enabled: switcher.checked && root.pageEnabled headerText: qsTr("Mode") @@ -155,9 +163,9 @@ PageType { FlickableType { anchors.top: header.bottom anchors.topMargin: 16 - contentHeight: col.implicitHeight + connectButton.implicitHeight + connectButton.anchors.bottomMargin + connectButton.anchors.topMargin + contentHeight: col.implicitHeight + addSiteButton.implicitHeight + addSiteButton.anchors.bottomMargin + addSiteButton.anchors.topMargin - enabled: switcher.checked + enabled: switcher.checked && root.pageEnabled Column { id: col @@ -221,8 +229,17 @@ PageType { } } + Rectangle { + anchors.fill: addSiteButton + anchors.bottomMargin: -24 + color: "#0E0E11" + opacity: 0.8 + } + RowLayout { - id: connectButton + id: addSiteButton + + enabled: root.pageEnabled anchors.bottom: parent.bottom anchors.left: parent.left diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml index 84f6be89..bd1fd7e6 100644 --- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml +++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml @@ -59,8 +59,8 @@ PageType { function onServerIsBusy(isBusy) { if (isBusy) { - root.progressBarText = qsTr("Amnesia has detected that your server is currently ") + - qsTr("busy installing other software. Amnesia installation ") + + root.progressBarText = qsTr("Amnezia has detected that your server is currently ") + + qsTr("busy installing other software. Amnezia installation ") + qsTr("will pause until the server finishes installing other software") root.isTimerRunning = false } else { diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml index 7535464a..2b97f044 100644 --- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml +++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml @@ -144,33 +144,16 @@ PageType { headerText: name } - TextField { - implicitWidth: parent.width + ParagraphTextType { Layout.fillWidth: true Layout.topMargin: 16 Layout.bottomMargin: 16 - padding: 0 - leftPadding: 0 - height: 24 - - color: "#D7D8DB" - - font.pixelSize: 16 - font.weight: Font.Medium - font.family: "PT Root UI VF" - text: detailedDescription - - wrapMode: Text.WordWrap - - readOnly: true - background: Rectangle { - anchors.fill: parent - color: "transparent" - } + textFormat: Text.MarkdownText } + Rectangle { Layout.fillHeight: true color: "transparent" diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml index a92d3e51..aa04a1fe 100644 --- a/client/ui/qml/Pages2/PageShare.qml +++ b/client/ui/qml/Pages2/PageShare.qml @@ -172,7 +172,7 @@ PageType { Layout.bottomMargin: 24 text: accessTypeSelector.currentIndex === 0 ? qsTr("VPN access without the ability to manage the server") : - qsTr("Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the servers, as well as change settings.") + qsTr("Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the server, as well as change settings.") color: "#878B91" } 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