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

removed the default protocol/server change if connected to VPN

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-10-20 20:52:14 +05:00
parent 58ad7dc161
commit 3d60ac751e
8 changed files with 151 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

130
client/translations/amneziavpn_ru.ts
View file

@ -135,7 +135,7 @@
<context>
<name>ImportController</name>
<message>
<location filename="../ui/controllers/importController.cpp" line="429"/>
<location filename="../ui/controllers/importController.cpp" line="427"/>
<source>Scanned %1 of %2.</source>
<translation>Отсканировано %1 из%2.</translation>
</message>
@ -144,13 +144,13 @@
<name>InstallController</name>
<message>
<location filename="../ui/controllers/installController.cpp" line="141"/>
<location filename="../ui/controllers/installController.cpp" line="192"/>
<location filename="../ui/controllers/installController.cpp" line="191"/>
<source>%1 installed successfully. </source>
<translation>%1 успешно установлен. </translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="143"/>
<location filename="../ui/controllers/installController.cpp" line="194"/>
<location filename="../ui/controllers/installController.cpp" line="193"/>
<source>%1 is already installed on the server. </source>
<translation>%1 уже установлен на сервер. </translation>
</message>
@ -162,39 +162,39 @@ Added containers that were already installed on the server</source>
В приложение добавлены обнаруженные на сервере протоклы и сервисы</translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="213"/>
<location filename="../ui/controllers/installController.cpp" line="212"/>
<source>
Already installed containers were found on the server. All installed containers have been added to the application</source>
<translation>
На сервере обнаружены установленные протоколы и сервисы, все они добавлены в приложение</translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="297"/>
<location filename="../ui/controllers/installController.cpp" line="293"/>
<source>Settings updated successfully</source>
<translation>Настройки успешно обновлены</translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="312"/>
<location filename="../ui/controllers/installController.cpp" line="308"/>
<source>Server &apos;%1&apos; was removed</source>
<translation>Сервер &apos;%1&apos; был удален</translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="322"/>
<location filename="../ui/controllers/installController.cpp" line="318"/>
<source>All containers from server &apos;%1&apos; have been removed</source>
<translation>Все протоклы и сервисы были удалены с сервера &apos;%1&apos;</translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="339"/>
<location filename="../ui/controllers/installController.cpp" line="335"/>
<source>%1 has been removed from the server &apos;%2&apos;</source>
<translation>%1 был удален с сервера &apos;%2&apos;</translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="485"/>
<location filename="../ui/controllers/installController.cpp" line="481"/>
<source>Please login as the user</source>
<translation>Пожалуйста, войдите в систему от имени пользователя</translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="514"/>
<location filename="../ui/controllers/installController.cpp" line="509"/>
<source>Server added successfully</source>
<translation>Сервер успешно добавлен</translation>
</message>
@ -397,195 +397,195 @@ Already installed containers were found on the server. All installed containers
<context>
<name>PageProtocolOpenVpnSettings</name>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="76"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="77"/>
<source>OpenVPN settings</source>
<translation>Настройки OpenVPN</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="83"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="84"/>
<source>VPN Addresses Subnet</source>
<translation>VPN Адреса Подсеть</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="97"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="98"/>
<source>Network protocol</source>
<translation>Сетевой протокол</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="126"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="127"/>
<source>Port</source>
<translation>Порт</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="144"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="145"/>
<source>Auto-negotiate encryption</source>
<translation>Шифрование с автоматическим согласованием</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="161"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="162"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="163"/>
<source>Hash</source>
<translation>Хэш</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="170"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="171"/>
<source>SHA512</source>
<translation>SHA512</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="171"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="172"/>
<source>SHA384</source>
<translation>SHA384</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="172"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="173"/>
<source>SHA256</source>
<translation>SHA256</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="173"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="174"/>
<source>SHA3-512</source>
<translation>SHA3-512</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="174"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="175"/>
<source>SHA3-384</source>
<translation>SHA3-384</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="175"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="176"/>
<source>SHA3-256</source>
<translation>SHA3-256</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="176"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="177"/>
<source>whirlpool</source>
<translation>whirlpool</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="177"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="178"/>
<source>BLAKE2b512</source>
<translation>BLAKE2b512</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="178"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="179"/>
<source>BLAKE2s256</source>
<translation>BLAKE2s256</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="179"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="180"/>
<source>SHA1</source>
<translation>SHA1</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="207"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="208"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="209"/>
<source>Cipher</source>
<translation>Шифрование</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="216"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="217"/>
<source>AES-256-GCM</source>
<translation>AES-256-GCM</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="217"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="218"/>
<source>AES-192-GCM</source>
<translation>AES-192-GCM</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="218"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="219"/>
<source>AES-128-GCM</source>
<translation>AES-128-GCM</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="219"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="220"/>
<source>AES-256-CBC</source>
<translation>AES-256-CBC</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="220"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="221"/>
<source>AES-192-CBC</source>
<translation>AES-192-CBC</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="221"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="222"/>
<source>AES-128-CBC</source>
<translation>AES-128-CBC</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="222"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="223"/>
<source>ChaCha20-Poly1305</source>
<translation>ChaCha20-Poly1305</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="223"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="224"/>
<source>ARIA-256-CBC</source>
<translation>ARIA-256-CBC</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="224"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="225"/>
<source>CAMELLIA-256-CBC</source>
<translation>CAMELLIA-256-CBC</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="225"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="226"/>
<source>none</source>
<translation>none</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="258"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="261"/>
<source>TLS auth</source>
<translation>TLS авторизация</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="273"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="276"/>
<source>Block DNS requests outside of VPN</source>
<translation>Блокировать DNS запросы за пределами VPN</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="292"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="295"/>
<source>Additional client configuration commands</source>
<translation>Дополнительные команды конфигурации клиента</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="308"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="340"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="311"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="343"/>
<source>Commands:</source>
<translation>Commands:</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="324"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="327"/>
<source>Additional server configuration commands</source>
<translation>Дополнительные команды конфигурации сервера</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="359"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="364"/>
<source>Remove OpenVPN</source>
<translation>Удалить OpenVPN</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="362"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="367"/>
<source>Remove OpenVpn from server?</source>
<translation>Удалить OpenVpn с сервера?</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="363"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="368"/>
<source>All users who you shared a connection with will no longer be able to connect to it.</source>
<translation>Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="364"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="369"/>
<source>Continue</source>
<translation>Продолжить</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="365"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="370"/>
<source>Cancel</source>
<translation>Отменить</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="384"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="389"/>
<source>Save and Restart Amnezia</source>
<translation>Сохранить и перезагрузить</translation>
</message>
@ -608,27 +608,27 @@ Already installed containers were found on the server. All installed containers
<translation>Параметры подключения %1</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="172"/>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="174"/>
<source>Remove </source>
<translation>Удалить </translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
<source>Remove %1 from server?</source>
<translation>Удалить %1 с сервера?</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="179"/>
<source>All users who you shared a connection with will no longer be able to connect to it.</source>
<translation type="unfinished">Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться.</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="180"/>
<source>Continue</source>
<translation>Продолжить</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="179"/>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="181"/>
<source>Cancel</source>
<translation>Отменить</translation>
</message>
@ -1694,7 +1694,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
<context>
<name>PageSetupWizardInstalling</name>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="57"/>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="65"/>
<source>The server has already been added to the application</source>
<translation>Сервер уже был добавлен в приложение</translation>
</message>
@ -1707,28 +1707,28 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
<translation type="vanished">занят установкой других протоколов или сервисов. Установка Amnesia </translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="62"/>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="70"/>
<source>Amnezia has detected that your server is currently </source>
<translation>Amnezia обнаружила, что ваш сервер в настоящее время </translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="63"/>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="71"/>
<source>busy installing other software. Amnezia installation </source>
<translation>занят установкой другого программного обеспечения. Установка Amnezia </translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="64"/>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="72"/>
<source>will pause until the server finishes installing other software</source>
<translation>будет приостановлена до тех пор, пока сервер не завершит установку</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="121"/>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="129"/>
<source>Installing</source>
<translation>Установка</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="21"/>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="67"/>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="75"/>
<source>Usually it takes no more than 5 minutes</source>
<translation>Обычно это занимает не более 5 минут</translation>
</message>
@ -1846,27 +1846,27 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
<context>
<name>PageSetupWizardViewConfig</name>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="59"/>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="63"/>
<source>New connection</source>
<translation>Новое соединение</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="86"/>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="90"/>
<source>Do not use connection code from public sources. It could be created to intercept your data.</source>
<translation>Не используйте код подключения из публичных источников. Его могли создать, чтобы перехватывать ваши данные.</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
<source>Collapse content</source>
<translation>Свернуть</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
<source>Show content</source>
<translation>Показать содержимое ключа</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="144"/>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="148"/>
<source>Connect</source>
<translation>Подключиться</translation>
</message>

