Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into dev
This commit is contained in:
vladimir.kuznetsov
commit
f5448fed59
67 changed files with 2326 additions and 752 deletions
|
|
@ -122,7 +122,7 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Components/HomeContainersListView.qml" line="77"/>
|
||||
<location filename="../ui/qml/Components/HomeContainersListView.qml" line="76"/>
|
||||
<source>Reconnect via VPN Procotol: </source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
@ -265,6 +265,94 @@ Already installed containers were found on the server. All installed containers
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PageProtocolAwgSettings</name>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="76"/>
|
||||
<source>AmneziaWG settings</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="84"/>
|
||||
<source>Port</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="103"/>
|
||||
<source>Junk packet count</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="126"/>
|
||||
<source>Junk packet minimum size</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="144"/>
|
||||
<source>Junk packet maximum size</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="162"/>
|
||||
<source>Init packet junk size</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="180"/>
|
||||
<source>Response packet junk size</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="198"/>
|
||||
<source>Init packet magic header</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="216"/>
|
||||
<source>Response packet magic header</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="234"/>
|
||||
<source>Transport packet magic header</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="252"/>
|
||||
<source>Underload packet magic header</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="275"/>
|
||||
<source>Remove AmneziaWG</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="278"/>
|
||||
<source>Remove AmneziaWG from server?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="279"/>
|
||||
<source>All users who you shared a connection with will no longer be able to connect to it.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="280"/>
|
||||
<source>Continue</source>
|
||||
<translation type="unfinished">Продолжить</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="281"/>
|
||||
<source>Cancel</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="311"/>
|
||||
<source>Save and Restart Amnezia</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PageProtocolCloakSettings</name>
|
||||
<message>
|
||||
|
|
@ -504,7 +592,7 @@ Already installed containers were found on the server. All installed containers
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="130"/>
|
||||
<source>Connection options </source>
|
||||
<source>Connection options %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
|
@ -772,7 +860,7 @@ Already installed containers were found on the server. All installed containers
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettings.qml" line="100"/>
|
||||
<location filename="../ui/qml/Pages2/PageSettings.qml" line="101"/>
|
||||
<source>About AmneziaVPN</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
@ -889,12 +977,7 @@ Already installed containers were found on the server. All installed containers
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
|
||||
<source>Launch the application every time </source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
|
||||
<source> starts</source>
|
||||
<source>Launch the application every time %1 starts</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
|
@ -1061,21 +1144,21 @@ Already installed containers were found on the server. All installed containers
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="99"/>
|
||||
<source>Split site tunneling</source>
|
||||
<source>Site-based split tunneling</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="100"/>
|
||||
<source>Allows you to choose which sites you want to use the VPN for.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="113"/>
|
||||
<source>Separate application tunneling</source>
|
||||
<source>Allows you to select which sites you want to access through the VPN</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="114"/>
|
||||
<source>App-based split tunneling</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="115"/>
|
||||
<source>Allows you to use the VPN only for certain applications</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
@ -1356,17 +1439,17 @@ Already installed containers were found on the server. All installed containers
|
|||
<name>PageSettingsSplitTunneling</name>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="49"/>
|
||||
<source>Only the addresses in the list must be opened via VPN</source>
|
||||
<source>Addresses from the list should be accessed via VPN</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="54"/>
|
||||
<source>Addresses from the list should never be opened via VPN</source>
|
||||
<source>Addresses from the list should not be accessed via VPN</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="84"/>
|
||||
<source>Split site tunneling</source>
|
||||
<source>Split tunneling</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
|
@ -2288,103 +2371,109 @@ It's okay as long as it's from someone you trust.</source>
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="87"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="88"/>
|
||||
<source>IPsec</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="133"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="138"/>
|
||||
<source>DNS Service</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="92"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="93"/>
|
||||
<source>Sftp file sharing service</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="89"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="132"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="90"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="137"/>
|
||||
<source>Website in Tor network</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="90"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="91"/>
|
||||
<source>Amnezia DNS</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="98"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="99"/>
|
||||
<source>OpenVPN is the most popular VPN protocol, with flexible configuration options. It uses its own security protocol with SSL/TLS for key exchange.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="101"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="102"/>
|
||||
<source>ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but is recognised by analysis systems in some highly censored regions.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="104"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="105"/>
|
||||
<source>OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probbing detection. Ideal for bypassing blocking in regions with the highest levels of censorship.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="108"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="109"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="112"/>
|
||||
<source>WireGuard - New popular VPN protocol with high performance, high speed and low power consumption. Recommended for regions with low levels of censorship.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="111"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="115"/>
|
||||
<source>IKEv2 - Modern stable protocol, a bit faster than others, restores connection after signal loss. It has native support on the latest versions of Android and iOS.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="114"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="118"/>
|
||||
<source>Deploy a WordPress site on the Tor network in two clicks.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="116"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="120"/>
|
||||
<source>Replace the current DNS server with your own. This will increase your privacy level.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="119"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="123"/>
|
||||
<source>Creates a file vault on your server to securely store and transfer files.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="124"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="128"/>
|
||||
<source>OpenVPN container</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="125"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="129"/>
|
||||
<source>Container with OpenVpn and ShadowSocks</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="127"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="131"/>
|
||||
<source>Container with OpenVpn and ShadowSocks protocols configured with traffic masking by Cloak plugin</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="129"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="133"/>
|
||||
<source>WireGuard container</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="130"/>
|
||||
<source>IPsec container</source>
|
||||
<location filename="../containers/containers_defs.cpp" line="134"/>
|
||||
<source>AmneziaWG container</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="135"/>
|
||||
<source>IPsec container</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="140"/>
|
||||
<source>Sftp file sharing service - is secure FTP service</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../protocols/protocols_defs.cpp" line="75"/>
|
||||
<location filename="../protocols/protocols_defs.cpp" line="76"/>
|
||||
<source>Sftp service</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
@ -2448,16 +2537,6 @@ It's okay as long as it's from someone you trust.</source>
|
|||
<source>error 0x%1: %2</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
|
||||
<source>WireGuard Configuration Highlighter</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
|
||||
<source>&Randomize colors</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>SelectLanguageDrawer</name>
|
||||
|
|
@ -2567,7 +2646,7 @@ It's okay as long as it's from someone you trust.</source>
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../ui/controllers/sitesController.cpp" line="100"/>
|
||||
<source>The JSON data is not an array in file: </source>
|
||||
<source>The JSON data is not an array in file: %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
|
@ -2614,6 +2693,14 @@ It's okay as long as it's from someone you trust.</source>
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>TextFieldWithHeaderType</name>
|
||||
<message>
|
||||
<location filename="../ui/qml/Controls2/TextFieldWithHeaderType.qml" line="105"/>
|
||||
<source>The field can't be empty</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>VpnConnection</name>
|
||||
<message>
|
||||
|
|
@ -2668,32 +2755,32 @@ It's okay as long as it's from someone you trust.</source>
|
|||
<context>
|
||||
<name>amnezia::ContainerProps</name>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="236"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="245"/>
|
||||
<source>Low</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="237"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="246"/>
|
||||
<source>High</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="238"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="247"/>
|
||||
<source>Medium</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="247"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="256"/>
|
||||
<source>Many foreign websites and VPN providers are blocked</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="248"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="257"/>
|
||||
<source>Some foreign sites are blocked, but VPN providers are not blocked</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../containers/containers_defs.cpp" line="246"/>
|
||||
<location filename="../containers/containers_defs.cpp" line="255"/>
|
||||
<source>I just want to increase the level of privacy</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue