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

Merge branch 'dev' into feature/killswitch-strict-mode

Browse source
This commit is contained in:
aiamnezia 2025-04-17 02:22:46 +04:00
commit b88cb4303a
23 changed files with 6735 additions and 2754 deletions
Download patch file Download diff file Expand all files Collapse all files

61
.github/workflows/tag-upload.yml vendored
View file

@ -1,64 +1,41 @@
name: 'Upload a new version' name: 'Upload a new version'
on: on:
push: workflow_dispatch:
tags: inputs:
- '[0-9]+.[0-9]+.[0-9]+.[0-9]+' RELEASE_VERSION:
description: 'Release version (e.g. 1.2.3.4)'
required: true
type: string
jobs: jobs:
upload: Upload-S3:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: upload
steps: steps:
- name: Checkout CMakeLists.txt - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
ref: ${{ github.ref_name }} ref: ${{ inputs.RELEASE_VERSION }}
sparse-checkout: | sparse-checkout: |
CMakeLists.txt CMakeLists.txt
deploy/deploy_s3.sh
sparse-checkout-cone-mode: false sparse-checkout-cone-mode: false
- name: Verify git tag - name: Verify git tag
run: | run: |
GIT_TAG=${{ github.ref_name }} TAG_NAME=${{ inputs.RELEASE_VERSION }}
CMAKE_TAG=$(grep 'project.*VERSION' CMakeLists.txt | sed -E 's/.* ([0-9]+.[0-9]+.[0-9]+.[0-9]+)$/\1/') CMAKE_TAG=$(grep 'project.*VERSION' CMakeLists.txt | sed -E 's/.* ([0-9]+.[0-9]+.[0-9]+.[0-9]+)$/\1/')
if [[ "$TAG_NAME" == "$CMAKE_TAG" ]]; then
if [[ "$GIT_TAG" == "$CMAKE_TAG" ]]; then echo "Git tag ($TAG_NAME) matches CMakeLists.txt version ($CMAKE_TAG)."
echo "Git tag ($GIT_TAG) and version in CMakeLists.txt ($CMAKE_TAG) are the same. Continuing..."
else else
echo "Git tag ($GIT_TAG) and version in CMakeLists.txt ($CMAKE_TAG) are not the same! Cancelling..." echo "::error::Mismatch: Git tag ($TAG_NAME) != CMakeLists.txt version ($CMAKE_TAG). Exiting with error..."
exit 1 exit 1
fi fi
- name: Download artifacts from the "${{ github.ref_name }}" tag - name: Setup Rclone
uses: robinraju/release-downloader@v1.8 uses: AnimMouse/setup-rclone@v1
with: with:
tag: ${{ github.ref_name }} rclone_config: ${{ secrets.RCLONE_CONFIG }}
fileName: "AmneziaVPN_(Linux_|)${{ github.ref_name }}*"
out-file-path: ${{ github.ref_name }}
- name: Upload beta version - name: Send dist to S3
uses: jakejarvis/s3-sync-action@master run: bash deploy/deploy_s3.sh ${{ inputs.RELEASE_VERSION }}
if: contains(github.event.base_ref, 'dev')
with:
args: --include "AmneziaVPN*" --delete
env:
AWS_S3_BUCKET: updates
AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_SECRET_ACCESS_KEY }}
AWS_S3_ENDPOINT: https://${{ vars.CF_ACCOUNT_ID }}.r2.cloudflarestorage.com
SOURCE_DIR: ${{ github.ref_name }}
DEST_DIR: beta/${{ github.ref_name }}
- name: Upload stable version
uses: jakejarvis/s3-sync-action@master
if: contains(github.event.base_ref, 'master')
with:
args: --include "AmneziaVPN*" --delete
env:
AWS_S3_BUCKET: updates
AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_SECRET_ACCESS_KEY }}
AWS_S3_ENDPOINT: https://${{ vars.CF_ACCOUNT_ID }}.r2.cloudflarestorage.com
SOURCE_DIR: ${{ github.ref_name }}
DEST_DIR: stable/${{ github.ref_name }}

4
CMakeLists.txt
View file

@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
set(PROJECT AmneziaVPN) set(PROJECT AmneziaVPN)
project(${PROJECT} VERSION 4.8.5.0 project(${PROJECT} VERSION 4.8.6.0
DESCRIPTION "AmneziaVPN" DESCRIPTION "AmneziaVPN"
HOMEPAGE_URL "https://amnezia.org/" HOMEPAGE_URL "https://amnezia.org/"
) )
@ -11,7 +11,7 @@ string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
set(RELEASE_DATE "${CURRENT_DATE}") set(RELEASE_DATE "${CURRENT_DATE}")
set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH}) set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
set(APP_ANDROID_VERSION_CODE 2082) set(APP_ANDROID_VERSION_CODE 2083)
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set(MZ_PLATFORM_NAME "linux") set(MZ_PLATFORM_NAME "linux")

10
client/core/api/apiDefs.h
View file

@ -10,7 +10,8 @@ namespace apiDefs
AmneziaFreeV3, AmneziaFreeV3,
AmneziaPremiumV1, AmneziaPremiumV1,
AmneziaPremiumV2, AmneziaPremiumV2,
SelfHosted SelfHosted,
ExternalPremium
}; };
enum ConfigSource { enum ConfigSource {
@ -43,6 +44,13 @@ namespace apiDefs
constexpr QLatin1String maxDeviceCount("max_device_count"); constexpr QLatin1String maxDeviceCount("max_device_count");
constexpr QLatin1String subscriptionEndDate("subscription_end_date"); constexpr QLatin1String subscriptionEndDate("subscription_end_date");
constexpr QLatin1String issuedConfigs("issued_configs"); constexpr QLatin1String issuedConfigs("issued_configs");
constexpr QLatin1String supportInfo("support_info");
constexpr QLatin1String email("email");
constexpr QLatin1String billingEmail("billing_email");
constexpr QLatin1String website("website");
constexpr QLatin1String websiteName("website_name");
constexpr QLatin1String telegram("telegram");
} }
const int requestTimeoutMsecs = 12 * 1000; // 12 secs const int requestTimeoutMsecs = 12 * 1000; // 12 secs

16
client/core/api/apiUtils.cpp
View file

