From bb2d794b6fe596b11321e9fbb0e8cc828ea59c01 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Mon, 9 Oct 2023 23:18:24 +0500 Subject: [PATCH] corrections to the text --- client/containers/containers_defs.cpp | 4 +- client/protocols/protocols_defs.cpp | 2 +- client/translations/amneziavpn_ru.ts | 298 ++++++++++++------ client/translations/amneziavpn_zh_CN.ts | 294 ++++++++++++----- .../ui/qml/Pages2/PageProtocolAwgSettings.qml | 8 +- 5 files changed, 431 insertions(+), 175 deletions(-) diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp index 0337eb44..fd13bfe0 100644 --- a/client/containers/containers_defs.cpp +++ b/client/containers/containers_defs.cpp @@ -84,7 +84,7 @@ QMap ContainerProps::containerHumanNames() { DockerContainer::ShadowSocks, "ShadowSocks" }, { DockerContainer::Cloak, "OpenVPN over Cloak" }, { DockerContainer::WireGuard, "WireGuard" }, - { DockerContainer::Awg, "Amnezia WireGuard" }, + { DockerContainer::Awg, "AmneziaWG" }, { DockerContainer::Ipsec, QObject::tr("IPsec") }, { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") }, @@ -131,7 +131,7 @@ QMap ContainerProps::containerDetailedDescriptions() QObject::tr("Container with OpenVpn and ShadowSocks protocols " "configured with traffic masking by Cloak plugin") }, { DockerContainer::WireGuard, QObject::tr("WireGuard container") }, - { DockerContainer::WireGuard, QObject::tr("Amnezia WireGuard container") }, + { DockerContainer::WireGuard, QObject::tr("AmneziaWG container") }, { DockerContainer::Ipsec, QObject::tr("IPsec container") }, { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") }, diff --git a/client/protocols/protocols_defs.cpp b/client/protocols/protocols_defs.cpp index 3982ef9c..b7f6b1d8 100644 --- a/client/protocols/protocols_defs.cpp +++ b/client/protocols/protocols_defs.cpp @@ -66,7 +66,7 @@ QMap ProtocolProps::protocolHumanNames() { Proto::ShadowSocks, "ShadowSocks" }, { Proto::Cloak, "Cloak" }, { Proto::WireGuard, "WireGuard" }, - { Proto::WireGuard, "Amnezia WireGuard" }, + { Proto::WireGuard, "AmneziaWG" }, { Proto::Ikev2, "IKEv2" }, { Proto::L2tp, "L2TP" }, diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts index e0bab018..f2e7a811 100644 --- a/client/translations/amneziavpn_ru.ts +++ b/client/translations/amneziavpn_ru.ts @@ -26,41 +26,41 @@ ConnectionController - + VPN Protocols is not installed. Please install VPN container at first - + Connection... - + Connected - + Settings updated successfully, Reconnnection... - + Reconnection... - - - + + + Connect - + Disconnection... @@ -122,7 +122,7 @@ - + Reconnect via VPN Procotol: @@ -130,7 +130,7 @@ ImportController - + Scanned %1 of %2. @@ -139,50 +139,55 @@ InstallController - + %1 installed successfully. - + %1 is already installed on the server. - + +Added containers that were already installed on the server + + + + Already installed containers were found on the server. All installed containers have been added to the application - + Settings updated successfully - + Server '%1' was removed - + All containers from server '%1' have been removed - + %1 has been removed from the server '%2' - + Please login as the user - + Server added successfully @@ -250,16 +255,104 @@ Already installed containers were found on the server. All installed containers PageHome - + VPN protocol - + Servers + + PageProtocolAwgSettings + + + AmneziaWG settings + + + + + Port + + + + + Junk packet count + + + + + Junk packet minimum size + + + + + Junk packet maximum size + + + + + Init packet junk size + + + + + Response packet junk size + + + + + Init packet magic header + + + + + Response packet magic header + + + + + Transport packet magic header + + + + + Underload packet magic header + + + + + Remove AmneziaWG + + + + + Remove AmneziaWG from server? + + + + + All users who you shared a connection with will no longer be able to connect to it. + + + + + Continue + Продолжить + + + + Cancel + + + + + Save and Restart Amnezia + + + PageProtocolCloakSettings @@ -865,71 +958,76 @@ And if you don't like the app, all the more support it - the donation will + Allow application screenshots + + + + Auto start - + Launch the application every time - + starts - + Start minimized - + Launch application minimized - + Language - + Logging - + Enabled - + Disabled - + Reset settings and remove all data from the application - + Reset settings and remove all data from the application? - + All settings will be reset to default. All installed AmneziaVPN services will still remain on the server. - + Continue Продолжить - + Cancel @@ -1525,17 +1623,17 @@ It's okay as long as it's from someone you trust. PageSetupWizardEasy - + What is the level of internet control in your region? - + Set up a VPN yourself - + I want to choose a VPN protocol @@ -1545,7 +1643,7 @@ It's okay as long as it's from someone you trust. Продолжить - + Set up later @@ -1749,11 +1847,6 @@ It's okay as long as it's from someone you trust. VPN access without the ability to manage the server - - - Full access to server - - Server @@ -1765,13 +1858,17 @@ It's okay as long as it's from someone you trust. - + + File with accessing settings to + + + + Connection to - - + File with connection settings to @@ -1795,29 +1892,30 @@ It's okay as long as it's from someone you trust. Full access + + + 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. + + Servers - - Protocols - - - - + + Protocol - - + + Connection format - + Share @@ -2273,103 +2371,109 @@ It's okay as long as it's from someone you trust. - + IPsec - + DNS Service - + Sftp file sharing service - - + + Website in Tor network - + Amnezia DNS - + OpenVPN is the most popular VPN protocol, with flexible configuration options. It uses its own security protocol with SSL/TLS for key exchange. - + ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but is recognised by analysis systems in some highly censored regions. - + 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. - + + WireGuard - New popular VPN protocol with high performance, high speed and low power consumption. Recommended for regions with low levels of censorship. - + IKEv2 - Modern stable protocol, a bit faster than others, restores connection after signal loss. It has native support on the latest versions of Android and iOS. - + Deploy a WordPress site on the Tor network in two clicks. - + Replace the current DNS server with your own. This will increase your privacy level. - + Creates a file vault on your server to securely store and transfer files. - + OpenVPN container - + Container with OpenVpn and ShadowSocks - + Container with OpenVpn and ShadowSocks protocols configured with traffic masking by Cloak plugin - + WireGuard container - - IPsec container + + AmneziaWG container + IPsec container + + + + Sftp file sharing service - is secure FTP service - + Sftp service @@ -2433,6 +2537,16 @@ It's okay as long as it's from someone you trust. error 0x%1: %2 + + + WireGuard Configuration Highlighter + + + + + &Randomize colors + + SelectLanguageDrawer @@ -2459,22 +2573,22 @@ It's okay as long as it's from someone you trust. SettingsController - + Software version - + All settings have been reset to default values - + Cached profiles cleared - + Backup file is corrupted @@ -2504,7 +2618,7 @@ It's okay as long as it's from someone you trust. - Show content + Show connection settings @@ -2589,6 +2703,14 @@ It's okay as long as it's from someone you trust. + + TextFieldWithHeaderType + + + The field can't be empty + + + VpnConnection @@ -2643,32 +2765,32 @@ It's okay as long as it's from someone you trust. amnezia::ContainerProps - + Low - + High - + Medium - + Many foreign websites and VPN providers are blocked - + Some foreign sites are blocked, but VPN providers are not blocked - + I just want to increase the level of privacy diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts index 37e27786..cbf0caa1 100644 --- a/client/translations/amneziavpn_zh_CN.ts +++ b/client/translations/amneziavpn_zh_CN.ts @@ -27,40 +27,40 @@ ConnectionController - - - + + + Connect 连接 - + VPN Protocols is not installed. Please install VPN container at first 不存在VPN协议，请先安装 - + Connection... 连接中 - + Connected 已连接 - + Reconnection... 重连中 - + Disconnection... 断开中 - + Settings updated successfully, Reconnnection... 配置已更新，重连中 @@ -122,7 +122,7 @@ 当前平台不支持所选协议 - + Reconnect via VPN Procotol: 重连基于VPN协议: @@ -130,7 +130,7 @@ ImportController - + Scanned %1 of %2. 扫描 %1 of %2. @@ -147,41 +147,46 @@ - + %1 installed successfully. %1 安装成功。 - + %1 is already installed on the server. 服务器上已经安装 %1。 - + +Added containers that were already installed on the server + + + + Already installed containers were found on the server. All installed containers have been added to the application 在服务上发现已经安装协议并添加到应用程序 - + Settings updated successfully 配置更新成功 - + Server '%1' was removed 已移除服务器 '%1' - + All containers from server '%1' have been removed 服务器 '%1' 的所有容器已移除 - + %1 has been removed from the server '%2' %1 已从服务器 '%2' 上移除 @@ -202,12 +207,12 @@ Already installed containers were found on the server. All installed containers 协议已从 - + Please login as the user 请以用户身份登录 - + Server added successfully 服务器添加成功 @@ -275,16 +280,104 @@ Already installed containers were found on the server. All installed containers PageHome - + VPN protocol VPN协议 - + Servers 服务器 + + PageProtocolAwgSettings + + + AmneziaWG settings + + + + + Port + 端口 + + + + Junk packet count + + + + + Junk packet minimum size + + + + + Junk packet maximum size + + + + + Init packet junk size + + + + + Response packet junk size + + + + + Init packet magic header + + + + + Response packet magic header + + + + + Transport packet magic header + + + + + Underload packet magic header + + + + + Remove AmneziaWG + + + + + Remove AmneziaWG from server? + + + + + All users who you shared a connection with will no longer be able to connect to it. + + + + + Continue + 继续 + + + + Cancel + 取消 + + + + Save and Restart Amnezia + 保存并重启Amnezia + + PageProtocolCloakSettings @@ -892,71 +985,76 @@ And if you don't like the app, all the more support it - the donation will + Allow application screenshots + + + + Auto start 自动运行 - + Launch the application every time 总是在系统 - + starts 启动时自动运行运用程序 - + Start minimized 最小化 - + Launch application minimized 开启应用程序时窗口最小化 - + Language 语言 - + Logging 日志 - + Enabled 开启 - + Disabled 禁用 - + Reset settings and remove all data from the application 重置并清理应用的所有数据 - + Reset settings and remove all data from the application? 重置并清理应用的所有数据？ - + All settings will be reset to default. All installed AmneziaVPN services will still remain on the server. 所有配置恢复为默认值。在服务器上保留所有已安装的AmneziaVPN服务。 - + Continue 继续 - + Cancel 取消 @@ -1561,17 +1659,17 @@ It's okay as long as it's from someone you trust. PageSetupWizardEasy - + What is the level of internet control in your region? 您所在地区的互联网控制力度如何？ - + Set up a VPN yourself 自己架设VPN - + I want to choose a VPN protocol 我想选择VPN协议 @@ -1581,7 +1679,7 @@ It's okay as long as it's from someone you trust. 继续 - + Set up later 稍后设置 @@ -1807,8 +1905,12 @@ It's okay as long as it's from someone you trust. + Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the servers, as well as change settings. + + + Full access to server - 获得服务器完整授权 + 获得服务器完整授权 @@ -1827,33 +1929,37 @@ It's okay as long as it's from someone you trust. - + File with accessing settings to + + + + File with connection settings to 连接配置文件的内容为: - Protocols - 协议 + 协议 - + + Protocol 协议 - + Connection to 连接到 - - + + Connection format 连接方式 - + Share 共享 @@ -2104,7 +2210,7 @@ It's okay as long as it's from someone you trust. QObject - + Sftp service Sftp 服务 @@ -2314,98 +2420,104 @@ It's okay as long as it's from someone you trust. 内部错误 - + IPsec - - + + Website in Tor network 在 Tor 网络中架设网站 - + Amnezia DNS - + Sftp file sharing service SFTP文件共享服务 - + OpenVPN is the most popular VPN protocol, with flexible configuration options. It uses its own security protocol with SSL/TLS for key exchange. OpenVPN 是最流行的 VPN 协议，具有灵活的配置选项。它使用自己的安全协议与 SSL/TLS 进行密钥交换。 - + ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but is recognised by analysis systems in some highly censored regions. ShadowSocks - 混淆 VPN 流量，使其与正常的 Web 流量相似，但在一些审查力度高的地区可以被分析系统识别。 - + 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. OpenVPN over Cloak - OpenVPN 与 VPN 具有伪装成网络流量和防止主动探测检测的保护。非常适合绕过审查力度特别强的地区的封锁。 - + + WireGuard - New popular VPN protocol with high performance, high speed and low power consumption. Recommended for regions with low levels of censorship. WireGuard - 新型流行的VPN协议，具有高性能、高速度和低功耗。建议用于审查力度较低的地区 - + 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. IKEv2 - 现代稳定协议，相比其他协议较快一些，在信号丢失后恢复连接。Android 和 iOS最新版原生支持。 - + Deploy a WordPress site on the Tor network in two clicks. 只需点击两次即可架设 WordPress 网站到 Tor 网络 - + Replace the current DNS server with your own. This will increase your privacy level. 将当前的 DNS 服务器替换为您自己的。这将提高您的隐私级别。 - + Creates a file vault on your server to securely store and transfer files. 在您的服务器上创建文件库以安全地存储和传输文件 - + OpenVPN container OpenVPN容器 - + Container with OpenVpn and ShadowSocks 带有 OpenVpn 和 ShadowSocks 的容器 - + Container with OpenVpn and ShadowSocks protocols configured with traffic masking by Cloak plugin 具有 OpenVpn 和 ShadowSocks 协议的容器，通过 Cloak 插件配置混淆流量 - + WireGuard container WireGuard 容器 - + + AmneziaWG container + + + + IPsec container IPsec 容器 - + DNS Service DNS 服务 - + Sftp file sharing service - is secure FTP service Sftp 文件共享服务 - 安全的 FTP 服务 @@ -2469,6 +2581,16 @@ It's okay as long as it's from someone you trust. error 0x%1: %2 错误 0x%1: %2 + + + WireGuard Configuration Highlighter + + + + + &Randomize colors + + SelectLanguageDrawer @@ -2495,22 +2617,22 @@ It's okay as long as it's from someone you trust. SettingsController - + Software version 软件版本 - + Backup file is corrupted 备份文件已损坏 - + All settings have been reset to default values 所配置恢复为默认值 - + Cached profiles cleared 缓存的配置文件已清除 @@ -2540,8 +2662,12 @@ It's okay as long as it's from someone you trust. + Show connection settings + + + Show content - 展示内容 + 展示内容 @@ -2625,6 +2751,14 @@ It's okay as long as it's from someone you trust. 退出 + + TextFieldWithHeaderType + + + The field can't be empty + + + VpnConnection @@ -2679,32 +2813,32 @@ It's okay as long as it's from someone you trust. amnezia::ContainerProps - + Low 低 - + High 高 - + Medium 中 - + I just want to increase the level of privacy 我只是想提高隐私级别 - + Many foreign websites and VPN providers are blocked 大多国外网站和VPN提供商被屏蔽 - + Some foreign sites are blocked, but VPN providers are not blocked 一些国外网站被屏蔽，但VPN提供商未被屏蔽 diff --git a/client/ui/qml/Pages2/PageProtocolAwgSettings.qml b/client/ui/qml/Pages2/PageProtocolAwgSettings.qml index 69d34114..079c85a1 100644 --- a/client/ui/qml/Pages2/PageProtocolAwgSettings.qml +++ b/client/ui/qml/Pages2/PageProtocolAwgSettings.qml @@ -73,7 +73,7 @@ PageType { HeaderType { Layout.fillWidth: true - headerText: qsTr("Amnezia WireGuard settings") + headerText: qsTr("AmneziaWG settings") } TextFieldWithHeaderType { @@ -272,11 +272,11 @@ PageType { pressedColor: Qt.rgba(1, 1, 1, 0.12) textColor: "#EB5757" - text: qsTr("Remove Amnezia WireGuard") + text: qsTr("Remove AmneziaWG") onClicked: { - questionDrawer.headerText = qsTr("Remove Amnezia WireGuard from server?") - questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it") + questionDrawer.headerText = qsTr("Remove AmneziaWG from server?") + questionDrawer.descriptionText = qsTr("All users who you shared a connection with will no longer be able to connect to it.") questionDrawer.yesButtonText = qsTr("Continue") questionDrawer.noButtonText = qsTr("Cancel")