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/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts index df2e53eb..a6c0464d 100644 --- a/client/translations/amneziavpn_ru.ts +++ b/client/translations/amneziavpn_ru.ts @@ -70,23 +70,18 @@ ConnectionTypeSelectionDrawer - Add server - + Add new connection + Добавить новое соединение - - Select data type - + + Configure your server + Настроить ваш сервер - - Server IP, login and password - - - - - QR code, key or configuration file - + + Open config file, key or QR code + Открыть файл конфига, ключ или QR код @@ -736,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 Отменить @@ -806,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 this address as domain. - + + 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 Отменить @@ -1079,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 Отменить @@ -1162,12 +1166,12 @@ Already installed containers were found on the server. All installed containers Позволяет подключаться к одним сайтам через VPN, а к другим в обход него - + App-based split tunneling Раздельное VPN-туннелирование приложений - + Allows you to use the VPN only for certain applications Позволяет использовать VPN только для определённых приложений @@ -1258,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 Удалить логи @@ -1585,9 +1594,8 @@ It's okay as long as it's from someone you trust. PageSetupWizardCredentials - Server connection - Подключение к серверу + Подключение к серверу @@ -1610,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 @@ -1620,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 не может быть пустым @@ -1865,7 +1884,7 @@ 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. - + Доступ к управлению сервером. Пользователь, с которым вы делитесь полным доступом к соединению, сможет добавлять и удалять ваши протоколы и службы на сервере, а также изменять настройки. @@ -2499,11 +2518,6 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4 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. - - - 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. @@ -2599,16 +2613,6 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4 error 0x%1: %2 error 0x%1: %2 - - - WireGuard Configuration Highlighter - - - - - &Randomize colors - - SelectLanguageDrawer @@ -2834,37 +2838,27 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4 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. - - - - - 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 2e772823..85af4694 100644 --- a/client/translations/amneziavpn_zh_CN.ts +++ b/client/translations/amneziavpn_zh_CN.ts @@ -73,23 +73,26 @@ - Add server + Add new connection - - Select data type + + Configure your server + + + + + Open config file, key or QR code - Server IP, login and password - 服务器IP，用户名和密码 + 服务器IP，用户名和密码 - QR code, key or configuration file - 二维码，授权码或者配置文件 + 二维码，授权码或者配置文件 @@ -775,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 取消 @@ -845,18 +848,18 @@ 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 this address as domain. + + When configuring WordPress set the this onion address as domain. @@ -864,22 +867,22 @@ Already installed containers were found on the server. All installed containers 配置 WordPress 时，将域设置为此洋葱地址。 - + Remove website 移除网站 - + The site with all data will be removed from the tor network. 网站及其所有数据将从 Tor 网络中删除 - + Continue 继续 - + Cancel 取消 @@ -1141,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 取消 @@ -1228,7 +1236,7 @@ And if you don't like the app, all the more support it - the donation will 配置想要通过VPN访问网站 - + App-based split tunneling 基于应用的隧道分离 @@ -1245,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 @@ -1336,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 清理日志 @@ -1682,9 +1695,13 @@ It's okay as long as it's from someone you trust. PageSetupWizardCredentials - Server connection - 连接服务器 + 连接服务器 + + + + Configure your server + @@ -1712,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 密码或私钥不能为空 @@ -2727,16 +2750,6 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4 error 0x%1: %2 错误 0x%1: %2 - - - WireGuard Configuration Highlighter - - - - - &Randomize colors - - SelectLanguageDrawer diff --git a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml index ccffe21f..1f7b2f29 100644 --- a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml +++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml @@ -27,8 +27,7 @@ DrawerType { Layout.leftMargin: 16 Layout.bottomMargin: 16 - headerText: qsTr("Add server") - descriptionText: qsTr("Select data type") + headerText: qsTr("Add new connection") } LabelWithButtonType { @@ -50,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/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 0d5baa3d..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 this address as domain.") + 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 e0ae7195..92575dda 100644 --- a/client/ui/qml/Pages2/PageSettings.qml +++ b/client/ui/qml/Pages2/PageSettings.qml @@ -110,7 +110,7 @@ PageType { DividerType {} LabelWithButtonType { - visible: GC.isMobile() + visible: GC.isDesktop() Layout.fillWidth: true Layout.preferredHeight: about.height @@ -124,7 +124,7 @@ PageType { } DividerType { - visible: GC.isMobile() + visible: GC.isDesktop() } } } diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml index 6890c7c7..7f0262f9 100644 --- a/client/ui/qml/Pages2/PageSettingsConnection.qml +++ b/client/ui/qml/Pages2/PageSettingsConnection.qml @@ -115,7 +115,6 @@ PageType { 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")