From 66c5d2f0a8326133d41063d40eef78b9b3e99a00 Mon Sep 17 00:00:00 2001 From: pokamest Date: Mon, 15 Jan 2024 10:06:20 +0000 Subject: [PATCH] Updated submodule qtkeychain --- client/3rd/qtkeychain | 2 +- client/cmake/3rdparty.cmake | 2 +- client/translations/amneziavpn_fa_IR.ts | 150 +++++++++-------- client/translations/amneziavpn_ru.ts | 208 ++++++++++++----------- client/translations/amneziavpn_zh_CN.ts | 210 +++++++++++++----------- 5 files changed, 306 insertions(+), 266 deletions(-) diff --git a/client/3rd/qtkeychain b/client/3rd/qtkeychain index f6247fff..74776e2a 160000 --- a/client/3rd/qtkeychain +++ b/client/3rd/qtkeychain @@ -1 +1 @@ -Subproject commit f6247fff2a97b5036f7a7a53eefc314f41916126 +Subproject commit 74776e2a3e2d98d19943e0968901c5b5e04cc1bd diff --git a/client/cmake/3rdparty.cmake b/client/cmake/3rdparty.cmake index ca7d659e..ec544764 100644 --- a/client/cmake/3rdparty.cmake +++ b/client/cmake/3rdparty.cmake @@ -90,7 +90,7 @@ include_directories( ${LIBSSH_ROOT_DIR}/include ${CLIENT_ROOT_DIR}/3rd/libssh/include ${CLIENT_ROOT_DIR}/3rd/QSimpleCrypto/include - ${CLIENT_ROOT_DIR}/3rd/qtkeychain + ${CLIENT_ROOT_DIR}/3rd/qtkeychain/qtkeychain ${CMAKE_CURRENT_BINARY_DIR}/3rd/qtkeychain ${CMAKE_CURRENT_BINARY_DIR}/3rd/libssh/include ) diff --git a/client/translations/amneziavpn_fa_IR.ts b/client/translations/amneziavpn_fa_IR.ts index bf93a619..e843f807 100644 --- a/client/translations/amneziavpn_fa_IR.ts +++ b/client/translations/amneziavpn_fa_IR.ts @@ -946,6 +946,11 @@ Already installed containers were found on the server. All installed containers Show other methods on Github نمایش متد‎های دیگر در گیت هاب + + + https://github.com/amnezia-vpn/amnezia-client#donate + + Contacts @@ -1854,6 +1859,11 @@ and will not be shared or disclosed to the Amnezia or any third parties I have nothing من هیچی ندارم + + + https://amnezia.org/instructions/0_starter-guide + + PageSetupWizardTextKey @@ -2178,38 +2188,38 @@ and will not be shared or disclosed to the Amnezia or any third parties QKeychain::DeletePasswordJobPrivate - + Password entry not found Password entry not found - + Could not decrypt data Could not decrypt data - - + + Unknown error Unknown error - + Could not open wallet: %1; %2 Could not open wallet: %1; %2 - + Password not found Password not found - + Could not open keystore Could not open keystore - + Could not remove private key from keystore Could not remove private key from keystore @@ -2217,12 +2227,12 @@ and will not be shared or disclosed to the Amnezia or any third parties QKeychain::JobPrivate - + Unknown error Unknown error - + Access to keychain denied Access to keychain denied @@ -2230,27 +2240,27 @@ and will not be shared or disclosed to the Amnezia or any third parties QKeychain::PlainTextStore - + Could not store data in settings: access error Could not store data in settings: access error - + Could not store data in settings: format error Could not store data in settings: format error - + Could not delete data from settings: access error Could not delete data from settings: access error - + Could not delete data from settings: format error Could not delete data from settings: format error - + Entry not found Entry not found @@ -2258,80 +2268,80 @@ and will not be shared or disclosed to the Amnezia or any third parties QKeychain::ReadPasswordJobPrivate - + Password entry not found Password entry not found - - + + Could not decrypt data Could not decrypt data - + D-Bus is not running D-Bus is not running - - + + Unknown error Unknown error - + No keychain service available No keychain service available - + Could not open wallet: %1; %2 Could not open wallet: %1; %2 - + Access to keychain denied Access to keychain denied - + Could not determine data type: %1; %2 Could not determine data type: %1; %2 - - + + Entry not found Entry not found - + Unsupported entry type 'Map' Unsupported entry type 'Map' - + Unknown kwallet entry type '%1' Unknown kwallet entry type '%1' - + Password not found Password not found - + Could not open keystore Could not open keystore - + Could not retrieve private key from keystore Could not retrieve private key from keystore - + Could not create decryption cipher Could not create decryption cipher @@ -2339,73 +2349,73 @@ and will not be shared or disclosed to the Amnezia or any third parties QKeychain::WritePasswordJobPrivate - + Credential size exceeds maximum size of %1 Credential size exceeds maximum size of %1 - + Credential key exceeds maximum size of %1 Credential key exceeds maximum size of %1 - + Writing credentials failed: Win32 error code %1 Writing credentials failed: Win32 error code %1 - + Encryption failed Encryption failed - + D-Bus is not running D-Bus is not running - - + + Unknown error Unknown error - + Could not open wallet: %1; %2 Could not open wallet: %1; %2 - + Password not found Password not found - + Could not open keystore Could not open keystore - + Could not create private key generator Could not create private key generator - + Could not generate new private key Could not generate new private key - + Could not retrieve private key from keystore Could not retrieve private key from keystore - + Could not create encryption cipher Could not create encryption cipher - + Could not encrypt data Could not encrypt data @@ -2855,74 +2865,72 @@ This means that AmneziaWG keeps the fast performance of the original while addin سرویس Sftp - + Entry not found Entry not found - + Access to keychain denied Access to keychain denied - + No keyring daemon No keyring daemon - + Already unlocked Already unlocked - + No such keyring No such keyring - + Bad arguments Bad arguments - + I/O error I/O error - + Cancelled Cancelled - + Keyring already exists Keyring already exists - + No match No match - + Unknown error Unknown error - + error 0x%1: %2 error 0x%1: %2 - WireGuard Configuration Highlighter - هایلایتر پیکربندی WireGuard + هایلایتر پیکربندی WireGuard - &Randomize colors - رنگ‎های تصادفی + رنگ‎های تصادفی @@ -2936,13 +2944,13 @@ This means that AmneziaWG keeps the fast performance of the original while addin Settings - + Server #1 Server #1 - - + + Server Server @@ -2950,22 +2958,22 @@ This means that AmneziaWG keeps the fast performance of the original while addin SettingsController - + Software version نسخه نرم‎افزار - + All settings have been reset to default values تمام تنظیمات به مقادیر پیش فرض ریست شد - + Cached profiles cleared پروفایل ذخیره شده پاک شد - + Backup file is corrupted فایل بک‎آپ خراب شده است diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts index 58171e67..ed580ec0 100644 --- a/client/translations/amneziavpn_ru.ts +++ b/client/translations/amneziavpn_ru.ts @@ -15,15 +15,13 @@ AndroidController - AmneziaVPN - AmneziaVPN + AmneziaVPN - VPN Connected Refers to the app - which is currently running the background and waiting - VPN Подключен + VPN Подключен @@ -151,7 +149,7 @@ ImportController - + Scanned %1 of %2. Отсканировано %1 из%2. @@ -946,6 +944,11 @@ Already installed containers were found on the server. All installed containers Show other methods on Github Показать другие способы на Github + + + https://github.com/amnezia-vpn/amnezia-client#donate + + Contacts @@ -1428,22 +1431,22 @@ Already installed containers were found on the server. All installed containers Имя сервера - + Save Сохранить - + Protocols Протоколы - + Services Сервисы - + Data Данные @@ -1854,6 +1857,11 @@ and will not be shared or disclosed to the Amnezia or any third parties I have nothing У меня ничего нет + + + https://amnezia.org/instructions/0_starter-guide + + PageSetupWizardTextKey @@ -1941,8 +1949,8 @@ and will not be shared or disclosed to the Amnezia or any third parties Доступ к управлению сервером. Пользователь, с которым вы делитесь полным доступом к соединению, сможет добавлять и удалять ваши протоколы и службы на сервере, а также изменять настройки. - + Server Сервер @@ -2017,7 +2025,7 @@ and will not be shared or disclosed to the Amnezia or any third parties - + Users Пользователи @@ -2027,47 +2035,52 @@ and will not be shared or disclosed to the Amnezia or any third parties Имя пользователя - + Search - + + Creation date: + + + + Rename - + Client name - + Save Сохранить - + Revoke - - Revoke the config for a user - + + Revoke the config for a user - %1? - + The user will no longer be able to connect to your server. Пользователь больше не сможет подключаться к вашему серверу - + Continue Продолжить - + Cancel Отменить @@ -2081,20 +2094,20 @@ and will not be shared or disclosed to the Amnezia or any third parties Поделиться доступом к VPN, без возможности управления сервером - + Protocol Протокол - + Connection format Формат подключения - + Share Поделиться @@ -2124,12 +2137,12 @@ and will not be shared or disclosed to the Amnezia or any third parties Сервер - + Accessing Доступ - + File with accessing settings to @@ -2160,38 +2173,38 @@ and will not be shared or disclosed to the Amnezia or any third parties QKeychain::DeletePasswordJobPrivate - + Password entry not found Password entry not found - + Could not decrypt data Could not decrypt data - - + + Unknown error Unknown error - + Could not open wallet: %1; %2 Could not open wallet: %1; %2 - + Password not found Password not found - + Could not open keystore Could not open keystore - + Could not remove private key from keystore Could not remove private key from keystore @@ -2199,12 +2212,12 @@ and will not be shared or disclosed to the Amnezia or any third parties QKeychain::JobPrivate - + Unknown error Unknown error - + Access to keychain denied Access to keychain denied @@ -2212,27 +2225,27 @@ and will not be shared or disclosed to the Amnezia or any third parties QKeychain::PlainTextStore - + Could not store data in settings: access error Could not store data in settings: access error - + Could not store data in settings: format error Could not store data in settings: format error - + Could not delete data from settings: access error Could not delete data from settings: access error - + Could not delete data from settings: format error Could not delete data from settings: format error - + Entry not found Entry not found @@ -2240,80 +2253,80 @@ and will not be shared or disclosed to the Amnezia or any third parties QKeychain::ReadPasswordJobPrivate - + Password entry not found Password entry not found - - + + Could not decrypt data Could not decrypt data - + D-Bus is not running D-Bus is not running - - + + Unknown error Unknown error - + No keychain service available No keychain service available - + Could not open wallet: %1; %2 Could not open wallet: %1; %2 - + Access to keychain denied Access to keychain denied - + Could not determine data type: %1; %2 Could not determine data type: %1; %2 - - + + Entry not found Entry not found - + Unsupported entry type 'Map' Unsupported entry type 'Map' - + Unknown kwallet entry type '%1' Unknown kwallet entry type '%1' - + Password not found Password not found - + Could not open keystore Could not open keystore - + Could not retrieve private key from keystore Could not retrieve private key from keystore - + Could not create decryption cipher Could not create decryption cipher @@ -2321,73 +2334,73 @@ and will not be shared or disclosed to the Amnezia or any third parties QKeychain::WritePasswordJobPrivate - + Credential size exceeds maximum size of %1 Credential size exceeds maximum size of %1 - + Credential key exceeds maximum size of %1 Credential key exceeds maximum size of %1 - + Writing credentials failed: Win32 error code %1 Writing credentials failed: Win32 error code %1 - + Encryption failed Encryption failed - + D-Bus is not running D-Bus is not running - - + + Unknown error Unknown error - + Could not open wallet: %1; %2 Could not open wallet: %1; %2 - + Password not found Password not found - + Could not open keystore Could not open keystore - + Could not create private key generator Could not create private key generator - + Could not generate new private key Could not generate new private key - + Could not retrieve private key from keystore Could not retrieve private key from keystore - + Could not create encryption cipher Could not create encryption cipher - + Could not encrypt data Could not encrypt data @@ -2594,7 +2607,12 @@ and will not be shared or disclosed to the Amnezia or any third parties VPN pool error: no available addresses - + + VPN connection error + + + + Internal error Internal error @@ -2822,62 +2840,62 @@ This means that AmneziaWG keeps the fast performance of the original while addin Сервис SFTP - + Entry not found Entry not found - + Access to keychain denied Access to keychain denied - + No keyring daemon No keyring daemon - + Already unlocked Already unlocked - + No such keyring No such keyring - + Bad arguments Bad arguments - + I/O error I/O error - + Cancelled Cancelled - + Keyring already exists Keyring already exists - + No match No match - + Unknown error Unknown error - + error 0x%1: %2 error 0x%1: %2 @@ -2893,13 +2911,13 @@ This means that AmneziaWG keeps the fast performance of the original while addin Settings - + Server #1 Server #1 - - + + Server Server @@ -2907,22 +2925,22 @@ This means that AmneziaWG keeps the fast performance of the original while addin SettingsController - + Software version Версия ПО - + All settings have been reset to default values Все настройки были сброшены к значению "По умолчанию" - + Cached profiles cleared Кэш профиля очищен - + Backup file is corrupted Backup файл поврежден @@ -3054,7 +3072,7 @@ This means that AmneziaWG keeps the fast performance of the original while addin VpnConnection - + Mbps Mbps diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts index e63344d8..7143c76b 100644 --- a/client/translations/amneziavpn_zh_CN.ts +++ b/client/translations/amneziavpn_zh_CN.ts @@ -11,15 +11,9 @@ AndroidController - - AmneziaVPN - - - - VPN Connected Refers to the app - which is currently running the background and waiting - VPN已连接 + VPN已连接 @@ -158,7 +152,7 @@ ImportController - + Scanned %1 of %2. 扫描 %1 of %2. @@ -997,6 +991,11 @@ And if you don't like the app, all the more support it - the donation will Show other methods on Github 其他捐款途径 + + + https://github.com/amnezia-vpn/amnezia-client#donate + + Contacts @@ -1511,22 +1510,22 @@ And if you don't like the app, all the more support it - the donation will 服务器名 - + Save 保存 - + Protocols 协议 - + Services 服务 - + Data 数据 @@ -1957,6 +1956,11 @@ and will not be shared or disclosed to the Amnezia or any third parties I have nothing 我没有 + + + https://amnezia.org/instructions/0_starter-guide + + PageSetupWizardTextKey @@ -2078,7 +2082,7 @@ and will not be shared or disclosed to the Amnezia or any third parties - + Users @@ -2088,47 +2092,52 @@ and will not be shared or disclosed to the Amnezia or any third parties 共享 VPN 访问，无需管理服务器 - + Search - + + Creation date: + + + + Rename - + Client name - + Save 保存 - + Revoke - - Revoke the config for a user - + + Revoke the config for a user - %1? - + The user will no longer be able to connect to your server. - + Continue 继续 - + Cancel 取消 @@ -2170,8 +2179,8 @@ and will not be shared or disclosed to the Amnezia or any third parties 服务器 - + Server 服务器 @@ -2193,8 +2202,8 @@ and will not be shared or disclosed to the Amnezia or any third parties 协议 - + Protocol 协议 @@ -2214,14 +2223,14 @@ and will not be shared or disclosed to the Amnezia or any third parties - + Connection format 连接格式 - + Share 共享 @@ -2251,12 +2260,12 @@ and will not be shared or disclosed to the Amnezia or any third parties 服务器 - + Accessing 访问 - + File with accessing settings to 访问配置文件的内容为: @@ -2287,38 +2296,38 @@ and will not be shared or disclosed to the Amnezia or any third parties QKeychain::DeletePasswordJobPrivate - + Password entry not found 未发现秘密 - + Could not decrypt data 数据无法加密 - - + + Unknown error 未知错误 - + Could not open wallet: %1; %2 无法打开钱包: %1; %2 - + Password not found 未发现密码 - + Could not open keystore 无法打开密钥库 - + Could not remove private key from keystore 无法从密钥库中删除私钥 @@ -2326,12 +2335,12 @@ and will not be shared or disclosed to the Amnezia or any third parties QKeychain::JobPrivate - + Unknown error 未知错误 - + Access to keychain denied 访问钥匙串被拒绝 @@ -2339,27 +2348,27 @@ and will not be shared or disclosed to the Amnezia or any third parties QKeychain::PlainTextStore - + Could not store data in settings: access error 无法在配置中存储数据：访问错误 - + Could not store data in settings: format error 无法在陪置中存储数据：格式错误 - + Could not delete data from settings: access error 无法在配置中删除数据：访问错误 - + Could not delete data from settings: format error 无法在配置中删除数据：格式错误 - + Entry not found 未找到条目 @@ -2367,80 +2376,80 @@ and will not be shared or disclosed to the Amnezia or any third parties QKeychain::ReadPasswordJobPrivate - + Password entry not found 未发现密码 - - + + Could not decrypt data 数据无法加密 - + D-Bus is not running D-Bus未运行 - - + + Unknown error 未知错误 - + No keychain service available 没有有效的钥匙串服务 - + Could not open wallet: %1; %2 无法打开钱包: %1; %2 - + Access to keychain denied 访问钥匙串被拒绝 - + Could not determine data type: %1; %2 无法确定数据类型: %1； %2 - - + + Entry not found 未找到记录 - + Unsupported entry type 'Map' 不支持的记录类型 'Map' - + Unknown kwallet entry type '%1' 未知钱包类型 '%1' - + Password not found 未发现密码 - + Could not open keystore 无法打开密钥库 - + Could not retrieve private key from keystore 无法从密钥存储库中检索私钥 - + Could not create decryption cipher 无法创建解密算法 @@ -2448,73 +2457,73 @@ and will not be shared or disclosed to the Amnezia or any third parties QKeychain::WritePasswordJobPrivate - + Credential size exceeds maximum size of %1 证书大小超过上限，最大为: %1 - + Credential key exceeds maximum size of %1 凭证密钥大小超过上限，最大为: %1 - + Writing credentials failed: Win32 error code %1 写入凭证失败，Win32错误码: %1 - + Encryption failed 加密失败 - + D-Bus is not running D-Bus未运行 - - + + Unknown error 未知错误 - + Could not open wallet: %1; %2 无法打开钱包: %1; %2 - + Password not found 未发现密码 - + Could not open keystore 无法打开密钥库 - + Could not create private key generator 无法创建私钥生成器 - + Could not generate new private key 无法生成新的私钥 - + Could not retrieve private key from keystore 无法从密钥库检索私钥 - + Could not create encryption cipher 无法创建加密密码 - + Could not encrypt data 无法加密数据 @@ -2666,6 +2675,11 @@ and will not be shared or disclosed to the Amnezia or any third parties Sftp error: No media was in remote drive Sftp 错误: 远程驱动器中没有媒介 + + + VPN connection error + + Failed to save config to disk 配置保存到磁盘失败 @@ -2730,7 +2744,7 @@ and will not be shared or disclosed to the Amnezia or any third parties 该配置不包含任何用于连接到服务器的容器和凭据。 - + Internal error 内部错误 @@ -2970,62 +2984,62 @@ While it offers a blend of security, stability, and speed, it's essential t Sftp 文件共享服务 - 安全的 FTP 服务 - + Entry not found 未找到记录 - + Access to keychain denied 访问钥匙串被拒绝 - + No keyring daemon 没有密钥环守护进程 - + Already unlocked 已经解锁 - + No such keyring 没有这样的密钥环 - + Bad arguments 错误参数 - + I/O error I/O错误 - + Cancelled 已取消 - + Keyring already exists 密匙环已经存在 - + No match 不匹配 - + Unknown error 未知错误 - + error 0x%1: %2 错误 0x%1: %2 @@ -3041,13 +3055,13 @@ While it offers a blend of security, stability, and speed, it's essential t Settings - + Server #1 - - + + Server 服务器 @@ -3055,22 +3069,22 @@ While it offers a blend of security, stability, and speed, it's essential t SettingsController - + Software version 软件版本 - + Backup file is corrupted 备份文件已损坏 - + All settings have been reset to default values 所配置恢复为默认值 - + Cached profiles cleared 缓存的配置文件已清除 @@ -3206,7 +3220,7 @@ While it offers a blend of security, stability, and speed, it's essential t VpnConnection - + Mbps