130
client/translations/amneziavpn_zh_CN.ts
View file

@ -146,7 +146,7 @@
<context>
<name>ImportController</name>
<message>
<location filename="../ui/controllers/importController.cpp" line="429"/>
<location filename="../ui/controllers/importController.cpp" line="427"/>
<source>Scanned %1 of %2.</source>
<translation>扫描 %1 of %2.</translation>
</message>
@ -163,13 +163,13 @@
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="141"/>
<location filename="../ui/controllers/installController.cpp" line="192"/>
<location filename="../ui/controllers/installController.cpp" line="191"/>
<source>%1 installed successfully. </source>
<translation>%1 安装成功。</translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="143"/>
<location filename="../ui/controllers/installController.cpp" line="194"/>
<location filename="../ui/controllers/installController.cpp" line="193"/>
<source>%1 is already installed on the server. </source>
<translation>服务器上已经安装 %1。</translation>
</message>
@ -180,29 +180,29 @@ Added containers that were already installed on the server</source>
<translation>添加已安装在服务器上的容器</translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="213"/>
<location filename="../ui/controllers/installController.cpp" line="212"/>
<source>
Already installed containers were found on the server. All installed containers have been added to the application</source>
<translation>
在服务上发现已经安装协议并添加至应用</translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="297"/>
<location filename="../ui/controllers/installController.cpp" line="293"/>
<source>Settings updated successfully</source>
<translation>配置更新成功</translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="312"/>
<location filename="../ui/controllers/installController.cpp" line="308"/>
<source>Server &apos;%1&apos; was removed</source>
<translation>已移除服务器 &apos;%1&apos;</translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="322"/>
<location filename="../ui/controllers/installController.cpp" line="318"/>
<source>All containers from server &apos;%1&apos; have been removed</source>
<translation>服务器 &apos;%1&apos; 的所有容器已移除</translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="339"/>
<location filename="../ui/controllers/installController.cpp" line="335"/>
<source>%1 has been removed from the server &apos;%2&apos;</source>
<translation>%1 已从服务器 &apos;%2&apos; 上移除</translation>
</message>
@ -223,12 +223,12 @@ Already installed containers were found on the server. All installed containers
<translation type="obsolete"> 协议已从</translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="485"/>
<location filename="../ui/controllers/installController.cpp" line="481"/>
<source>Please login as the user</source>
<translation>请以用户身份登录</translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="514"/>
<location filename="../ui/controllers/installController.cpp" line="509"/>
<source>Server added successfully</source>
<translation>增加服务器成功</translation>
</message>
@ -431,180 +431,180 @@ Already installed containers were found on the server. All installed containers
<context>
<name>PageProtocolOpenVpnSettings</name>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="76"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="77"/>
<source>OpenVPN settings</source>
<translation>OpenVPN 配置</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="83"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="84"/>
<source>VPN Addresses Subnet</source>
<translation>VPN子网掩码</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="97"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="98"/>
<source>Network protocol</source>
<translation>网络协议</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="126"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="127"/>
<source>Port</source>
<translation>端口</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="144"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="145"/>
<source>Auto-negotiate encryption</source>
<translation>自定义加密方式</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="161"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="162"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="163"/>
<source>Hash</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="170"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="171"/>
<source>SHA512</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="171"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="172"/>
<source>SHA384</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="172"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="173"/>
<source>SHA256</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="173"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="174"/>
<source>SHA3-512</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="174"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="175"/>
<source>SHA3-384</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="175"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="176"/>
<source>SHA3-256</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="176"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="177"/>
<source>whirlpool</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="177"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="178"/>
<source>BLAKE2b512</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="178"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="179"/>
<source>BLAKE2s256</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="179"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="180"/>
<source>SHA1</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="207"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="208"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="209"/>
<source>Cipher</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="216"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="217"/>
<source>AES-256-GCM</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="217"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="218"/>
<source>AES-192-GCM</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="218"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="219"/>
<source>AES-128-GCM</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="219"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="220"/>
<source>AES-256-CBC</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="220"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="221"/>
<source>AES-192-CBC</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="221"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="222"/>
<source>AES-128-CBC</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="222"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="223"/>
<source>ChaCha20-Poly1305</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="223"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="224"/>
<source>ARIA-256-CBC</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="224"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="225"/>
<source>CAMELLIA-256-CBC</source>
<translation></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="225"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="226"/>
<source>none</source>
<translation>无</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="258"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="261"/>
<source>TLS auth</source>
<translation>TLS认证</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="273"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="276"/>
<source>Block DNS requests outside of VPN</source>
<translation>阻止VPN外的DNS请求</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="292"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="295"/>
<source>Additional client configuration commands</source>
<translation>附加客户端配置命令</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="308"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="340"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="311"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="343"/>
<source>Commands:</source>
<translation>命令:</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="324"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="327"/>
<source>Additional server configuration commands</source>
<translation>附加服务器端配置命令</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="359"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="364"/>
<source>Remove OpenVPN</source>
<translation>移除OpenVPN</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="362"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="367"/>
<source>Remove OpenVpn from server?</source>
<translation>从服务器移除OpenVPN吗?</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="363"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="368"/>
<source>All users who you shared a connection with will no longer be able to connect to it.</source>
<translation>使用此共享连接的所有用户，将无法再连接它。</translation>
</message>
@ -613,17 +613,17 @@ Already installed containers were found on the server. All installed containers
<translation type="obsolete">与您共享连接的所有用户将无法再连接到此链接</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="364"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="369"/>
<source>Continue</source>
<translation>继续</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="365"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="370"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="384"/>
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="389"/>
<source>Save and Restart Amnezia</source>
<translation>保存并重启Amnezia</translation>
</message>
@ -650,17 +650,17 @@ Already installed containers were found on the server. All installed containers
<translation>%1 连接选项</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="172"/>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="174"/>
<source>Remove </source>
<translation>移除 </translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
<source>Remove %1 from server?</source>
<translation>从服务器移除 %1 ?</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="179"/>
<source>All users who you shared a connection with will no longer be able to connect to it.</source>
<translation>使用此共享连接的所有用户，将无法再连接它。</translation>
</message>
@ -673,12 +673,12 @@ Already installed containers were found on the server. All installed containers
<translation type="obsolete">与您共享连接的所有用户将无法再连接到此链接</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="180"/>
<source>Continue</source>
<translation>继续</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="179"/>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="181"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
@ -1801,22 +1801,22 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
<name>PageSetupWizardInstalling</name>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="21"/>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="67"/>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="75"/>
<source>Usually it takes no more than 5 minutes</source>
<translation>通常不超过5分钟</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="57"/>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="65"/>
<source>The server has already been added to the application</source>
<translation>服务器已添加到应用软件中</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="62"/>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="70"/>
<source>Amnezia has detected that your server is currently </source>
<translation>Amnezia 检测到您的服务器当前</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="63"/>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="71"/>
<source>busy installing other software. Amnezia installation </source>
<translation>正安装其他软件。Amnezia安装</translation>
</message>
@ -1829,12 +1829,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
<translation type="vanished">正安装其他软件。Amnezia安装</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="64"/>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="72"/>
<source>will pause until the server finishes installing other software</source>
<translation>将暂停，直到其他软件安装完成。</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="121"/>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="129"/>
<source>Installing</source>
<translation>安装中</translation>
</message>
@ -1952,27 +1952,27 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
<context>
<name>PageSetupWizardViewConfig</name>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="59"/>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="63"/>
<source>New connection</source>
<translation>新连接</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="86"/>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="90"/>
<source>Do not use connection code from public sources. It could be created to intercept your data.</source>
<translation>请勿使用公共来源的连接码。它可以被创建来拦截您的数据。</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
<source>Collapse content</source>
<translation>折叠内容</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
<source>Show content</source>
<translation>显示内容</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="144"/>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="148"/>
<source>Connect</source>
<translation>连接</translation>
</message>

2
client/ui/controllers/importController.cpp
View file

@ -144,8 +144,6 @@ void ImportController::importConfig()
if (credentials.isValid() || m_config.contains(config_key::containers)) {
m_serversModel->addServer(m_config);
m_serversModel->setDefaultServerIndex(m_serversModel->getServersCount() - 1);
emit importFinished();
} else {
qDebug() << "Failed to import profile";

5
client/ui/controllers/installController.cpp
View file

@ -163,7 +163,6 @@ void InstallController::installServer(DockerContainer container, QJsonObject &co
server.insert(config_key::defaultContainer, ContainerProps::containerToString(container));
m_serversModel->addServer(server);
m_serversModel->setDefaultServerIndex(m_serversModel->getServersCount() - 1);
emit installServerFinished(finishMessage);
return;
@ -214,9 +213,6 @@ void InstallController::installContainer(DockerContainer container, QJsonObject
"All installed containers have been added to the application");
}
if (ContainerProps::containerService(container) == ServiceType::Vpn) {
m_containersModel->setData(m_containersModel->index(container), true, ContainersModel::Roles::IsDefaultRole);
}
emit installContainerFinished(finishMessage, ContainerProps::containerService(container) == ServiceType::Other);
return;
}
@ -509,7 +505,6 @@ void InstallController::addEmptyServer()
server.insert(config_key::defaultContainer, ContainerProps::containerToString(DockerContainer::None));
m_serversModel->addServer(server);
m_serversModel->setDefaultServerIndex(m_serversModel->getServersCount() - 1);
emit installServerFinished(tr("Server added successfully"));
}

