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

added close application button in settings page

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-10-09 19:16:06 +05:00
parent 61396ec82e
commit e01dd2bf57
8 changed files with 205 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/images/controls/x-circle.svg Normal file
View file

@ -0,0 +1,5 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M15 9L9 15" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M9 9L15 15" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 518 B

1
client/resources.qrc
View file

@ -215,5 +215,6 @@
<file>ui/qml/Controls2/ListViewWithLabelsType.qml</file> <file>ui/qml/Controls2/ListViewWithLabelsType.qml</file>
<file>ui/qml/Pages2/PageServiceDnsSettings.qml</file> <file>ui/qml/Pages2/PageServiceDnsSettings.qml</file>
<file>ui/qml/Controls2/TopCloseButtonType.qml</file> <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
<file>images/controls/x-circle.svg</file>
</qresource> </qresource>
</RCC> </RCC>

145
client/translations/amneziavpn_ru.ts
View file

@ -26,41 +26,41 @@
<context> <context>
<name>ConnectionController</name> <name>ConnectionController</name>
<message> <message>
<location filename="../ui/controllers/connectionController.cpp" line="55"/> <location filename="../ui/controllers/connectionController.cpp" line="38"/>
<source>VPN Protocols is not installed. <source>VPN Protocols is not installed.
Please install VPN container at first</source> Please install VPN container at first</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/connectionController.cpp" line="78"/> <location filename="../ui/controllers/connectionController.cpp" line="61"/>
<source>Connection...</source> <source>Connection...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/connectionController.cpp" line="83"/> <location filename="../ui/controllers/connectionController.cpp" line="66"/>
<source>Connected</source> <source>Connected</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/connectionController.cpp" line="128"/> <location filename="../ui/controllers/connectionController.cpp" line="111"/>
<source>Settings updated successfully, Reconnnection...</source> <source>Settings updated successfully, Reconnnection...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/connectionController.cpp" line="92"/> <location filename="../ui/controllers/connectionController.cpp" line="75"/>
<source>Reconnection...</source> <source>Reconnection...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/connectionController.h" line="58"/> <location filename="../ui/controllers/connectionController.h" line="58"/>
<location filename="../ui/controllers/connectionController.cpp" line="97"/> <location filename="../ui/controllers/connectionController.cpp" line="80"/>
<location filename="../ui/controllers/connectionController.cpp" line="111"/> <location filename="../ui/controllers/connectionController.cpp" line="94"/>
<location filename="../ui/controllers/connectionController.cpp" line="117"/> <location filename="../ui/controllers/connectionController.cpp" line="100"/>
<source>Connect</source> <source>Connect</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/connectionController.cpp" line="102"/> <location filename="../ui/controllers/connectionController.cpp" line="85"/>
<source>Disconnection...</source> <source>Disconnection...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -130,7 +130,7 @@
<context> <context>
<name>ImportController</name> <name>ImportController</name>
<message> <message>
<location filename="../ui/controllers/importController.cpp" line="384"/> <location filename="../ui/controllers/importController.cpp" line="375"/>
<source>Scanned %1 of %2.</source> <source>Scanned %1 of %2.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -139,50 +139,55 @@
<name>InstallController</name> <name>InstallController</name>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="110"/> <location filename="../ui/controllers/installController.cpp" line="110"/>
<location filename="../ui/controllers/installController.cpp" line="162"/> <location filename="../ui/controllers/installController.cpp" line="161"/>
<source>%1 installed successfully. </source> <source>%1 installed successfully. </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="112"/> <location filename="../ui/controllers/installController.cpp" line="112"/>
<location filename="../ui/controllers/installController.cpp" line="164"/> <location filename="../ui/controllers/installController.cpp" line="163"/>
<source>%1 is already installed on the server. </source> <source>%1 is already installed on the server. </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="115"/> <location filename="../ui/controllers/installController.cpp" line="115"/>
<location filename="../ui/controllers/installController.cpp" line="183"/> <source>
Added containers that were already installed on the server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="182"/>
<source> <source>
Already installed containers were found on the server. All installed containers have been added to the application</source> Already installed containers were found on the server. All installed containers have been added to the application</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="264"/> <location filename="../ui/controllers/installController.cpp" line="263"/>
<source>Settings updated successfully</source> <source>Settings updated successfully</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="279"/> <location filename="../ui/controllers/installController.cpp" line="278"/>
<source>Server &apos;%1&apos; was removed</source> <source>Server &apos;%1&apos; was removed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="289"/> <location filename="../ui/controllers/installController.cpp" line="288"/>
<source>All containers from server &apos;%1&apos; have been removed</source> <source>All containers from server &apos;%1&apos; have been removed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="306"/> <location filename="../ui/controllers/installController.cpp" line="305"/>
<source>%1 has been removed from the server &apos;%2&apos;</source> <source>%1 has been removed from the server &apos;%2&apos;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="452"/> <location filename="../ui/controllers/installController.cpp" line="451"/>
<source>Please login as the user</source> <source>Please login as the user</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="479"/> <location filename="../ui/controllers/installController.cpp" line="478"/>
<source>Server added successfully</source> <source>Server added successfully</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -250,12 +255,12 @@ Already installed containers were found on the server. All installed containers
<context> <context>
<name>PageHome</name> <name>PageHome</name>
<message> <message>
<location filename="../ui/qml/Pages2/PageHome.qml" line="193"/> <location filename="../ui/qml/Pages2/PageHome.qml" line="344"/>
<source>VPN protocol</source> <source>VPN protocol</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageHome.qml" line="238"/> <location filename="../ui/qml/Pages2/PageHome.qml" line="390"/>
<source>Servers</source> <source>Servers</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -771,6 +776,11 @@ Already installed containers were found on the server. All installed containers
<source>About AmneziaVPN</source> <source>About AmneziaVPN</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="../ui/qml/Pages2/PageSettings.qml" line="114"/>
<source>Close application</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PageSettingsAbout</name> <name>PageSettingsAbout</name>
@ -865,71 +875,76 @@ And if you don&apos;t like the app, all the more support it - the donation will
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="52"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="52"/>
<source>Allow application screenshots</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="72"/>
<source>Auto start</source> <source>Auto start</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
<source>Launch the application every time </source> <source>Launch the application every time </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
<source> starts</source> <source> starts</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="93"/>
<source>Start minimized</source> <source>Start minimized</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="74"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="94"/>
<source>Launch application minimized</source> <source>Launch application minimized</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="91"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
<source>Language</source> <source>Language</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="110"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="130"/>
<source>Logging</source> <source>Logging</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
<source>Enabled</source> <source>Enabled</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
<source>Disabled</source> <source>Disabled</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="124"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="144"/>
<source>Reset settings and remove all data from the application</source> <source>Reset settings and remove all data from the application</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="128"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="148"/>
<source>Reset settings and remove all data from the application?</source> <source>Reset settings and remove all data from the application?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="129"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="149"/>
<source>All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.</source> <source>All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="130"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="150"/>
<source>Continue</source> <source>Continue</source>
<translation type="unfinished">Продолжить</translation> <translation type="unfinished">Продолжить</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="151"/>
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1525,17 +1540,17 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<context> <context>
<name>PageSetupWizardEasy</name> <name>PageSetupWizardEasy</name>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="66"/> <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="67"/>
<source>What is the level of internet control in your region?</source> <source>What is the level of internet control in your region?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="136"/> <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="137"/>
<source>Set up a VPN yourself</source> <source>Set up a VPN yourself</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="137"/> <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="138"/>
<source>I want to choose a VPN protocol</source> <source>I want to choose a VPN protocol</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1545,7 +1560,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<translation type="unfinished">Продолжить</translation> <translation type="unfinished">Продолжить</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="186"/> <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="197"/>
<source>Set up later</source> <source>Set up later</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1749,11 +1764,6 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<source>VPN access without the ability to manage the server</source> <source>VPN access without the ability to manage the server</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
<source>Full access to server</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="191"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="191"/>
<source>Server</source> <source>Server</source>
@ -1765,13 +1775,17 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="306"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="222"/>
<source>File with accessing settings to </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="309"/>
<source>Connection to </source> <source>Connection to </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="222"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="310"/>
<location filename="../ui/qml/Pages2/PageShare.qml" line="307"/>
<source>File with connection settings to </source> <source>File with connection settings to </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1795,29 +1809,30 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<source>Full access</source> <source>Full access</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<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 servers, as well as change settings.</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="190"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
<source>Servers</source> <source>Servers</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="248"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="251"/>
<source>Protocols</source> <location filename="../ui/qml/Pages2/PageShare.qml" line="252"/>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="249"/>
<source>Protocol</source> <source>Protocol</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="340"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="343"/>
<location filename="../ui/qml/Pages2/PageShare.qml" line="341"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="344"/>
<source>Connection format</source> <source>Connection format</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="379"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="382"/>
<source>Share</source> <source>Share</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2433,6 +2448,16 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<source>error 0x%1: %2</source> <source>error 0x%1: %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </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>
<context> <context>
<name>SelectLanguageDrawer</name> <name>SelectLanguageDrawer</name>
@ -2459,22 +2484,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<context> <context>
<name>SettingsController</name> <name>SettingsController</name>
<message> <message>
<location filename="../ui/controllers/settingsController.cpp" line="20"/> <location filename="../ui/controllers/settingsController.cpp" line="25"/>
<source>Software version</source> <source>Software version</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/settingsController.cpp" line="117"/> <location filename="../ui/controllers/settingsController.cpp" line="136"/>
<source>All settings have been reset to default values</source> <source>All settings have been reset to default values</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/settingsController.cpp" line="123"/> <location filename="../ui/controllers/settingsController.cpp" line="142"/>
<source>Cached profiles cleared</source> <source>Cached profiles cleared</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/settingsController.cpp" line="102"/> <location filename="../ui/controllers/settingsController.cpp" line="121"/>
<source>Backup file is corrupted</source> <source>Backup file is corrupted</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2504,7 +2529,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
</message> </message>
<message> <message>
<location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="126"/> <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="126"/>
<source>Show content</source> <source>Show connection settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

