AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ui fixes

Browse source
This commit is contained in:
pokamest 2023-10-14 23:59:46 +01:00
parent 37c18c5d3c
commit f65e4066e3
9 changed files with 171 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/CMakeLists.txt
View file

@ -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()

164
client/translations/amneziavpn_ru.ts
View file

@ -70,23 +70,18 @@
<name>ConnectionTypeSelectionDrawer</name>
<message>
<location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="30"/>
<source>Add server</source>
<translation type="unfinished"></translation>
<source>Add new connection</source>
<translation>Добавить новое соединение</translation>
</message>
<message>
<location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="31"/>
<source>Select data type</source>
<translation type="unfinished"></translation>
<location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="38"/>
<source>Configure your server</source>
<translation>Настроить ваш сервер</translation>
</message>
<message>
<location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="39"/>
<source>Server IP, login and password</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="53"/>
<source>QR code, key or configuration file</source>
<translation type="unfinished"></translation>
<location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="52"/>
<source>Open config file, key or QR code</source>
<translation>Открыть файл конфига, ключ или QR код</translation>
</message>
</context>
<context>
@ -736,49 +731,49 @@ Already installed containers were found on the server. All installed containers
<translation>Пароль</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="183"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="171"/>
<source>Mount folder on device</source>
<translation>Смонтировать папку на вашем устройстве</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="208"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="196"/>
<source>In order to mount remote SFTP folder as local drive, perform following steps: &lt;br&gt;</source>
<translation>Чтобы смонтировать SFTP-папку как локальный диск на вашем устройстве, выполните следующие действия</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="210"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="213"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="198"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="201"/>
<source>&lt;br&gt;1. Install the latest version of </source>
<translation>&lt;br&gt;1. Установите последнюю версию </translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="211"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="214"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="199"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="202"/>
<source>&lt;br&gt;2. Install the latest version of </source>
<translation>&lt;br&gt;2. Установите последнюю версию </translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="242"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="230"/>
<source>Detailed instructions</source>
<translation>Подробные инструкции</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="260"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="248"/>
<source>Remove SFTP and all data stored there</source>
<translation>Удалите SFTP-хранилище со всеми данными</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="263"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="251"/>
<source>Remove SFTP and all data stored there?</source>
<translation>Удалить SFTP-хранилище и все хранящиеся на нем данные?</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="264"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="252"/>
<source>Continue</source>
<translation>Продолжить</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="265"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="253"/>
<source>Cancel</source>
<translation>Отменить</translation>
</message>
@ -806,37 +801,41 @@ Already installed containers were found on the server. All installed containers
<translation>Скопировано</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="106"/>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="94"/>
<source>Use &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; to open this url.</source>
<translation>Используйте &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; для открытия этой ссылки.</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="115"/>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="103"/>
<source>After installation it takes several minutes while your onion site will become available in the Tor Network.</source>
<translation>Через несколько минут после установки ваш Onion сайт станет доступен в сети Tor.</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="124"/>
<source>When configuring WordPress set the this address as domain.</source>
<translation type="unfinished"></translation>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="112"/>
<source>When configuring WordPress set the this onion address as domain.</source>
<translation>При настройке WordPress укажите этот onion адрес в качестве домена.</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="138"/>
<source>When configuring WordPress set the this address as domain.</source>
<translation type="vanished">При настройке WordPress укажите этот onion адрес в качестве домена.</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="126"/>
<source>Remove website</source>
<translation>Удалить сайт</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="141"/>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="129"/>
<source>The site with all data will be removed from the tor network.</source>
<translation>Сайт со всеми данными будет удален из сети tor.</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="142"/>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="130"/>
<source>Continue</source>
<translation>Продолжить</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="143"/>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="131"/>
<source>Cancel</source>
<translation>Отменить</translation>
</message>
@ -1079,37 +1078,42 @@ Already installed containers were found on the server. All installed containers
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="97"/>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="125"/>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="126"/>
<source>Backup files (*.backup)</source>
<translation>Файлы резервного копирования (*.backup)</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="121"/>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="106"/>
<source>Backup file saved</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="122"/>
<source>Restore from backup</source>
<translation>Восстановить из бэкапа</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="124"/>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="125"/>
<source>Open backup file</source>
<translation>Открыть бэкап файл</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="135"/>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="136"/>
<source>Import settings from a backup file?</source>
<translation>Импортировать настройки из бэкап файла?</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="136"/>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="137"/>
<source>All current settings will be reset</source>
<translation>Все текущие настройки будут сброшены</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="137"/>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="138"/>
<source>Continue</source>
<translation>Продолжить</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="138"/>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="139"/>
<source>Cancel</source>
<translation>Отменить</translation>
</message>
@ -1162,12 +1166,12 @@ Already installed containers were found on the server. All installed containers
<translation>Позволяет подключаться к одним сайтам через VPN, а к другим в обход него</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="120"/>
<location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="119"/>
<source>App-based split tunneling</source>
<translation>Раздельное VPN-туннелирование приложений</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="121"/>
<location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="120"/>
<source>Allows you to use the VPN only for certain applications</source>
<translation>Позволяет использовать VPN только для определённых приложений</translation>
</message>
@ -1258,32 +1262,37 @@ Already installed containers were found on the server. All installed containers
<translation>Logs files (*.log)</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="126"/>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="118"/>
<source>Logs file saved</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="127"/>
<source>Save logs to file</source>
<translation>Сохранить логи в файл</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="144"/>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="145"/>
<source>Clear logs?</source>
<translation>Очистить логи?</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="145"/>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="146"/>
<source>Continue</source>
<translation>Продолжить</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="146"/>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="147"/>
<source>Cancel</source>
<translation>Отменить</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="153"/>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="154"/>
<source>Logs have been cleaned up</source>
<translation>Логи удалены</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="166"/>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="167"/>
<source>Clear logs</source>
<translation>Удалить логи</translation>
</message>
@ -1585,9 +1594,8 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<context>
<name>PageSetupWizardCredentials</name>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="44"/>
<source>Server connection</source>
<translation>Подключение к серверу</translation>
<translation type="vanished">Подключение к серверу</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="51"/>
@ -1610,7 +1618,13 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<translation>Продолжить</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="120"/>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="115"/>
<source>All data you enter will remain strictly confidential
and will not be shared or disclosed to the Amnezia or any third parties</source>
<translation>Все данные, которые вы вводите, останутся строго конфиденциальными и не будут переданы или раскрыты Amnezia или каким-либо третьим сторонам</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="128"/>
<source>Enter the address in the format 255.255.255.255:88</source>
<translation>Введите адрес в формате 255.255.255.255:88</translation>
</message>
@ -1620,17 +1634,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<translation>Login to connect via SSH</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="117"/>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="44"/>
<source>Configure your server</source>
<translation>Настроить ваш сервер</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="125"/>
<source>Ip address cannot be empty</source>
<translation>Поле Ip address не может быть пустым</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="124"/>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="132"/>
<source>Login cannot be empty</source>
<translation>Поле Login не может быть пустым</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="128"/>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="136"/>
<source>Password/private key cannot be empty</source>
<translation>Поле Password/private key не может быть пустым</translation>
</message>
@ -1865,7 +1884,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
<source>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.</source>
<translation type="unfinished"></translation>
<translation>Доступ к управлению сервером. Пользователь, с которым вы делитесь полным доступом к соединению, сможет добавлять и удалять ваши протоколы и службы на сервере, а также изменять настройки.</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
@ -2499,11 +2518,6 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
<source>AmneziaWG - Special protocol from Amnezia, based on WireGuard. It&apos;s fast like WireGuard, but very resistant to blockages. Recommended for regions with high levels of censorship.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../containers/containers_defs.cpp" line="112"/>
<source>AmneziaWG - Special protocol from Amnezia, based on WireGuard. It&apos;s fast like WireGuard, but very resistant to blockages. Recommended for regions with high levels of censorship.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../containers/containers_defs.cpp" line="116"/>
<source>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.</source>
@ -2599,16 +2613,6 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
<source>error 0x%1: %2</source>
<translation>error 0x%1: %2</translation>
</message>
<message>
<location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
<source>WireGuard Configuration Highlighter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
<source>&amp;Randomize colors</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SelectLanguageDrawer</name>
@ -2834,37 +2838,27 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
<message>
<location filename="../containers/containers_defs.cpp" line="301"/>
<source>Medium or High</source>
<translation type="unfinished"></translation>
<translation>Спедний или Высокий</translation>
</message>
<message>
<location filename="../containers/containers_defs.cpp" line="302"/>
<source>Extreme</source>
<translation type="unfinished"></translation>
<translation>Экстремальный</translation>
</message>
<message>
<location filename="../containers/containers_defs.cpp" line="310"/>
<source>I just want to increase the level of my privacy.</source>
<translation type="unfinished"></translation>
<translation>Я просто хочу повысить уровень своей приватности.</translation>
</message>
<message>
<location filename="../containers/containers_defs.cpp" line="311"/>
<source>I want to bypass censorship. This option recommended in most cases.</source>
<translation type="unfinished"></translation>
<translation>Я хочу обойти блокировки. Этот вариант рекомендуется в большинстве случаев.</translation>
</message>
<message>
<location filename="../containers/containers_defs.cpp" line="313"/>
<source>Most VPN protocols are blocked. Recommended if other options are not working.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../containers/containers_defs.cpp" line="256"/>
<source>I want to bypass censorship. This option recommended in most cases.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../containers/containers_defs.cpp" line="257"/>
<source>Most VPN protocols are blocked. Recommended if other options are not working.</source>
<translation type="unfinished"></translation>
<translation>Большинство VPN протоколов заблокированы. Рекомендуется, если другие варианты не работают.</translation>
</message>
<message>
<source>High</source>