9
client/ui/models/containers_model.cpp
View file

@ -41,7 +41,7 @@ bool ContainersModel::setData(const QModelIndex &index, const QVariant &value, i
// return container;
case IsInstalledRole:
// return m_settings->containers(m_currentlyProcessedServerIndex).contains(container);
case IsDefaultRole: {
case IsDefaultRole: { //todo remove
m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, container);
m_defaultContainerIndex = container;
emit defaultContainerChanged();
@ -117,6 +117,13 @@ QString ContainersModel::getDefaultContainerName()
return ContainerProps::containerHumanNames().value(m_defaultContainerIndex);
}
void ContainersModel::setDefaultContainer(DockerContainer container)
{
m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, container);
m_defaultContainerIndex = container;
emit defaultContainerChanged();
}
int ContainersModel::getCurrentlyProcessedContainerIndex()
{
return m_currentlyProcessedContainerIndex;

1
client/ui/models/containers_model.h
View file

@ -46,6 +46,7 @@ public:
public slots:
DockerContainer getDefaultContainer();
QString getDefaultContainerName();
void setDefaultContainer(DockerContainer container);
void setCurrentlyProcessedServerIndex(const int index);

8
client/ui/qml/Pages2/PageSetupWizardInstalling.qml
View file

@ -24,6 +24,10 @@ PageType {
target: InstallController
function onInstallContainerFinished(finishedMessage, isServiceInstall) {
if (!ConnectionController.isConnected && !isServiceInstall) {
ContainersModel.setDefaultContainer(ContainersModel.getCurrentlyProcessedContainerIndex)
}
PageController.goToStartPage()
if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
PageController.restorePageHomeState(true)
@ -41,6 +45,10 @@ PageType {
}
function onInstallServerFinished(finishedMessage) {
if (!ConnectionController.isConnected) {
ServersModel.setDefaultServerIndex(ServersModel.getServersCount() - 1);
}
PageController.goToStartPage()
if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSetupWizardStart)) {
PageController.replaceStartPage()

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

@ -24,6 +24,10 @@ PageType {
}
function onImportFinished() {
if (ConnectionController.isConnected) {
ServersModel.setDefaultServerIndex(ServersModel.getServersCount() - 1);
}
PageController.goToStartPage()
if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSetupWizardStart)) {
PageController.replaceStartPage()