141
client/translations/amneziavpn_zh_CN.ts
View file

@ -27,40 +27,40 @@
<name>ConnectionController</name> <name>ConnectionController</name>
<message> <message>
<location filename="../ui/controllers/connectionController.h" line="58"/> <location filename="../ui/controllers/connectionController.h" line="58"/>
<location filename="../ui/controllers/connectionController.cpp" line="97"/> <location filename="../ui/controllers/connectionController.cpp" line="80"/>
<location filename="../ui/controllers/connectionController.cpp" line="111"/> <location filename="../ui/controllers/connectionController.cpp" line="94"/>
<location filename="../ui/controllers/connectionController.cpp" line="117"/> <location filename="../ui/controllers/connectionController.cpp" line="100"/>
<source>Connect</source> <source>Connect</source>
<translation type="unfinished">连接</translation> <translation type="unfinished">连接</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/connectionController.cpp" line="55"/> <location filename="../ui/controllers/connectionController.cpp" line="38"/>
<source>VPN Protocols is not installed. <source>VPN Protocols is not installed.
Please install VPN container at first</source> Please install VPN container at first</source>
<translation type="unfinished">不存在VPN协议，请先安装</translation> <translation type="unfinished">不存在VPN协议，请先安装</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/connectionController.cpp" line="78"/> <location filename="../ui/controllers/connectionController.cpp" line="61"/>
<source>Connection...</source> <source>Connection...</source>
<translation type="unfinished">连接中</translation> <translation type="unfinished">连接中</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/connectionController.cpp" line="83"/> <location filename="../ui/controllers/connectionController.cpp" line="66"/>
<source>Connected</source> <source>Connected</source>
<translation type="unfinished">已连接</translation> <translation type="unfinished">已连接</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/connectionController.cpp" line="92"/> <location filename="../ui/controllers/connectionController.cpp" line="75"/>
<source>Reconnection...</source> <source>Reconnection...</source>
<translation type="unfinished">重连中</translation> <translation type="unfinished">重连中</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/connectionController.cpp" line="102"/> <location filename="../ui/controllers/connectionController.cpp" line="85"/>
<source>Disconnection...</source> <source>Disconnection...</source>
<translation type="unfinished">断开中</translation> <translation type="unfinished">断开中</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/connectionController.cpp" line="128"/> <location filename="../ui/controllers/connectionController.cpp" line="111"/>
<source>Settings updated successfully, Reconnnection...</source> <source>Settings updated successfully, Reconnnection...</source>
<translation type="unfinished">配置已更新，重连中</translation> <translation type="unfinished">配置已更新，重连中</translation>
</message> </message>
@ -130,7 +130,7 @@
<context> <context>
<name>ImportController</name> <name>ImportController</name>
<message> <message>
<location filename="../ui/controllers/importController.cpp" line="384"/> <location filename="../ui/controllers/importController.cpp" line="375"/>
<source>Scanned %1 of %2.</source> <source>Scanned %1 of %2.</source>
<translation type="unfinished">扫描 %1 of %2.</translation> <translation type="unfinished">扫描 %1 of %2.</translation>
</message> </message>
@ -147,41 +147,46 @@
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="110"/> <location filename="../ui/controllers/installController.cpp" line="110"/>
<location filename="../ui/controllers/installController.cpp" line="162"/> <location filename="../ui/controllers/installController.cpp" line="161"/>
<source>%1 installed successfully. </source> <source>%1 installed successfully. </source>
<translation type="unfinished">%1 安装成功。</translation> <translation type="unfinished">%1 安装成功。</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="112"/> <location filename="../ui/controllers/installController.cpp" line="112"/>
<location filename="../ui/controllers/installController.cpp" line="164"/> <location filename="../ui/controllers/installController.cpp" line="163"/>
<source>%1 is already installed on the server. </source> <source>%1 is already installed on the server. </source>
<translation type="unfinished">服务器上已经安装 %1。</translation> <translation type="unfinished">服务器上已经安装 %1。</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="115"/> <location filename="../ui/controllers/installController.cpp" line="115"/>
<location filename="../ui/controllers/installController.cpp" line="183"/> <source>
Added containers that were already installed on the server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="182"/>
<source> <source>
Already installed containers were found on the server. All installed containers have been added to the application</source> Already installed containers were found on the server. All installed containers have been added to the application</source>
<translation type="unfinished"> <translation type="unfinished">
在服务上发现已经安装协议并添加到应用程序</translation> 在服务上发现已经安装协议并添加到应用程序</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="264"/> <location filename="../ui/controllers/installController.cpp" line="263"/>
<source>Settings updated successfully</source> <source>Settings updated successfully</source>
<translation type="unfinished">配置更新成功</translation> <translation type="unfinished">配置更新成功</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="279"/> <location filename="../ui/controllers/installController.cpp" line="278"/>
<source>Server &apos;%1&apos; was removed</source> <source>Server &apos;%1&apos; was removed</source>
<translation type="unfinished">已移除服务器 &apos;%1&apos;</translation> <translation type="unfinished">已移除服务器 &apos;%1&apos;</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="289"/> <location filename="../ui/controllers/installController.cpp" line="288"/>
<source>All containers from server &apos;%1&apos; have been removed</source> <source>All containers from server &apos;%1&apos; have been removed</source>
<translation type="unfinished">服务器 &apos;%1&apos; 的所有容器已移除</translation> <translation type="unfinished">服务器 &apos;%1&apos; 的所有容器已移除</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="306"/> <location filename="../ui/controllers/installController.cpp" line="305"/>
<source>%1 has been removed from the server &apos;%2&apos;</source> <source>%1 has been removed from the server &apos;%2&apos;</source>
<translation type="unfinished">%1 已从服务器 &apos;%2&apos; 上移除</translation> <translation type="unfinished">%1 已从服务器 &apos;%2&apos; 上移除</translation>
</message> </message>
@ -202,12 +207,12 @@ Already installed containers were found on the server. All installed containers
<translation type="obsolete"> 协议已从</translation> <translation type="obsolete"> 协议已从</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="452"/> <location filename="../ui/controllers/installController.cpp" line="451"/>
<source>Please login as the user</source> <source>Please login as the user</source>
<translation type="unfinished">请以用户身份登录</translation> <translation type="unfinished">请以用户身份登录</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="479"/> <location filename="../ui/controllers/installController.cpp" line="478"/>
<source>Server added successfully</source> <source>Server added successfully</source>
<translation type="unfinished">服务器添加成功</translation> <translation type="unfinished">服务器添加成功</translation>
</message> </message>
@ -275,12 +280,12 @@ Already installed containers were found on the server. All installed containers
<context> <context>
<name>PageHome</name> <name>PageHome</name>
<message> <message>
<location filename="../ui/qml/Pages2/PageHome.qml" line="193"/> <location filename="../ui/qml/Pages2/PageHome.qml" line="344"/>
<source>VPN protocol</source> <source>VPN protocol</source>
<translation type="unfinished">VPN协议</translation> <translation type="unfinished">VPN协议</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageHome.qml" line="238"/> <location filename="../ui/qml/Pages2/PageHome.qml" line="390"/>
<source>Servers</source> <source>Servers</source>
<translation type="unfinished">服务器</translation> <translation type="unfinished">服务器</translation>
</message> </message>
@ -797,6 +802,11 @@ Already installed containers were found on the server. All installed containers
<source>About AmneziaVPN</source> <source>About AmneziaVPN</source>
<translation type="unfinished">关于</translation> <translation type="unfinished">关于</translation>
</message> </message>
<message>
<location filename="../ui/qml/Pages2/PageSettings.qml" line="114"/>
<source>Close application</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PageSettingsAbout</name> <name>PageSettingsAbout</name>
@ -892,71 +902,76 @@ And if you don&apos;t like the app, all the more support it - the donation will
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="52"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="52"/>
<source>Allow application screenshots</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="72"/>
<source>Auto start</source> <source>Auto start</source>
<translation type="unfinished">自动运行</translation> <translation type="unfinished">自动运行</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
<source>Launch the application every time </source> <source>Launch the application every time </source>
<translation type="unfinished">总是在系统 </translation> <translation type="unfinished">总是在系统 </translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="53"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
<source> starts</source> <source> starts</source>
<translation type="unfinished"> 启动时自动运行运用程序</translation> <translation type="unfinished"> 启动时自动运行运用程序</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="93"/>
<source>Start minimized</source> <source>Start minimized</source>
<translation type="unfinished">最小化</translation> <translation type="unfinished">最小化</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="74"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="94"/>
<source>Launch application minimized</source> <source>Launch application minimized</source>
<translation type="unfinished">开启应用程序时窗口最小化</translation> <translation type="unfinished">开启应用程序时窗口最小化</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="91"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
<source>Language</source> <source>Language</source>
<translation type="unfinished">语言</translation> <translation type="unfinished">语言</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="110"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="130"/>
<source>Logging</source> <source>Logging</source>
<translation type="unfinished">日志</translation> <translation type="unfinished">日志</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
<source>Enabled</source> <source>Enabled</source>
<translation type="unfinished">开启</translation> <translation type="unfinished">开启</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/>
<source>Disabled</source> <source>Disabled</source>
<translation type="unfinished">禁用</translation> <translation type="unfinished">禁用</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="124"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="144"/>
<source>Reset settings and remove all data from the application</source> <source>Reset settings and remove all data from the application</source>
<translation type="unfinished">重置并清理应用的所有数据</translation> <translation type="unfinished">重置并清理应用的所有数据</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="128"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="148"/>
<source>Reset settings and remove all data from the application?</source> <source>Reset settings and remove all data from the application?</source>
<translation type="unfinished">重置并清理应用的所有数据？</translation> <translation type="unfinished">重置并清理应用的所有数据？</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="129"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="149"/>
<source>All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.</source> <source>All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.</source>
<translation type="unfinished">所有配置恢复为默认值。在服务器上保留所有已安装的AmneziaVPN服务。</translation> <translation type="unfinished">所有配置恢复为默认值。在服务器上保留所有已安装的AmneziaVPN服务。</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="130"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="150"/>
<source>Continue</source> <source>Continue</source>
<translation type="unfinished">继续</translation> <translation type="unfinished">继续</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="131"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="151"/>
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished">取消</translation> <translation type="unfinished">取消</translation>
</message> </message>
@ -1561,17 +1576,17 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<context> <context>
<name>PageSetupWizardEasy</name> <name>PageSetupWizardEasy</name>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="66"/> <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="67"/>
<source>What is the level of internet control in your region?</source> <source>What is the level of internet control in your region?</source>
<translation type="unfinished">您所在地区的互联网控制力度如何？</translation> <translation type="unfinished">您所在地区的互联网控制力度如何？</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="136"/> <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="137"/>
<source>Set up a VPN yourself</source> <source>Set up a VPN yourself</source>
<translation type="unfinished">自己架设VPN</translation> <translation type="unfinished">自己架设VPN</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="137"/> <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="138"/>
<source>I want to choose a VPN protocol</source> <source>I want to choose a VPN protocol</source>
<translation type="unfinished">我想选择VPN协议</translation> <translation type="unfinished">我想选择VPN协议</translation>
</message> </message>
@ -1581,7 +1596,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<translation type="unfinished">继续</translation> <translation type="unfinished">继续</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="186"/> <location filename="../ui/qml/Pages2/PageSetupWizardEasy.qml" line="197"/>
<source>Set up later</source> <source>Set up later</source>
<translation type="unfinished">稍后设置</translation> <translation type="unfinished">稍后设置</translation>
</message> </message>
@ -1807,8 +1822,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="175"/> <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 servers, as well as change settings.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Full access to server</source> <source>Full access to server</source>
<translation type="unfinished">获得服务器完整授权</translation> <translation type="obsolete">获得服务器完整授权</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="190"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
@ -1827,33 +1846,37 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="222"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="222"/>
<location filename="../ui/qml/Pages2/PageShare.qml" line="307"/> <source>File with accessing settings to </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="310"/>
<source>File with connection settings to </source> <source>File with connection settings to </source>
<translation type="unfinished">连接配置文件的内容为:</translation> <translation type="unfinished">连接配置文件的内容为:</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="248"/>
<source>Protocols</source> <source>Protocols</source>
<translation type="unfinished">协议</translation> <translation type="obsolete">协议</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="249"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="251"/>
<location filename="../ui/qml/Pages2/PageShare.qml" line="252"/>
<source>Protocol</source> <source>Protocol</source>
<translation type="unfinished">协议</translation> <translation type="unfinished">协议</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="306"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="309"/>
<source>Connection to </source> <source>Connection to </source>
<translation type="unfinished">连接到</translation> <translation type="unfinished">连接到</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="340"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="343"/>
<location filename="../ui/qml/Pages2/PageShare.qml" line="341"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="344"/>
<source>Connection format</source> <source>Connection format</source>
<translation type="unfinished">连接方式</translation> <translation type="unfinished">连接方式</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="379"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="382"/>
<source>Share</source> <source>Share</source>
<translation type="unfinished">共享</translation> <translation type="unfinished">共享</translation>
</message> </message>
@ -2469,6 +2492,16 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<source>error 0x%1: %2</source> <source>error 0x%1: %2</source>
<translation type="unfinished">错误 0x%1: %2</translation> <translation type="unfinished">错误 0x%1: %2</translation>
</message> </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>
<context> <context>
<name>SelectLanguageDrawer</name> <name>SelectLanguageDrawer</name>
@ -2495,22 +2528,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<context> <context>
<name>SettingsController</name> <name>SettingsController</name>
<message> <message>
<location filename="../ui/controllers/settingsController.cpp" line="20"/> <location filename="../ui/controllers/settingsController.cpp" line="25"/>
<source>Software version</source> <source>Software version</source>
<translation type="unfinished">软件版本</translation> <translation type="unfinished">软件版本</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/settingsController.cpp" line="102"/> <location filename="../ui/controllers/settingsController.cpp" line="121"/>
<source>Backup file is corrupted</source> <source>Backup file is corrupted</source>
<translation type="unfinished">备份文件已损坏</translation> <translation type="unfinished">备份文件已损坏</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/settingsController.cpp" line="117"/> <location filename="../ui/controllers/settingsController.cpp" line="136"/>
<source>All settings have been reset to default values</source> <source>All settings have been reset to default values</source>
<translation type="unfinished">所配置恢复为默认值</translation> <translation type="unfinished">所配置恢复为默认值</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/settingsController.cpp" line="123"/> <location filename="../ui/controllers/settingsController.cpp" line="142"/>
<source>Cached profiles cleared</source> <source>Cached profiles cleared</source>
<translation type="unfinished">缓存的配置文件已清除</translation> <translation type="unfinished">缓存的配置文件已清除</translation>
</message> </message>
@ -2540,8 +2573,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
</message> </message>
<message> <message>
<location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="126"/> <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="126"/>
<source>Show connection settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show content</source> <source>Show content</source>
<translation type="unfinished">展示内容</translation> <translation type="obsolete">展示内容</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="250"/> <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="250"/>

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