127
client/translations/amneziavpn_zh_CN.ts
View file

@ -73,23 +73,26 @@
</message>
<message>
<location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="30"/>
<source>Add server</source>
<source>Add new connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="31"/>
<source>Select data type</source>
<location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="38"/>
<source>Configure your server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="52"/>
<source>Open config file, key or QR code</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="39"/>
<source>Server IP, login and password</source>
<translation>服务器IP，用户名和密码</translation>
<translation type="vanished">服务器IP，用户名和密码</translation>
</message>
<message>
<location filename="../ui/qml/Components/ConnectionTypeSelectionDrawer.qml" line="53"/>
<source>QR code, key or configuration file</source>
<translation>二维码，授权码或者配置文件</translation>
<translation type="vanished">二维码，授权码或者配置文件</translation>
</message>
</context>
<context>
@ -775,49 +778,49 @@ Already installed containers were found on the server. All installed containers
<translation>密码</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="183"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="171"/>
<source>Mount folder on device</source>
<translation>挂载文件夹</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="208"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="196"/>
<source>In order to mount remote SFTP folder as local drive, perform following steps: &lt;br&gt;</source>
<translation>为将远程 SFTP 文件夹挂载到本地，请执行以下步骤: &lt;br&gt;</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="210"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="213"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="198"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="201"/>
<source>&lt;br&gt;1. Install the latest version of </source>
<translation>&lt;br&gt;1. 安装最新版的 </translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="211"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="214"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="199"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="202"/>
<source>&lt;br&gt;2. Install the latest version of </source>
<translation>&lt;br&gt;2. 安装最新版的 </translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="242"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="230"/>
<source>Detailed instructions</source>
<translation>详细说明</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="260"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="248"/>
<source>Remove SFTP and all data stored there</source>
<translation>移除SFTP和其本地所有数据</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="263"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="251"/>
<source>Remove SFTP and all data stored there?</source>
<translation>移除SFTP和其本地所有数据？</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="264"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="252"/>
<source>Continue</source>
<translation>继续</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="265"/>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="253"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
@ -845,18 +848,18 @@ Already installed containers were found on the server. All installed containers
<translation>已拷贝</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="106"/>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="94"/>
<source>Use &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor Browser&lt;/a&gt; to open this url.</source>
<translation>用 &lt;a href=&quot;https://www.torproject.org/download/&quot; style=&quot;color: #FBB26A;&quot;&gt;Tor 浏览器&lt;/a&gt; 打开上面网址</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="115"/>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="103"/>
<source>After installation it takes several minutes while your onion site will become available in the Tor Network.</source>
<translation>完成安装几分钟后,洋葱站点才会在 Tor 网络中生效。</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="124"/>
<source>When configuring WordPress set the this address as domain.</source>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="112"/>
<source>When configuring WordPress set the this onion address as domain.</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -864,22 +867,22 @@ Already installed containers were found on the server. All installed containers
<translation type="vanished">配置 WordPress 时，将域设置为此洋葱地址。</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="138"/>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="126"/>
<source>Remove website</source>
<translation>移除网站</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="141"/>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="129"/>
<source>The site with all data will be removed from the tor network.</source>
<translation>网站及其所有数据将从 Tor 网络中删除</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="142"/>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="130"/>
<source>Continue</source>
<translation>继续</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="143"/>
<location filename="../ui/qml/Pages2/PageServiceTorWebsiteSettings.qml" line="131"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
@ -1141,37 +1144,42 @@ And if you don&apos;t like the app, all the more support it - the donation will
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="97"/>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="125"/>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="126"/>
<source>Backup files (*.backup)</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="121"/>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="106"/>
<source>Backup file saved</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="122"/>
<source>Restore from backup</source>
<translation>从备份还原</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="124"/>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="125"/>
<source>Open backup file</source>
<translation>打开备份文件</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="135"/>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="136"/>
<source>Import settings from a backup file?</source>
<translation>从备份文件导入设置？</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="136"/>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="137"/>
<source>All current settings will be reset</source>
<translation>当前所有设置将重置</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="137"/>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="138"/>
<source>Continue</source>
<translation>继续</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="138"/>
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="139"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
@ -1228,7 +1236,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
<translation>配置想要通过VPN访问网站</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="120"/>
<location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="119"/>
<source>App-based split tunneling</source>
<translation>基于应用的隧道分离</translation>
</message>
@ -1245,7 +1253,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
<translation type="obsolete">应用级VPN分流</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="121"/>
<location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="120"/>
<source>Allows you to use the VPN only for certain applications</source>
<translation>仅指定应用使用VPN</translation>
</message>
@ -1336,32 +1344,37 @@ And if you don&apos;t like the app, all the more support it - the donation will
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="126"/>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="118"/>
<source>Logs file saved</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="127"/>
<source>Save logs to file</source>
<translation>保存日志到文件</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="144"/>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="145"/>
<source>Clear logs?</source>
<translation>清理日志？</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="145"/>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="146"/>
<source>Continue</source>
<translation>继续</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="146"/>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="147"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="153"/>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="154"/>
<source>Logs have been cleaned up</source>
<translation>日志已清理</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="166"/>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="167"/>
<source>Clear logs</source>
<translation>清理日志</translation>
</message>
@ -1682,9 +1695,13 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<context>
<name>PageSetupWizardCredentials</name>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="44"/>
<source>Server connection</source>
<translation>连接服务器</translation>
<translation type="vanished">连接服务器</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="44"/>
<source>Configure your server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="51"/>
@ -1712,22 +1729,28 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<translation>继续</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="117"/>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="115"/>
<source>All data you enter will remain strictly confidential
and will not be shared or disclosed to the Amnezia or any third parties</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="125"/>
<source>Ip address cannot be empty</source>
<translation>IP不能为空</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="120"/>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="128"/>
<source>Enter the address in the format 255.255.255.255:88</source>
<translation>按照这种格式输入 255.255.255.255:88</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="124"/>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="132"/>
<source>Login cannot be empty</source>
<translation>账号不能为空</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="128"/>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="136"/>
<source>Password/private key cannot be empty</source>
<translation>密码或私钥不能为空</translation>
</message>
@ -2727,16 +2750,6 @@ IKEv2 with IPSec encryption layer. Transmits data over fixed UDP ports 500 and 4
<source>error 0x%1: %2</source>
<translation>错误 0x%1: %2</translation>
</message>
<message>
<location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
<source>WireGuard Configuration Highlighter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
<source>&amp;Randomize colors</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SelectLanguageDrawer</name>

5
client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
View file

@ -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() {

12
client/ui/qml/Config/GlobalConfig.qml
View file

@ -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)
}
}

20
client/ui/qml/Pages2/PageServiceSftpSettings.qml
View file

@ -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()

16
client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
View file

@ -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 {

4
client/ui/qml/Pages2/PageSettings.qml
View file

@ -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()
}
}
}

1
client/ui/qml/Pages2/PageSettingsConnection.qml
View file

@ -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")