@ -32,15 +32,17 @@ apiDefs::ConfigType apiUtils::getConfigType(const QJsonObject &serverConfigObjec
constexpr QLatin1String servicePremium("amnezia-premium"); constexpr QLatin1String servicePremium("amnezia-premium");
constexpr QLatin1String serviceFree("amnezia-free"); constexpr QLatin1String serviceFree("amnezia-free");
constexpr QLatin1String serviceExternalPremium("external-premium");
auto apiConfigObject = serverConfigObject.value(apiDefs::key::apiConfig).toObject(); auto apiConfigObject = serverConfigObject.value(apiDefs::key::apiConfig).toObject();
auto stackType = apiConfigObject.value(apiDefs::key::stackType).toString();
auto serviceType = apiConfigObject.value(apiDefs::key::serviceType).toString(); auto serviceType = apiConfigObject.value(apiDefs::key::serviceType).toString();
if (serviceType == servicePremium || stackType == stackPremium) { if (serviceType == servicePremium) {
return apiDefs::ConfigType::AmneziaPremiumV2; return apiDefs::ConfigType::AmneziaPremiumV2;
} else if (serviceType == serviceFree || stackType == stackFree) { } else if (serviceType == serviceFree) {
return apiDefs::ConfigType::AmneziaFreeV3; return apiDefs::ConfigType::AmneziaFreeV3;
} else if (serviceType == serviceExternalPremium) {
return apiDefs::ConfigType::ExternalPremium;
} }
} }
default: { default: {
@ -66,6 +68,7 @@ amnezia::ErrorCode apiUtils::checkNetworkReplyErrors(const QList<QSslError> &ssl
return amnezia::ErrorCode::NoError; return amnezia::ErrorCode::NoError;
} else if (reply->error() == QNetworkReply::NetworkError::OperationCanceledError } else if (reply->error() == QNetworkReply::NetworkError::OperationCanceledError
|| reply->error() == QNetworkReply::NetworkError::TimeoutError) { || reply->error() == QNetworkReply::NetworkError::TimeoutError) {
qDebug() << reply->error();
return amnezia::ErrorCode::ApiConfigTimeoutError; return amnezia::ErrorCode::ApiConfigTimeoutError;
} else { } else {
QString err = reply->errorString(); QString err = reply->errorString();
@ -85,3 +88,10 @@ amnezia::ErrorCode apiUtils::checkNetworkReplyErrors(const QList<QSslError> &ssl
qDebug() << "something went wrong"; qDebug() << "something went wrong";
return amnezia::ErrorCode::InternalError; return amnezia::ErrorCode::InternalError;
} }
bool apiUtils::isPremiumServer(const QJsonObject &serverConfigObject)
{
static const QSet<apiDefs::ConfigType> premiumTypes = { apiDefs::ConfigType::AmneziaPremiumV1, apiDefs::ConfigType::AmneziaPremiumV2,
apiDefs::ConfigType::ExternalPremium };
return premiumTypes.contains(getConfigType(serverConfigObject));
}

2
client/core/api/apiUtils.h
View file

@ -13,6 +13,8 @@ namespace apiUtils
bool isSubscriptionExpired(const QString &subscriptionEndDate); bool isSubscriptionExpired(const QString &subscriptionEndDate);
bool isPremiumServer(const QJsonObject &serverConfigObject);
apiDefs::ConfigType getConfigType(const QJsonObject &serverConfigObject); apiDefs::ConfigType getConfigType(const QJsonObject &serverConfigObject);
apiDefs::ConfigSource getConfigSource(const QJsonObject &serverConfigObject); apiDefs::ConfigSource getConfigSource(const QJsonObject &serverConfigObject);

14
client/core/controllers/gatewayController.cpp
View file

@ -251,6 +251,9 @@ QStringList GatewayController::getProxyUrls()
} }
return endpoints; return endpoints;
} else { } else {
apiUtils::checkNetworkReplyErrors(sslErrors, reply);
qDebug() << "go to the next storage endpoint";
reply->deleteLater(); reply->deleteLater();
} }
} }
@ -261,26 +264,29 @@ bool GatewayController::shouldBypassProxy(QNetworkReply *reply, const QByteArray
const QByteArray &iv, const QByteArray &salt) const QByteArray &iv, const QByteArray &salt)
{ {
if (reply->error() == QNetworkReply::NetworkError::OperationCanceledError || reply->error() == QNetworkReply::NetworkError::TimeoutError) { if (reply->error() == QNetworkReply::NetworkError::OperationCanceledError || reply->error() == QNetworkReply::NetworkError::TimeoutError) {
qDebug() << "Timeout occurred"; qDebug() << "timeout occurred";
qDebug() << reply->error();
return true; return true;
} else if (responseBody.contains("html")) { } else if (responseBody.contains("html")) {
qDebug() << "The response contains an html tag"; qDebug() << "the response contains an html tag";
return true; return true;
} else if (reply->error() == QNetworkReply::NetworkError::ContentNotFoundError) { } else if (reply->error() == QNetworkReply::NetworkError::ContentNotFoundError) {
if (responseBody.contains(errorResponsePattern1) || responseBody.contains(errorResponsePattern2) if (responseBody.contains(errorResponsePattern1) || responseBody.contains(errorResponsePattern2)
|| responseBody.contains(errorResponsePattern3)) { || responseBody.contains(errorResponsePattern3)) {
return false; return false;
} else { } else {
qDebug() << reply->error();
return true; return true;
} }
} else if (reply->error() != QNetworkReply::NetworkError::NoError) { } else if (reply->error() != QNetworkReply::NetworkError::NoError) {
qDebug() << reply->error();
return true; return true;
} else if (checkEncryption) { } else if (checkEncryption) {
try { try {
QSimpleCrypto::QBlockCipher blockCipher; QSimpleCrypto::QBlockCipher blockCipher;
static_cast<void>(blockCipher.decryptAesBlockCipher(responseBody, key, iv, "", salt)); static_cast<void>(blockCipher.decryptAesBlockCipher(responseBody, key, iv, "", salt));
} catch (...) { } catch (...) {
qDebug() << "Failed to decrypt the data"; qDebug() << "failed to decrypt the data";
return true; return true;
} }
} }
@ -301,7 +307,7 @@ void GatewayController::bypassProxy(const QString &endpoint, QNetworkReply *repl
QByteArray responseBody; QByteArray responseBody;
for (const QString &proxyUrl : proxyUrls) { for (const QString &proxyUrl : proxyUrls) {
qDebug() << "Go to the next endpoint"; qDebug() << "go to the next proxy endpoint";
reply->deleteLater(); // delete the previous reply reply->deleteLater(); // delete the previous reply
reply = requestFunction(endpoint.arg(proxyUrl)); reply = requestFunction(endpoint.arg(proxyUrl));

1294
client/translations/amneziavpn_ar_EG.ts
View file

File diff suppressed because it is too large Load diff

1279
client/translations/amneziavpn_fa_IR.ts
View file

File diff suppressed because it is too large Load diff

1263
client/translations/amneziavpn_hi_IN.ts
View file

File diff suppressed because it is too large Load diff

1305
client/translations/amneziavpn_my_MM.ts
View file

File diff suppressed because it is too large Load diff

275
client/translations/amneziavpn_ru_RU.ts
View file

@ -4,9 +4,13 @@
<context> <context>
<name>AdLabel</name> <name>AdLabel</name>
<message> <message>
<location filename="../ui/qml/Components/AdLabel.qml" line="57"/>
<source>Amnezia Premium - for access to any website</source> <source>Amnezia Premium - for access to any website</source>
<translation>Amnezia Premium - для доступа к любым сайтам</translation> <translation type="vanished">Amnezia Premium - для доступа к любым сайтам</translation>
</message>
<message>
<location filename="../ui/qml/Components/AdLabel.qml" line="57"/>
<source>Amnezia Premium - for access to all websites and online resources</source>
<translation>Amnezia Premium - доступ ко всем сайтам и онлайн ресурсам</translation>
</message> </message>
</context> </context>
<context> <context>
@ -56,12 +60,12 @@
<translation>%1 успешно установлен.</translation> <translation>%1 успешно установлен.</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/api/apiConfigsController.cpp" line="258"/> <location filename="../ui/controllers/api/apiConfigsController.cpp" line="257"/>
<source>API config reloaded</source> <source>API config reloaded</source>
<translation>Конфигурация API перезагружена</translation> <translation>Конфигурация API перезагружена</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/api/apiConfigsController.cpp" line="262"/> <location filename="../ui/controllers/api/apiConfigsController.cpp" line="261"/>
<source>Successfully changed the country of connection to %1</source> <source>Successfully changed the country of connection to %1</source>
<translation>Страна подключения изменена на %1</translation> <translation>Страна подключения изменена на %1</translation>
</message> </message>
@ -90,9 +94,8 @@
<translation type="vanished">Amnezia Free - это бесплатный VPN для обхода блокировок в странах с высоким уровнем интернет-цензуры</translation> <translation type="vanished">Amnezia Free - это бесплатный VPN для обхода блокировок в странах с высоким уровнем интернет-цензуры</translation>
</message> </message>
<message> <message>
<location filename="../ui/models/api/apiServicesModel.cpp" line="68"/>
<source>Amnezia Premium is VPN for comfortable work, downloading large files and watching videos in 8K resolution. Works for any sites with no restrictions. Speed up to %1 MBit/s. Unlimited traffic.</source> <source>Amnezia Premium is VPN for comfortable work, downloading large files and watching videos in 8K resolution. Works for any sites with no restrictions. Speed up to %1 MBit/s. Unlimited traffic.</source>
<translation>Amnezia Premium — VPN для комфортной работы, скачивания больших файлов и просмотра видео в высоком разрешении. Скорость до %1 Мбит/с. Безлимитный трафик.</translation> <translation type="vanished">Amnezia Premium — VPN для комфортной работы, скачивания больших файлов и просмотра видео в высоком разрешении. Скорость до %1 Мбит/с. Безлимитный трафик.</translation>
</message> </message>
<message> <message>
<location filename="../ui/models/api/apiServicesModel.cpp" line="72"/> <location filename="../ui/models/api/apiServicesModel.cpp" line="72"/>
@ -101,9 +104,18 @@
<translation>AmneziaFree предоставляет бесплатный неограниченный доступ к базовому набору сайтов и приложений, таким как Facebook, Instagram, Twitter (X), Discord, Telegram и другим. YouTube не включен в бесплатный тариф.</translation> <translation>AmneziaFree предоставляет бесплатный неограниченный доступ к базовому набору сайтов и приложений, таким как Facebook, Instagram, Twitter (X), Discord, Telegram и другим. YouTube не включен в бесплатный тариф.</translation>
</message> </message>
<message> <message>
<location filename="../ui/models/api/apiServicesModel.cpp" line="82"/>
<source>Amnezia Premium is VPN for comfortable work, downloading large files and watching videos in 8K resolution. Works for any sites with no restrictions.</source> <source>Amnezia Premium is VPN for comfortable work, downloading large files and watching videos in 8K resolution. Works for any sites with no restrictions.</source>
<translation>Amnezia Premium — VPN для комфортной работы, скачивания больших файлов и просмотра видео в высоком разрешении. Работает для любых сайтов без ограничений.</translation> <translation type="vanished">Amnezia Premium — VPN для комфортной работы, скачивания больших файлов и просмотра видео в высоком разрешении. Работает для любых сайтов без ограничений.</translation>
</message>
<message>
<location filename="../ui/models/api/apiServicesModel.cpp" line="68"/>
<source>Amnezia Premium is classic VPN for seamless work, downloading large files, and watching videos. Access all websites and online resources. Speeds up to %1 Mbps.</source>
<translation>Amnezia Premium - это классический VPN для комфортной работы, загрузки больших файлов и просмотра видео. Доступ ко всем сайтам и онлайн ресурсам. Скорость - до %1 Мбит/с.</translation>
</message>
<message>
<location filename="../ui/models/api/apiServicesModel.cpp" line="82"/>
<source>Amnezia Premium is classic VPN for for seamless work, downloading large files, and watching videos. Access all websites and online resources.</source>
<translation>Amnezia Premium - это классический VPN для комфортной работы, загрузки больших файлов и просмотра видео. Доступ ко всем сайтам и онлайн ресурсам.</translation>
</message> </message>
<message> <message>
<location filename="../ui/models/api/apiServicesModel.cpp" line="97"/> <location filename="../ui/models/api/apiServicesModel.cpp" line="97"/>
@ -340,14 +352,23 @@ Can&apos;t be disabled for current server</source>
<translation type="vanished">Неверный файл конфигурации</translation> <translation type="vanished">Неверный файл конфигурации</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/importController.cpp" line="651"/> <location filename="../ui/controllers/importController.cpp" line="650"/>
<source>Scanned %1 of %2.</source> <source>Scanned %1 of %2.</source>
<translation>Отсканировано %1 из %2.</translation> <translation>Отсканировано %1 из %2.</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/importController.cpp" line="686"/> <location filename="../ui/controllers/importController.cpp" line="685"/>
<source>This configuration contains an OpenVPN setup. OpenVPN configurations can include malicious scripts, so only add it if you fully trust the provider of this config. </source>
<translation>Эта конфигурация содержит настройки OpenVPN. Конфигурации OpenVPN могут содержать вредоносные скрипты, поэтому добавляйте их только в том случае, если полностью доверяете источнику этого файла. </translation>
</message>
<message>
<location filename="../ui/controllers/importController.cpp" line="689"/>
<source>&lt;br&gt;In the imported configuration, potentially dangerous lines were found:</source>
<translation>&lt;br&gt;В импортированной конфигурации обнаружены потенциально опасные строки:</translation>
</message>
<message>
<source>In the imported configuration, potentially dangerous lines were found:</source> <source>In the imported configuration, potentially dangerous lines were found:</source>
<translation>В импортированной конфигурации были обнаружены потенциально опасные строки:</translation> <translation type="vanished">В импортированной конфигурации были обнаружены потенциально опасные строки:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -517,12 +538,12 @@ Already installed containers were found on the server. All installed containers
<message> <message>
<location filename="../ui/qml/Pages2/PageDevMenu.qml" line="68"/> <location filename="../ui/qml/Pages2/PageDevMenu.qml" line="68"/>
<source>Gateway endpoint</source> <source>Gateway endpoint</source>
<translation type="unfinished"></translation> <translation>Gateway endpoint</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageDevMenu.qml" line="97"/> <location filename="../ui/qml/Pages2/PageDevMenu.qml" line="97"/>
<source>Dev gateway environment</source> <source>Dev gateway environment</source>
<translation type="unfinished"></translation> <translation>Dev gateway environment</translation>
</message> </message>
</context> </context>
<context> <context>
@ -652,47 +673,47 @@ Already installed containers were found on the server. All installed containers
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="146"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="146"/>
<source>Jc - Junk packet count</source> <source>Jc - Junk packet count</source>
<translation type="unfinished"></translation> <translation>Jc - Junk packet count</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="168"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="168"/>
<source>Jmin - Junk packet minimum size</source> <source>Jmin - Junk packet minimum size</source>
<translation type="unfinished"></translation> <translation>Jmin - Junk packet minimum size</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="186"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="186"/>
<source>Jmax - Junk packet maximum size</source> <source>Jmax - Junk packet maximum size</source>
<translation type="unfinished"></translation> <translation>Jmax - Junk packet maximum size</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="204"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="204"/>
<source>S1 - Init packet junk size</source> <source>S1 - Init packet junk size</source>
<translation type="unfinished"></translation> <translation>S1 - Init packet junk size</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="228"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="228"/>
<source>S2 - Response packet junk size</source> <source>S2 - Response packet junk size</source>
<translation type="unfinished"></translation> <translation>S2 - Response packet junk size</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="252"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="252"/>
<source>H1 - Init packet magic header</source> <source>H1 - Init packet magic header</source>
<translation type="unfinished"></translation> <translation>H1 - Init packet magic header</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="270"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="270"/>
<source>H2 - Response packet magic header</source> <source>H2 - Response packet magic header</source>
<translation type="unfinished"></translation> <translation>H2 - Response packet magic header</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="288"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="288"/>
<source>H4 - Transport packet magic header</source> <source>H4 - Transport packet magic header</source>
<translation type="unfinished"></translation> <translation>H4 - Transport packet magic header</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="306"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="306"/>
<source>H3 - Underload packet magic header</source> <source>H3 - Underload packet magic header</source>
<translation type="unfinished"></translation> <translation>H3 - Underload packet magic header</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="354"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="354"/>
@ -1461,7 +1482,7 @@ Already installed containers were found on the server. All installed containers
<message> <message>
<location filename="../ui/qml/Pages2/PageSettings.qml" line="123"/> <location filename="../ui/qml/Pages2/PageSettings.qml" line="123"/>
<source>Dev console</source> <source>Dev console</source>
<translation type="unfinished"></translation> <translation>Dev console</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettings.qml" line="142"/> <location filename="../ui/qml/Pages2/PageSettings.qml" line="142"/>
@ -1589,8 +1610,12 @@ Already installed containers were found on the server. All installed containers
<context> <context>
<name>PageSettingsApiDevices</name> <name>PageSettingsApiDevices</name>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApiDevices.qml" line="45"/>
<source>Active devices</source> <source>Active devices</source>
<translation type="vanished">Активные устройства</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsApiDevices.qml" line="45"/>
<source>Active Devices</source>
<translation>Активные устройства</translation> <translation>Активные устройства</translation>
</message> </message>
<message> <message>
@ -1742,9 +1767,13 @@ Already installed containers were found on the server. All installed containers
<translation>Сохранить конфигурацию AmneziaVPN</translation> <translation>Сохранить конфигурацию AmneziaVPN</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApiNativeConfigs.qml" line="48"/>
<source>Configuration files</source> <source>Configuration files</source>
<translation>Файл конфигурации</translation> <translation type="vanished">Файл конфигурации</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsApiNativeConfigs.qml" line="48"/>
<source>Configuration Files</source>
<translation>Файлы конфигурации</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApiNativeConfigs.qml" line="49"/> <location filename="../ui/qml/Pages2/PageSettingsApiNativeConfigs.qml" line="49"/>
@ -1832,9 +1861,8 @@ Already installed containers were found on the server. All installed containers
<translation type="vanished">Период работы</translation> <translation type="vanished">Период работы</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="37"/>
<source>Valid until</source> <source>Valid until</source>
<translation>Действует до</translation> <translation type="vanished">Действует до</translation>
</message> </message>
<message> <message>
<source>Speed</source> <source>Speed</source>
@ -1845,14 +1873,12 @@ Already installed containers were found on the server. All installed containers
<translation type="vanished">Скопировано</translation> <translation type="vanished">Скопировано</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="29"/>
<source>Subscription status</source> <source>Subscription status</source>
<translation>Статус подписки</translation> <translation type="vanished">Статус подписки</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="45"/>
<source>Active connections</source> <source>Active connections</source>
<translation>Активные соединения</translation> <translation type="vanished">Активные соединения</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="171"/> <location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="171"/>
@ -1860,9 +1886,8 @@ Already installed containers were found on the server. All installed containers
<translation>Сетевые адреса одного или нескольких серверов были обновлены. Пожалуйста, удалите старые конфигурацию и загрузите новые файлы</translation> <translation>Сетевые адреса одного или нескольких серверов были обновлены. Пожалуйста, удалите старые конфигурацию и загрузите новые файлы</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="186"/>
<source>Subscription key</source> <source>Subscription key</source>
<translation>Ключ для подключения</translation> <translation type="vanished">Ключ для подключения</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="190"/> <location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="190"/>
@ -1870,9 +1895,8 @@ Already installed containers were found on the server. All installed containers
<translation>Ключ подписки Amnezia Premium</translation> <translation>Ключ подписки Amnezia Premium</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="194"/>
<source>Save VPN key to file</source> <source>Save VPN key to file</source>
<translation>Сохранить VPN-ключ в файле</translation> <translation type="vanished">Сохранить VPN-ключ в файле</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="195"/> <location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="195"/>
@ -1880,9 +1904,8 @@ Already installed containers were found on the server. All installed containers
<translation>Скопировать VPN ключ</translation> <translation>Скопировать VPN ключ</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="216"/>
<source>Configuration files</source> <source>Configuration files</source>
<translation>Файл конфигурации</translation> <translation type="vanished">Файл конфигурации</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="218"/> <location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="218"/>
@ -1890,8 +1913,42 @@ Already installed containers were found on the server. All installed containers
<translation>Управление файлами конфигурации</translation> <translation>Управление файлами конфигурации</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="236"/>
<source>Active devices</source> <source>Active devices</source>
<translation type="vanished">Активные устройства</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="29"/>
<source>Subscription Status</source>
<translation>Статус подписки</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="37"/>
<source>Valid Until</source>
<translation>Действительна до</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="45"/>
<source>Active Connections</source>
<translation>Активные соединения</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="186"/>
<source>Subscription Key</source>
<translation>Ключ для подключения</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="194"/>
<source>Save VPN key as a file</source>
<translation>Сохранить VPN-ключ в файл</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="216"/>
<source>Configuration Files</source>
<translation>Файлы конфигурации</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsApiServerInfo.qml" line="236"/>
<source>Active Devices</source>
<translation>Активные устройства</translation> <translation>Активные устройства</translation>
</message> </message>
<message> <message>
@ -1982,8 +2039,12 @@ Already installed containers were found on the server. All installed containers
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApiSupport.qml" line="30"/>
<source>Email Support</source> <source>Email Support</source>
<translation type="vanished">Email</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsApiSupport.qml" line="30"/>
<source>Email</source>
<translation>Email</translation> <translation>Email</translation>
</message> </message>
<message> <message>
@ -2332,8 +2393,12 @@ Already installed containers were found on the server. All installed containers
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="143"/> <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="143"/>
<source>Cannot change KillSwitch settings during active connection</source>
<translation>Невозможно изменить настройки KillSwitch во время активного подключения</translation>
</message>
<message>
<source>Cannot change killSwitch settings during active connection</source> <source>Cannot change killSwitch settings during active connection</source>
<translation>Невозможно изменить настройки аварийного выключателя во время активного соединения</translation> <translation type="vanished">Невозможно изменить настройки аварийного выключателя во время активного соединения</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="86"/> <location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="86"/>
@ -2496,12 +2561,12 @@ Already installed containers were found on the server. All installed containers
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="175"/> <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="175"/>
<source>Client logs</source> <source>Client logs</source>
<translation type="unfinished"></translation> <translation>Логи приложения</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="176"/> <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="176"/>
<source>AmneziaVPN logs</source> <source>AmneziaVPN logs</source>
<translation type="unfinished"></translation> <translation>AmneziaVPN logs</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="142"/> <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="142"/>
@ -2516,12 +2581,12 @@ Already installed containers were found on the server. All installed containers
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="204"/> <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="204"/>
<source>Service logs</source> <source>Service logs</source>
<translation type="unfinished"></translation> <translation>Логи службы</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="205"/> <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="205"/>
<source>AmneziaVPN-service logs</source> <source>AmneziaVPN-service logs</source>
<translation type="unfinished"></translation> <translation>AmneziaVPN-service logs</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="78"/> <location filename="../ui/qml/Pages2/PageSettingsLogging.qml" line="78"/>
@ -3006,7 +3071,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="109"/> <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="109"/>
<source>Support tag</source> <source>Support tag</source>
<translation type="unfinished"></translation> <translation>Support tag</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="120"/> <location filename="../ui/qml/Pages2/PageSetupWizardConfigSource.qml" line="120"/>
@ -3594,7 +3659,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="726"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="726"/>
<source>Allowed IPs: %1</source> <source>Allowed IPs: %1</source>
<translation type="unfinished"></translation> <translation>Разрешенные подсети: %1</translation>
</message> </message>
<message> <message>
<source>Creation date: </source> <source>Creation date: </source>
@ -4046,38 +4111,58 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
<source>Server error: Package manager error</source> <source>Server error: Package manager error</source>
<translation>Ошибка сервера: Ошибка менеджера пакетов</translation> <translation>Ошибка сервера: Ошибка менеджера пакетов</translation>
</message> </message>
<message>
<location filename="../core/errorstrings.cpp" line="25"/>
<source>The sudo package is not pre-installed on the server</source>
<translation>Пакет sudo не установлен на сервере по умолчанию</translation>
</message>
<message>
<location filename="../core/errorstrings.cpp" line="26"/>
<source>The server user&apos;s home directory is not accessible</source>
<translation>Домашний каталог пользователя сервера недоступен</translation>
</message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="27"/> <location filename="../core/errorstrings.cpp" line="27"/>
<source>Action not allowed in sudoers</source>
<translation>Действие не разрешено в sudoers</translation>
</message>
<message>
<location filename="../core/errorstrings.cpp" line="28"/>
<source>The user&apos;s password is required</source>
<translation>Требуется пароль пользователя</translation>
</message>
<message>
<location filename="../core/errorstrings.cpp" line="31"/>
<source>SSH request was denied</source> <source>SSH request was denied</source>
<translation>SSH-запрос был отклонён</translation> <translation>SSH-запрос был отклонён</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="28"/> <location filename="../core/errorstrings.cpp" line="32"/>
<source>SSH request was interrupted</source> <source>SSH request was interrupted</source>
<translation>SSH-запрос был прерван</translation> <translation>SSH-запрос был прерван</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="29"/> <location filename="../core/errorstrings.cpp" line="33"/>
<source>SSH internal error</source> <source>SSH internal error</source>
<translation>Внутренняя ошибка SSH</translation> <translation>Внутренняя ошибка SSH</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="30"/> <location filename="../core/errorstrings.cpp" line="34"/>
<source>Invalid private key or invalid passphrase entered</source> <source>Invalid private key or invalid passphrase entered</source>
<translation>Введен неверный закрытый ключ или неверная парольная фраза</translation> <translation>Введен неверный закрытый ключ или неверная парольная фраза</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="31"/> <location filename="../core/errorstrings.cpp" line="35"/>
<source>The selected private key format is not supported, use openssh ED25519 key types or PEM key types</source> <source>The selected private key format is not supported, use openssh ED25519 key types or PEM key types</source>
<translation>Выбранный формат закрытого ключа не поддерживается, используйте типы ключей openssh ED25519 или PEM</translation> <translation>Выбранный формат закрытого ключа не поддерживается, используйте типы ключей openssh ED25519 или PEM</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="32"/> <location filename="../core/errorstrings.cpp" line="36"/>
<source>Timeout connecting to server</source> <source>Timeout connecting to server</source>
<translation>Тайм-аут подключения к серверу</translation> <translation>Тайм-аут подключения к серверу</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="35"/> <location filename="../core/errorstrings.cpp" line="39"/>
<source>SCP error: Generic failure</source> <source>SCP error: Generic failure</source>
<translation>Ошибка SCP: общий сбой</translation> <translation>Ошибка SCP: общий сбой</translation>
</message> </message>
@ -4134,23 +4219,23 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
<translation type="vanished">Sftp error: No media was in remote drive</translation> <translation type="vanished">Sftp error: No media was in remote drive</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="53"/> <location filename="../core/errorstrings.cpp" line="57"/>
<source>The config does not contain any containers and credentials for connecting to the server</source> <source>The config does not contain any containers and credentials for connecting to the server</source>
<translation>Конфигурация не содержит каких-либо контейнеров и учетных данных для подключения к серверу</translation> <translation>Конфигурация не содержит каких-либо контейнеров и учетных данных для подключения к серверу</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="61"/> <location filename="../core/errorstrings.cpp" line="65"/>
<location filename="../core/errorstrings.cpp" line="70"/> <location filename="../core/errorstrings.cpp" line="74"/>
<source>Error when retrieving configuration from API</source> <source>Error when retrieving configuration from API</source>
<translation>Ошибка при получении конфигурации из API</translation> <translation>Ошибка при получении конфигурации из API</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="62"/> <location filename="../core/errorstrings.cpp" line="66"/>
<source>This config has already been added to the application</source> <source>This config has already been added to the application</source>
<translation>Данная конфигурация уже была добавлена в приложение</translation> <translation>Данная конфигурация уже была добавлена в приложение</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="85"/> <location filename="../core/errorstrings.cpp" line="89"/>
<source>ErrorCode: %1. </source> <source>ErrorCode: %1. </source>
<translation>Код ошибки: %1. </translation> <translation>Код ошибки: %1. </translation>
</message> </message>
@ -4159,139 +4244,139 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
<translation type="vanished">Failed to save config to disk</translation> <translation type="vanished">Failed to save config to disk</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="38"/> <location filename="../core/errorstrings.cpp" line="42"/>
<source>OpenVPN config missing</source> <source>OpenVPN config missing</source>
<translation>Отсутствует конфигурация OpenVPN</translation> <translation>Отсутствует конфигурация OpenVPN</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="39"/> <location filename="../core/errorstrings.cpp" line="43"/>
<source>OpenVPN management server error</source> <source>OpenVPN management server error</source>
<translation>Серверная ошибка управлением OpenVPN</translation> <translation>Серверная ошибка управлением OpenVPN</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="42"/> <location filename="../core/errorstrings.cpp" line="46"/>
<source>OpenVPN executable missing</source> <source>OpenVPN executable missing</source>
<translation>Отсутствует исполняемый файл OpenVPN</translation> <translation>Отсутствует исполняемый файл OpenVPN</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="43"/> <location filename="../core/errorstrings.cpp" line="47"/>
<source>Shadowsocks (ss-local) executable missing</source> <source>Shadowsocks (ss-local) executable missing</source>
<translation>Отсутствует исполняемый файл Shadowsocks (ss-local)</translation> <translation>Отсутствует исполняемый файл Shadowsocks (ss-local)</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="44"/> <location filename="../core/errorstrings.cpp" line="48"/>
<source>Cloak (ck-client) executable missing</source> <source>Cloak (ck-client) executable missing</source>
<translation>Отсутствует исполняемый файл Cloak (ck-client)</translation> <translation>Отсутствует исполняемый файл Cloak (ck-client)</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="45"/> <location filename="../core/errorstrings.cpp" line="49"/>
<source>Amnezia helper service error</source> <source>Amnezia helper service error</source>
<translation>Ошибка вспомогательной службы Amnezia</translation> <translation>Ошибка вспомогательной службы Amnezia</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="46"/> <location filename="../core/errorstrings.cpp" line="50"/>
<source>OpenSSL failed</source> <source>OpenSSL failed</source>
<translation>Ошибка OpenSSL</translation> <translation>Ошибка OpenSSL</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="49"/> <location filename="../core/errorstrings.cpp" line="53"/>
<source>Can&apos;t connect: another VPN connection is active</source> <source>Can&apos;t connect: another VPN connection is active</source>
<translation>Невозможно подключиться: активно другое VPN-соединение</translation> <translation>Невозможно подключиться: активно другое VPN-соединение</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="50"/> <location filename="../core/errorstrings.cpp" line="54"/>
<source>Can&apos;t setup OpenVPN TAP network adapter</source> <source>Can&apos;t setup OpenVPN TAP network adapter</source>
<translation>Невозможно настроить сетевой адаптер OpenVPN TAP</translation> <translation>Невозможно настроить сетевой адаптер OpenVPN TAP</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="51"/> <location filename="../core/errorstrings.cpp" line="55"/>
<source>VPN pool error: no available addresses</source> <source>VPN pool error: no available addresses</source>
<translation>Ошибка пула VPN: нет доступных адресов</translation> <translation>Ошибка пула VPN: нет доступных адресов</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="54"/> <location filename="../core/errorstrings.cpp" line="58"/>
<source>Unable to open config file</source> <source>Unable to open config file</source>
<translation>Не удалось открыть файл конфигурации</translation> <translation>Не удалось открыть файл конфигурации</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="55"/> <location filename="../core/errorstrings.cpp" line="59"/>
<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>VPN-протоколы не установлены. <translation>VPN-протоколы не установлены.
Пожалуйста, установите протокол</translation> Пожалуйста, установите протокол</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="58"/> <location filename="../core/errorstrings.cpp" line="62"/>
<source>VPN connection error</source> <source>VPN connection error</source>
<translation>Ошибка VPN-соединения</translation> <translation>Ошибка VPN-соединения</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="63"/> <location filename="../core/errorstrings.cpp" line="67"/>
<source>In the response from the server, an empty config was received</source> <source>In the response from the server, an empty config was received</source>
<translation>В ответе от сервера была получена пустая конфигурация</translation> <translation>В ответе от сервера была получена пустая конфигурация</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="64"/> <location filename="../core/errorstrings.cpp" line="68"/>
<source>SSL error occurred</source> <source>SSL error occurred</source>
<translation>Произошла ошибка SSL</translation> <translation>Произошла ошибка SSL</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="65"/> <location filename="../core/errorstrings.cpp" line="69"/>
<source>Server response timeout on api request</source> <source>Server response timeout on api request</source>
<translation>Тайм-аут ответа сервера на запрос API</translation> <translation>Тайм-аут ответа сервера на запрос API</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="66"/> <location filename="../core/errorstrings.cpp" line="70"/>
<source>Missing AGW public key</source> <source>Missing AGW public key</source>
<translation type="unfinished"></translation> <translation>Отсутствует публичный ключ AGW</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="67"/> <location filename="../core/errorstrings.cpp" line="71"/>
<source>Failed to decrypt response payload</source> <source>Failed to decrypt response payload</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="68"/> <location filename="../core/errorstrings.cpp" line="72"/>
<source>Missing list of available services</source> <source>Missing list of available services</source>
<translation type="unfinished"></translation> <translation>Отсутствует список доступных сервисов</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="69"/> <location filename="../core/errorstrings.cpp" line="73"/>
<source>The limit of allowed configurations per subscription has been exceeded</source> <source>The limit of allowed configurations per subscription has been exceeded</source>
<translation>Превышен лимит разрешенных конфигураций для одной подписки</translation> <translation>Превышен лимит разрешенных конфигураций для одной подписки</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="73"/> <location filename="../core/errorstrings.cpp" line="77"/>
<source>QFile error: The file could not be opened</source> <source>QFile error: The file could not be opened</source>
<translation>Ошибка QFile: не удалось открыть файл</translation> <translation>Ошибка QFile: не удалось открыть файл</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="74"/> <location filename="../core/errorstrings.cpp" line="78"/>
<source>QFile error: An error occurred when reading from the file</source> <source>QFile error: An error occurred when reading from the file</source>
<translation>Ошибка QFile: произошла ошибка при чтении из файла</translation> <translation>Ошибка QFile: произошла ошибка при чтении из файла</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="75"/> <location filename="../core/errorstrings.cpp" line="79"/>
<source>QFile error: The file could not be accessed</source> <source>QFile error: The file could not be accessed</source>
<translation>Ошибка QFile: не удалось получить доступ к файлу</translation> <translation>Ошибка QFile: не удалось получить доступ к файлу</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="76"/> <location filename="../core/errorstrings.cpp" line="80"/>
<source>QFile error: An unspecified error occurred</source> <source>QFile error: An unspecified error occurred</source>
<translation>Ошибка QFile: произошла неизвестная ошибка</translation> <translation>Ошибка QFile: произошла неизвестная ошибка</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="77"/> <location filename="../core/errorstrings.cpp" line="81"/>
<source>QFile error: A fatal error occurred</source> <source>QFile error: A fatal error occurred</source>
<translation>Ошибка QFile: произошла фатальная ошибка</translation> <translation>Ошибка QFile: произошла фатальная ошибка</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="78"/> <location filename="../core/errorstrings.cpp" line="82"/>
<source>QFile error: The operation was aborted</source> <source>QFile error: The operation was aborted</source>
<translation>Ошибка QFile: операция была прервана</translation> <translation>Ошибка QFile: операция была прервана</translation>
</message> </message>
<message> <message>
<location filename="../core/errorstrings.cpp" line="82"/> <location filename="../core/errorstrings.cpp" line="86"/>
<source>Internal error</source> <source>Internal error</source>
<translation>Внутренняя ошибка</translation> <translation>Внутренняя ошибка</translation>
</message> </message>
@ -5053,37 +5138,37 @@ This means that AmneziaWG keeps the fast performance of the original while addin
<translation>Имя хоста не похоже на IP-адрес или доменное имя</translation> <translation>Имя хоста не похоже на IP-адрес или доменное имя</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/sitesController.cpp" line="67"/> <location filename="../ui/controllers/sitesController.cpp" line="66"/>
<source>New site added: %1</source> <source>New site added: %1</source>
<translation>Добавлен новый сайт: %1</translation> <translation>Добавлен новый сайт: %1</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/sitesController.cpp" line="80"/> <location filename="../ui/controllers/sitesController.cpp" line="78"/>
<source>Site removed: %1</source> <source>Site removed: %1</source>
<translation>Сайт удален: %1</translation> <translation>Сайт удален: %1</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/sitesController.cpp" line="87"/> <location filename="../ui/controllers/sitesController.cpp" line="85"/>
<source>Can&apos;t open file: %1</source> <source>Can&apos;t open file: %1</source>
<translation>Невозможно открыть файл: %1</translation> <translation>Невозможно открыть файл: %1</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/sitesController.cpp" line="93"/> <location filename="../ui/controllers/sitesController.cpp" line="91"/>
<source>Failed to parse JSON data from file: %1</source> <source>Failed to parse JSON data from file: %1</source>
<translation>Не удалось разобрать JSON-данные из файла: %1</translation> <translation>Не удалось разобрать JSON-данные из файла: %1</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/sitesController.cpp" line="98"/> <location filename="../ui/controllers/sitesController.cpp" line="96"/>
<source>The JSON data is not an array in file: %1</source> <source>The JSON data is not an array in file: %1</source>
<translation>JSON-данные не являются массивом в файле: %1</translation> <translation>JSON-данные не являются массивом в файле: %1</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/sitesController.cpp" line="129"/> <location filename="../ui/controllers/sitesController.cpp" line="126"/>
<source>Import completed</source> <source>Import completed</source>
<translation>Импорт завершен</translation> <translation>Импорт завершен</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/sitesController.cpp" line="148"/> <location filename="../ui/controllers/sitesController.cpp" line="145"/>
<source>Export completed</source> <source>Export completed</source>
<translation>Экспорт завершен</translation> <translation>Экспорт завершен</translation>
</message> </message>
@ -5132,7 +5217,7 @@ This means that AmneziaWG keeps the fast performance of the original while addin
<context> <context>
<name>VpnConnection</name> <name>VpnConnection</name>
<message> <message>
<location filename="../vpnconnection.cpp" line="415"/> <location filename="../vpnconnection.cpp" line="421"/>
<source>Mbps</source> <source>Mbps</source>
<translation>Мбит/с</translation> <translation>Мбит/с</translation>
</message> </message>

1289
client/translations/amneziavpn_uk_UA.ts
View file

File diff suppressed because it is too large Load diff

1240
client/translations/amneziavpn_ur_PK.ts
View file

File diff suppressed because it is too large Load diff

1264
client/translations/amneziavpn_zh_CN.ts
View file

File diff suppressed because it is too large Load diff

4
client/ui/controllers/api/apiConfigsController.cpp
View file

@ -310,7 +310,7 @@ bool ApiConfigsController::deactivateDevice()
auto serverConfigObject = m_serversModel->getServerConfig(serverIndex); auto serverConfigObject = m_serversModel->getServerConfig(serverIndex);
auto apiConfigObject = serverConfigObject.value(configKey::apiConfig).toObject(); auto apiConfigObject = serverConfigObject.value(configKey::apiConfig).toObject();
if (apiUtils::getConfigType(serverConfigObject) != apiDefs::ConfigType::AmneziaPremiumV2) { if (!apiUtils::isPremiumServer(serverConfigObject)) {
return true; return true;
} }
@ -345,7 +345,7 @@ bool ApiConfigsController::deactivateExternalDevice(const QString &uuid, const Q
auto serverConfigObject = m_serversModel->getServerConfig(serverIndex); auto serverConfigObject = m_serversModel->getServerConfig(serverIndex);
auto apiConfigObject = serverConfigObject.value(configKey::apiConfig).toObject(); auto apiConfigObject = serverConfigObject.value(configKey::apiConfig).toObject();
if (apiUtils::getConfigType(serverConfigObject) != apiDefs::ConfigType::AmneziaPremiumV2) { if (!apiUtils::isPremiumServer(serverConfigObject)) {
return true; return true;
} }

2
client/ui/controllers/api/apiSettingsController.cpp
View file

@ -62,7 +62,7 @@ bool ApiSettingsController::getAccountInfo(bool reload)
QByteArray responseBody; QByteArray responseBody;
if (apiUtils::getConfigType(serverConfig) == apiDefs::ConfigType::AmneziaPremiumV2) { if (apiUtils::isPremiumServer(serverConfig)) {
ErrorCode errorCode = gatewayController.post(QString("%1v1/account_info"), apiPayload, responseBody); ErrorCode errorCode = gatewayController.post(QString("%1v1/account_info"), apiPayload, responseBody);
if (errorCode != ErrorCode::NoError) { if (errorCode != ErrorCode::NoError) {
emit errorOccurred(errorCode); emit errorOccurred(errorCode);

35
client/ui/models/api/apiAccountInfoModel.cpp
View file

@ -48,15 +48,19 @@ QVariant ApiAccountInfoModel::data(const QModelIndex &index, int role) const
} }
case ServiceDescriptionRole: { case ServiceDescriptionRole: {
if (m_accountInfoData.configType == apiDefs::ConfigType::AmneziaPremiumV2) { if (m_accountInfoData.configType == apiDefs::ConfigType::AmneziaPremiumV2) {
return tr("Classic VPN for seamless work, downloading large files, and watching videos. Access all websites and online resources. " return tr("Classic VPN for seamless work, downloading large files, and watching videos. Access all websites and online "
"resources. "
"Speeds up to 200 Mbps"); "Speeds up to 200 Mbps");
} else if (m_accountInfoData.configType == apiDefs::ConfigType::AmneziaFreeV3) { } else if (m_accountInfoData.configType == apiDefs::ConfigType::AmneziaFreeV3) {
return tr("Free unlimited access to a basic set of websites such as Facebook, Instagram, Twitter (X), Discord, Telegram and " return tr("Free unlimited access to a basic set of websites such as Facebook, Instagram, Twitter (X), Discord, Telegram and "
"more. YouTube is not included in the free plan."); "more. YouTube is not included in the free plan.");
} else {
return "";
} }
} }
case IsComponentVisibleRole: { case IsComponentVisibleRole: {
return m_accountInfoData.configType == apiDefs::ConfigType::AmneziaPremiumV2; return m_accountInfoData.configType == apiDefs::ConfigType::AmneziaPremiumV2
|| m_accountInfoData.configType == apiDefs::ConfigType::ExternalPremium;
} }
case HasExpiredWorkerRole: { case HasExpiredWorkerRole: {
for (int i = 0; i < m_issuedConfigsInfo.size(); i++) { for (int i = 0; i < m_issuedConfigsInfo.size(); i++) {
@ -93,6 +97,8 @@ void ApiAccountInfoModel::updateModel(const QJsonObject &accountInfoObject, cons
m_accountInfoData = accountInfoData; m_accountInfoData = accountInfoData;
m_supportInfo = accountInfoObject.value(apiDefs::key::supportInfo).toObject();
endResetModel(); endResetModel();
} }
@ -121,12 +127,27 @@ QJsonArray ApiAccountInfoModel::getIssuedConfigsInfo()
QString ApiAccountInfoModel::getTelegramBotLink() QString ApiAccountInfoModel::getTelegramBotLink()
{ {
if (m_accountInfoData.configType == apiDefs::ConfigType::AmneziaFreeV3) { return m_supportInfo.value(apiDefs::key::telegram).toString();
return tr("amnezia_free_support_bot");
} else if (m_accountInfoData.configType == apiDefs::ConfigType::AmneziaPremiumV2) {
return tr("amnezia_premium_support_bot");
} }
return "";
QString ApiAccountInfoModel::getEmailLink()
{
return m_supportInfo.value(apiDefs::key::email).toString();
}
QString ApiAccountInfoModel::getBillingEmailLink()
{
return m_supportInfo.value(apiDefs::key::billingEmail).toString();
}
QString ApiAccountInfoModel::getSiteLink()
{
return m_supportInfo.value(apiDefs::key::websiteName).toString();
}
QString ApiAccountInfoModel::getFullSiteLink()
{
return m_supportInfo.value(apiDefs::key::website).toString();
} }
QHash<int, QByteArray> ApiAccountInfoModel::roleNames() const QHash<int, QByteArray> ApiAccountInfoModel::roleNames() const

6
client/ui/models/api/apiAccountInfoModel.h
View file

@ -33,7 +33,12 @@ public slots:
QJsonArray getAvailableCountries(); QJsonArray getAvailableCountries();
QJsonArray getIssuedConfigsInfo(); QJsonArray getIssuedConfigsInfo();
QString getTelegramBotLink(); QString getTelegramBotLink();
QString getEmailLink();
QString getBillingEmailLink();
QString getSiteLink();
QString getFullSiteLink();
protected: protected:
QHash<int, QByteArray> roleNames() const override; QHash<int, QByteArray> roleNames() const override;
@ -51,6 +56,7 @@ private:
AccountInfoData m_accountInfoData; AccountInfoData m_accountInfoData;
QJsonArray m_availableCountries; QJsonArray m_availableCountries;
QJsonArray m_issuedConfigsInfo; QJsonArray m_issuedConfigsInfo;
QJsonObject m_supportInfo;
}; };
#endif // APIACCOUNTINFOMODEL_H #endif // APIACCOUNTINFOMODEL_H

12
client/ui/qml/Pages2/PageSettingsApiSupport.qml
View file

@ -28,24 +28,24 @@ PageType {
id: techSupport id: techSupport
readonly property string title: qsTr("Email") readonly property string title: qsTr("Email")
readonly property string description: qsTr("support@amnezia.org") readonly property string description: ApiAccountInfoModel.getEmailLink()
readonly property string link: "mailto:support@amnezia.org" readonly property string link: "mailto:" + ApiAccountInfoModel.getEmailLink()
} }
QtObject { QtObject {
id: paymentSupport id: paymentSupport
readonly property string title: qsTr("Email Billing & Orders") readonly property string title: qsTr("Email Billing & Orders")
readonly property string description: qsTr("help@vpnpay.io") readonly property string description: ApiAccountInfoModel.getBillingEmailLink()
readonly property string link: "mailto:help@vpnpay.io" readonly property string link: "mailto:" + ApiAccountInfoModel.getBillingEmailLink()
} }
QtObject { QtObject {
id: site id: site
readonly property string title: qsTr("Website") readonly property string title: qsTr("Website")
readonly property string description: qsTr("amnezia.org") readonly property string description: ApiAccountInfoModel.getSiteLink()
readonly property string link: LanguageModel.getCurrentSiteUrl() readonly property string link: ApiAccountInfoModel.getFullSiteLink()
} }
property list<QtObject> supportModel: [ property list<QtObject> supportModel: [

30
client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
View file

@ -3,6 +3,8 @@ import QtQuick.Controls
import QtQuick.Layouts import QtQuick.Layouts
import QtQuick.Dialogs import QtQuick.Dialogs
import QtCore
import PageEnum 1.0 import PageEnum 1.0
import Style 1.0 import Style 1.0
@ -101,6 +103,34 @@ PageType {
} }
} }
LabelWithButtonType {
Layout.fillWidth: true
text: qsTr("Export client logs")
rightImageSource: "qrc:/images/controls/chevron-right.svg"
visible: PageController.isStartPageVisible()
clickedFunction: function() {
var fileName = ""
if (GC.isMobile()) {
fileName = "AmneziaVPN.log"
} else {
fileName = SystemController.getFileName(qsTr("Save"),
qsTr("Logs files (*.log)"),
StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/AmneziaVPN",
true,
".log")
}
if (fileName !== "") {
PageController.showBusyIndicator(true)
SettingsController.exportLogsFile(fileName)
PageController.showBusyIndicator(false)
PageController.showNotificationMessage(qsTr("Logs file saved"))
}
}
}
LabelWithButtonType { LabelWithButtonType {
id: supportUuid id: supportUuid
Layout.fillWidth: true Layout.fillWidth: true

8
client/vpnconnection.cpp
View file

@ -374,8 +374,10 @@ void VpnConnection::appendSplitTunnelingConfig()
sitesJsonArray.append(site); sitesJsonArray.append(site);
} }
if (sitesJsonArray.isEmpty()) {
sitesRouteMode = Settings::RouteMode::VpnAllSites;
} else if (sitesRouteMode == Settings::VpnOnlyForwardSites) {
// Allow traffic to Amnezia DNS // Allow traffic to Amnezia DNS
if (sitesRouteMode == Settings::VpnOnlyForwardSites) {
sitesJsonArray.append(m_vpnConfiguration.value(config_key::dns1).toString()); sitesJsonArray.append(m_vpnConfiguration.value(config_key::dns1).toString());
sitesJsonArray.append(m_vpnConfiguration.value(config_key::dns2).toString()); sitesJsonArray.append(m_vpnConfiguration.value(config_key::dns2).toString());
} }
@ -394,6 +396,10 @@ void VpnConnection::appendSplitTunnelingConfig()
for (const auto &app : apps) { for (const auto &app : apps) {
appsJsonArray.append(app.appPath.isEmpty() ? app.packageName : app.appPath); appsJsonArray.append(app.appPath.isEmpty() ? app.packageName : app.appPath);
} }
if (appsJsonArray.isEmpty()) {
appsRouteMode = Settings::AppsRouteMode::VpnAllApps;
}
} }
m_vpnConfiguration.insert(config_key::appSplitTunnelType, appsRouteMode); m_vpnConfiguration.insert(config_key::appSplitTunnelType, appsRouteMode);

34
deploy/data/macos/post_uninstall.sh
View file

@ -2,13 +2,33 @@
APP_NAME=AmneziaVPN APP_NAME=AmneziaVPN
PLIST_NAME=$APP_NAME.plist PLIST_NAME=$APP_NAME.plist
LAUNCH_DAEMONS_PLIST_NAME=/Library/LaunchDaemons/$PLIST_NAME LAUNCH_DAEMONS_PLIST_NAME="/Library/LaunchDaemons/$PLIST_NAME"
APP_PATH="/Applications/$APP_NAME.app"
USER_APP_SUPPORT="$HOME/Library/Application Support/$APP_NAME"
SYSTEM_APP_SUPPORT="/Library/Application Support/$APP_NAME"
LOG_FOLDER="/var/log/$APP_NAME"
CACHES_FOLDER="$HOME/Library/Caches/$APP_NAME"
if launchctl list "$APP_NAME-service" &> /dev/null; then # Stop the running service if it exists
launchctl unload $LAUNCH_DAEMONS_PLIST_NAME if pgrep -x "${APP_NAME}-service" > /dev/null; then
rm -f $LAUNCH_DAEMONS_PLIST_NAME sudo killall -9 "${APP_NAME}-service"
fi fi
rm -rf "$HOME/Library/Application Support/$APP_NAME" # Unload the service if loaded and remove its plist file regardless
rm -rf /var/log/$APP_NAME if launchctl list "${APP_NAME}-service" &> /dev/null; then
rm -rf /Applications/$APP_NAME.app/Contents sudo launchctl unload "$LAUNCH_DAEMONS_PLIST_NAME"
fi
sudo rm -f "$LAUNCH_DAEMONS_PLIST_NAME"
# Remove the entire application bundle
sudo rm -rf "$APP_PATH"
# Remove Application Support folders (user and system, if they exist)
rm -rf "$USER_APP_SUPPORT"
sudo rm -rf "$SYSTEM_APP_SUPPORT"
# Remove the log folder
sudo rm -rf "$LOG_FOLDER"
# Remove any caches left behind
rm -rf "$CACHES_FOLDER"

38
deploy/deploy_s3.sh Executable file
View file

@ -0,0 +1,38 @@
#!/bin/sh
set -e
VERSION=$1
if [[ $VERSION = '' ]]; then
echo '::error::VERSION does not set. Exiting with error...'
exit 1
fi
mkdir -p dist
cd dist
echo $VERSION >> VERSION
curl -s https://api.github.com/repos/amnezia-vpn/amnezia-client/releases/tags/$VERSION | jq -r .body | tr -d '\r' > CHANGELOG
if [[ $(cat CHANGELOG) = null ]]; then
echo '::error::Release does not exists. Exiting with error...'
exit 1
fi
wget -q https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/AmneziaVPN_${VERSION}_android8+_arm64-v8a.apk
wget -q https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/AmneziaVPN_${VERSION}_android8+_armeabi-v7a.apk
wget -q https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/AmneziaVPN_${VERSION}_android8+_x86.apk
wget -q https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/AmneziaVPN_${VERSION}_android8+_x86_64.apk
wget -q https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/AmneziaVPN_${VERSION}_android_7_arm64-v8a.apk
wget -q https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/AmneziaVPN_${VERSION}_android_7_armeabi-v7a.apk
wget -q https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/AmneziaVPN_${VERSION}_android_7_x86.apk
wget -q https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/AmneziaVPN_${VERSION}_android_7_x86_64.apk
wget -q https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/AmneziaVPN_${VERSION}_linux.tar.zip
wget -q https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/AmneziaVPN_${VERSION}_macos.dmg
wget -q https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/AmneziaVPN_${VERSION}_macos_old.dmg
wget -q https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/AmneziaVPN_${VERSION}_x64.exe
cd ../
rclone sync ./dist/ r2:/updates/