@ -157,3 +157,8 @@ void PageController::setTriggeredBtConnectButton(bool trigger)
{ {
m_isTriggeredByConnectButton = trigger; m_isTriggeredByConnectButton = trigger;
} }
void PageController::closeApplication()
{
qApp->quit();
}

3
client/ui/controllers/pageController.h
View file

@ -84,10 +84,11 @@ public slots:
void drawerOpen(); void drawerOpen();
void drawerClose(); void drawerClose();
bool isTriggeredByConnectButton(); bool isTriggeredByConnectButton();
void setTriggeredBtConnectButton(bool trigger); void setTriggeredBtConnectButton(bool trigger);
void closeApplication();
signals: signals:
void goToPage(PageLoader::PageEnum page, bool slide = true); void goToPage(PageLoader::PageEnum page, bool slide = true);
void goToStartPage(); void goToStartPage();

7
client/ui/qml/Controls2/LabelWithButtonType.qml
View file

@ -17,6 +17,7 @@ Item {
property string rightImageSource property string rightImageSource
property string leftImageSource property string leftImageSource
property bool isLeftImageHoverEnabled: true //todo separete this qml file to 3
property string textColor: "#d7d8db" property string textColor: "#d7d8db"
property string descriptionColor: "#878B91" property string descriptionColor: "#878B91"
@ -42,9 +43,9 @@ Item {
visible: leftImageSource ? true : false visible: leftImageSource ? true : false
Layout.preferredHeight: rightImageSource ? leftImage.implicitHeight : 56 Layout.preferredHeight: rightImageSource || !isLeftImageHoverEnabled ? leftImage.implicitHeight : 56
Layout.preferredWidth: rightImageSource ? leftImage.implicitWidth : 56 Layout.preferredWidth: rightImageSource || !isLeftImageHoverEnabled ? leftImage.implicitWidth : 56
Layout.rightMargin: rightImageSource ? 16 : 0 Layout.rightMargin: rightImageSource || !isLeftImageHoverEnabled ? 16 : 0
radius: 12 radius: 12
color: "transparent" color: "transparent"

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

@ -107,6 +107,20 @@ PageType {
} }
DividerType {} DividerType {}
LabelWithButtonType {
Layout.fillWidth: true
text: qsTr("Close application")
leftImageSource: "qrc:/images/controls/x-circle.svg"
isLeftImageHoverEnabled: false
clickedFunction: function() {
PageController.closeApplication()
}
}
DividerType {}
} }
} }
} }