Merge branch 'dev' into feature/killswitch

2024-01-19 14:58:28 +00:00 · 2024-01-19 14:58:28 +00:00 · 3702d69b9d
commit 3702d69b9d
parent 65a04799ef 3253de9384
47 changed files with 654 additions and 634 deletions
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@ -48,14 +48,18 @@ jobs:
        export QIF_BIN_DIR=${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin
        bash deploy/build_linux.sh

+    - name: 'Pack installer'
+      run: cd deploy && tar -cf AmneziaVPN_Linux_Installer.tar AmneziaVPN_Linux_Installer.bin
+
    - name: 'Upload installer artifact'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
      with:
-        name: AmneziaVPN_Linux_installer
-        path: deploy/AmneziaVPN_Linux_Installer
+        name: AmneziaVPN_Linux_installer.tar
+        path: deploy/AmneziaVPN_Linux_Installer.tar
        retention-days: 7
+
    - name: 'Upload unpacked artifact'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
      with:
        name: AmneziaVPN_Linux_unpacked
        path: deploy/AppDir
@ -110,13 +114,14 @@ jobs:
        call deploy\\build_windows.bat

    - name: 'Upload installer artifact'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
      with:
        name: AmneziaVPN_Windows_installer
        path: AmneziaVPN_x${{ env.BUILD_ARCH }}.exe
        retention-days: 7
+
    - name: 'Upload unpacked artifact'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
      with:
        name: AmneziaVPN_Windows_unpacked
        path: deploy\\build_${{ env.BUILD_ARCH }}\\client\\Release
@ -200,7 +205,7 @@ jobs:
        IOS_NE_PROVISIONING_PROFILE: ${{ secrets.IOS_NE_PROVISIONING_PROFILE }}

 #    - name: 'Upload appstore .ipa and dSYMs to artifacts'
-#      uses: actions/upload-artifact@v3
+#      uses: actions/upload-artifact@v4
 #      with:
 #        name: app-store ipa & dsyms
 #        path: |
@ -255,13 +260,14 @@ jobs:
        bash deploy/build_macos.sh

    - name: 'Upload installer artifact'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
      with:
        name: AmneziaVPN_MacOS_installer
        path: AmneziaVPN.dmg
        retention-days: 7
+
    - name: 'Upload unpacked artifact'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
      with:
        name: AmneziaVPN_MacOS_unpacked
        path: deploy/build/client/AmneziaVPN.app
@ -277,6 +283,7 @@ jobs:
      ANDROID_BUILD_PLATFORM: android-34
      QT_VERSION: 6.6.1
      QT_MODULES: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
+      BUILD_AAB: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/') }}

    steps:
    - name: 'Install desktop Qt'
@ -375,32 +382,45 @@ jobs:
        ANDROID_KEYSTORE_KEY_ALIAS: ${{ secrets.ANDROID_RELEASE_KEYSTORE_KEY_ALIAS }}
        ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_RELEASE_KEYSTORE_KEY_PASS }}
      shell: bash
-      run: ./deploy/build_android.sh --apk all --build-platform ${{ env.ANDROID_BUILD_PLATFORM }}
+      run: ./deploy/build_android.sh ${{ env.BUILD_AAB == 'true' && '--aab' || '' }} --apk all --build-platform ${{ env.ANDROID_BUILD_PLATFORM }}

    - name: 'Upload x86_64 apk'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
      with:
        name: AmneziaVPN-android-x86_64
        path: deploy/build/AmneziaVPN-x86_64-release.apk
+        compression-level: 0
        retention-days: 7

    - name: 'Upload x86 apk'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
      with:
        name: AmneziaVPN-android-x86
        path: deploy/build/AmneziaVPN-x86-release.apk
+        compression-level: 0
        retention-days: 7

    - name: 'Upload arm64-v8a apk'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
      with:
        name: AmneziaVPN-android-arm64-v8a
        path: deploy/build/AmneziaVPN-arm64-v8a-release.apk
+        compression-level: 0
        retention-days: 7

    - name: 'Upload armeabi-v7a apk'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
      with:
        name: AmneziaVPN-android-armeabi-v7a
        path: deploy/build/AmneziaVPN-armeabi-v7a-release.apk
+        compression-level: 0
+        retention-days: 7
+
+    - name: 'Upload aab'
+      if: ${{ env.BUILD_AAB == 'true' }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: AmneziaVPN-android
+        path: deploy/build/AmneziaVPN-release.aab
+        compression-level: 0
        retention-days: 7
--- a/.gitmodules
+++ b/.gitmodules
@ -22,6 +22,6 @@
 [submodule "client/3rd-prebuilt"]
 	path = client/3rd-prebuilt
 	url = https://github.com/amnezia-vpn/3rd-prebuilt
-[submodule "client/3rd/awg-apple"]
-	path = client/3rd/awg-apple
-	url = https://github.com/amnezia-vpn/awg-apple
+[submodule "client/3rd/amneziawg-apple"]
+	path = client/3rd/amneziawg-apple
+	url = https://github.com/amnezia-vpn/amneziawg-apple
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)

 set(PROJECT AmneziaVPN)

-project(${PROJECT} VERSION 4.1.0.1
+project(${PROJECT} VERSION 4.2.0.1
        DESCRIPTION "AmneziaVPN"
        HOMEPAGE_URL "https://amnezia.org/"
 )
--- a/README.md
+++ b/README.md
@ -36,7 +36,7 @@ AmneziaVPN uses a number of open source projects to work:
 Make sure to pull all submodules after checking out the repo.

 ```bash
-git submodule update --init
+git submodule update --init --recursive
 ```

 ## Development
@ -50,7 +50,15 @@ Look deploy folder for build scripts.

 1. First, make sure you have [XCode](https://developer.apple.com/xcode/) installed, at least version 14 or higher.

-2. We use QT to generate the XCode project. we need QT version 6.4. Install QT for macos in [here](https://doc.qt.io/qt-6/macos.html)
+2. We use QT to generate the XCode project. we need QT version 6.6.1. Install QT for macos in [here](https://doc.qt.io/qt-6/macos.html) or [QT Online Installer](https://www.qt.io/download-open-source). Required modules:
+   - macOS
+   - iOS
+   - Qt 5 Compatibility Module
+   - Qt Shader Tools
+   - Additional Libraries:
+     - Qt Image Formats
+     - Qt Multimedia
+     - Qt Remote Objects 

 3. Install cmake is require. We recommend cmake version 3.25. You can install cmake in [here](https://cmake.org/download/)

@ -66,10 +74,11 @@ gomobile init
 5. Build project
 ```bash
 export QT_BIN_DIR="<PATH-TO-QT-FOLDER>/Qt/<QT-VERSION>/ios/bin"
+export QT_MACOS_ROOT_DIR="<PATH-TO-QT-FOLDER>/Qt/<QT-VERSION>/macos"
 export QT_IOS_BIN=$QT_BIN_DIR
 export PATH=$PATH:~/go/bin
 mkdir build-ios
-$QT_IOS_BIN/qt-cmake . -B build-ios -GXcode -DQT_HOST_PATH=$QT_BIN_DIR
+$QT_IOS_BIN/qt-cmake . -B build-ios -GXcode -DQT_HOST_PATH=$QT_MACOS_ROOT_DIR
 ```
 Replace PATH-TO-QT-FOLDER and QT-VERSION to your environment

--- a/client/3rd-prebuilt
+++ b/client/3rd-prebuilt
@ -1 +1 @@
-Subproject commit fcf3022a2724402f68cc11bcbed9b43ea9ffcc07
+Subproject commit e568e7d0e8defe8fe009c0127323f2c55fd9be76
--- a/client/3rd/amneziawg-apple
+++ b/client/3rd/amneziawg-apple
@ -0,0 +1 @@
+Subproject commit f23eee4700ed4a2ef44a800d2c20466c9ab0222b
--- a/client/3rd/awg-apple
+++ b/client/3rd/awg-apple
@ -1 +0,0 @@
-Subproject commit 233eda6760962efddc860f177a0ce2bcdf533d85
--- a/client/3rd/qtkeychain
+++ b/client/3rd/qtkeychain
@ -1 +1 @@
-Subproject commit 8bbaa6d8302cf0747d9786ace4dd13c7fb746502
+Subproject commit 74776e2a3e2d98d19943e0968901c5b5e04cc1bd
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@ -168,16 +168,19 @@ void AmneziaApplication::init()
    }
 #endif

-// Android TextField clipboard workaround
-// https://bugreports.qt.io/browse/QTBUG-113461
+// Android TextArea clipboard workaround
+// Text from TextArea always has "text/html" mime-type:
+// /qt/6.6.1/Src/qtdeclarative/src/quick/items/qquicktextcontrol.cpp:1865
+// Next, html is created for this mime-type:
+// /qt/6.6.1/Src/qtdeclarative/src/quick/items/qquicktextcontrol.cpp:1885
+// And this html goes to the Androids clipboard, i.e. text from TextArea is always copied as richText:
+// /qt/6.6.1/Src/qtbase/src/plugins/platforms/android/androidjniclipboard.cpp:46
+// So we catch all the copies to the clipboard and clear them from "text/html"
 #ifdef Q_OS_ANDROID
-    QObject::connect(qApp, &QGuiApplication::applicationStateChanged, [](Qt::ApplicationState state) {
-        if (state == Qt::ApplicationActive) {
-            if (qApp->clipboard()->mimeData()->formats().contains("text/html")) {
-                QTextDocument doc;
-                doc.setHtml(qApp->clipboard()->mimeData()->html());
-                qApp->clipboard()->setText(doc.toPlainText());
-            }
+    connect(QGuiApplication::clipboard(), &QClipboard::dataChanged, []() {
+        auto clipboard = QGuiApplication::clipboard();
+        if (clipboard->mimeData()->hasHtml()) {
+            clipboard->setText(clipboard->text());
        }
    });
 #endif
--- a/client/android/AndroidManifest.xml
+++ b/client/android/AndroidManifest.xml
@ -22,7 +22,6 @@
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <!-- Enable when VPN-per-app mode will be implemented -->
    <!-- <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/> -->
@ -39,6 +38,7 @@
            android:configChanges="uiMode|screenSize|smallestScreenSize|screenLayout|orientation|density
                |fontScale|layoutDirection|locale|keyboard|keyboardHidden|navigation|mcc|mnc"
            android:launchMode="singleInstance"
+            android:windowSoftInputMode="adjustResize"
            android:exported="true">

            <intent-filter>
--- a/client/android/src/org/amnezia/vpn/AmneziaActivity.kt
+++ b/client/android/src/org/amnezia/vpn/AmneziaActivity.kt
@ -2,6 +2,7 @@ package org.amnezia.vpn

 import android.content.ComponentName
 import android.content.Intent
+import android.content.Intent.EXTRA_MIME_TYPES
 import android.content.Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY
 import android.content.ServiceConnection
 import android.net.Uri
@ -12,11 +13,13 @@ import android.os.IBinder
 import android.os.Looper
 import android.os.Message
 import android.os.Messenger
+import android.webkit.MimeTypeMap
 import android.widget.Toast
 import androidx.annotation.MainThread
 import androidx.core.content.ContextCompat
 import java.io.IOException
 import kotlin.LazyThreadSafetyMode.NONE
+import kotlin.text.RegexOption.IGNORE_CASE
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@ -35,6 +38,7 @@ private const val TAG = "AmneziaActivity"

 private const val CHECK_VPN_PERMISSION_ACTION_CODE = 1
 private const val CREATE_FILE_ACTION_CODE = 2
+private const val OPEN_FILE_ACTION_CODE = 3
 private const val BIND_SERVICE_TIMEOUT = 1000L

 class AmneziaActivity : QtActivity() {
@ -201,6 +205,15 @@ class AmneziaActivity : QtActivity() {
                }
            }

+            OPEN_FILE_ACTION_CODE -> {
+                when (resultCode) {
+                    RESULT_OK -> data?.data?.toString() ?: ""
+                    else -> ""
+                }.let { uri ->
+                    QtAndroidController.onFileOpened(uri)
+                }
+            }
+
            CHECK_VPN_PERMISSION_ACTION_CODE -> {
                when (resultCode) {
                    RESULT_OK -> {
@ -370,6 +383,36 @@ class AmneziaActivity : QtActivity() {
        }
    }

+    @Suppress("unused")
+    fun openFile(filter: String?) {
+        Log.v(TAG, "Open file with filter: $filter")
+
+        val mimeTypes = if (!filter.isNullOrEmpty()) {
+            val extensionRegex = "\\*\\.[a-z .]+".toRegex(IGNORE_CASE)
+            val mime = MimeTypeMap.getSingleton()
+            extensionRegex.findAll(filter).map {
+                mime.getMimeTypeFromExtension(it.value.drop(2))
+            }.filterNotNull().toSet()
+        } else emptySet()
+
+        Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+            addCategory(Intent.CATEGORY_OPENABLE)
+            Log.d(TAG, "File mimyType filter: $mimeTypes")
+            when (mimeTypes.size) {
+                1 -> type = mimeTypes.first()
+
+                in 2..Int.MAX_VALUE -> {
+                    type = "*/*"
+                    putExtra(EXTRA_MIME_TYPES, mimeTypes.toTypedArray())
+                }
+
+                else -> type = "*/*"
+            }
+        }.also {
+            startActivityForResult(it, OPEN_FILE_ACTION_CODE)
+        }
+    }
+
    @Suppress("unused")
    fun setNotificationText(title: String, message: String, timerSec: Int) {
        Log.v(TAG, "Set notification text")
--- a/client/android/src/org/amnezia/vpn/qt/QtAndroidController.kt
+++ b/client/android/src/org/amnezia/vpn/qt/QtAndroidController.kt
@ -15,6 +15,8 @@ object QtAndroidController {
    external fun onVpnReconnecting()
    external fun onStatisticsUpdate(rxBytes: Long, txBytes: Long)

+    external fun onFileOpened(uri: String)
+
    external fun onConfigImported(data: String)

    external fun decodeQrCode(data: String): Boolean
--- 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
 )
--- a/client/cmake/android.cmake
+++ b/client/cmake/android.cmake
@ -27,7 +27,7 @@ link_directories(${CMAKE_CURRENT_SOURCE_DIR}/platforms/android)
 set(HEADERS ${HEADERS}
    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_controller.h
    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_notificationhandler.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/androidutils.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_utils.h
    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/authResultReceiver.h
    ${CMAKE_CURRENT_SOURCE_DIR}/protocols/android_vpnprotocol.h
 )
@ -35,7 +35,7 @@ set(HEADERS ${HEADERS}
 set(SOURCES ${SOURCES}
    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_controller.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_notificationhandler.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/androidutils.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/android_utils.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/authResultReceiver.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/protocols/android_vpnprotocol.cpp
 )
--- a/client/cmake/ios.cmake
+++ b/client/cmake/ios.cmake
@ -97,7 +97,7 @@ target_compile_options(${PROJECT} PRIVATE
    -DVPN_NE_BUNDLEID=\"${BUILD_IOS_APP_IDENTIFIER}.network-extension\"
 )

-set(WG_APPLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rd/awg-apple/Sources)
+set(WG_APPLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rd/amneziawg-apple/Sources)

 target_sources(${PROJECT} PRIVATE
 #    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosvpnprotocol.swift
--- a/client/configurators/openvpn_configurator.cpp
+++ b/client/configurators/openvpn_configurator.cpp
@ -118,31 +118,33 @@ QString OpenVpnConfigurator::genOpenVpnConfig(const ServerCredentials &credentia
    return QJsonDocument(jConfig).toJson();
 }

-QString OpenVpnConfigurator::processConfigWithLocalSettings(QString jsonConfig)
+QString OpenVpnConfigurator::processConfigWithLocalSettings(QString jsonConfig, const int serverIndex)
 {
    QJsonObject json = QJsonDocument::fromJson(jsonConfig.toUtf8()).object();
    QString config = json[config_key::config].toString();

-    QRegularExpression regex("redirect-gateway.*");
-    config.replace(regex, "");
+    if (!m_settings->server(serverIndex).value(config_key::configVersion).toInt()) {
+        QRegularExpression regex("redirect-gateway.*");
+        config.replace(regex, "");

-    if (m_settings->routeMode() == Settings::VpnAllSites) {
-        config.append("\nredirect-gateway def1 ipv6 bypass-dhcp\n");
-        // Prevent ipv6 leak
-        config.append("ifconfig-ipv6 fd15:53b6:dead::2/64  fd15:53b6:dead::1\n");
-        config.append("block-ipv6\n");
-    }
-    if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
+        if (m_settings->routeMode() == Settings::VpnAllSites) {
+            config.append("\nredirect-gateway def1 ipv6 bypass-dhcp\n");
+            // Prevent ipv6 leak
+            config.append("ifconfig-ipv6 fd15:53b6:dead::2/64  fd15:53b6:dead::1\n");
+            config.append("block-ipv6\n");
+        }
+        if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {

-        // no redirect-gateway
-    }
-    if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
-#ifndef Q_OS_ANDROID
-        config.append("\nredirect-gateway ipv6 !ipv4 bypass-dhcp\n");
-#endif
-        // Prevent ipv6 leak
-        config.append("ifconfig-ipv6 fd15:53b6:dead::2/64  fd15:53b6:dead::1\n");
-        config.append("block-ipv6\n");
+            // no redirect-gateway
+        }
+        if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
+    #ifndef Q_OS_ANDROID
+            config.append("\nredirect-gateway ipv6 !ipv4 bypass-dhcp\n");
+    #endif
+            // Prevent ipv6 leak
+            config.append("ifconfig-ipv6 fd15:53b6:dead::2/64  fd15:53b6:dead::1\n");
+            config.append("block-ipv6\n");
+        }
    }

 #ifndef MZ_WINDOWS
--- a/client/configurators/openvpn_configurator.h
+++ b/client/configurators/openvpn_configurator.h
@ -26,7 +26,7 @@ public:
    QString genOpenVpnConfig(const ServerCredentials &credentials, DockerContainer container,
        const QJsonObject &containerConfig, QString &clientId, ErrorCode *errorCode = nullptr);

-    QString processConfigWithLocalSettings(QString jsonConfig);
+    QString processConfigWithLocalSettings(QString jsonConfig, const int serverIndex);
    QString processConfigWithExportSettings(QString jsonConfig);

    ErrorCode signCert(DockerContainer container,
--- a/client/configurators/vpn_configurator.cpp
+++ b/client/configurators/vpn_configurator.cpp
@ -92,7 +92,7 @@ QString &VpnConfigurator::processConfigWithLocalSettings(int serverIndex, Docker
    processConfigWithDnsSettings(serverIndex, container, proto, config);

    if (proto == Proto::OpenVpn) {
-        config = openVpnConfigurator->processConfigWithLocalSettings(config);
+        config = openVpnConfigurator->processConfigWithLocalSettings(config, serverIndex);
    }
    return config;
 }
--- a/client/ios/networkextension/CMakeLists.txt
+++ b/client/ios/networkextension/CMakeLists.txt
@ -58,7 +58,7 @@ target_link_libraries(networkextension PRIVATE ${FW_UI_KIT})
 target_compile_options(networkextension PRIVATE -DGROUP_ID=\"${BUILD_IOS_GROUP_IDENTIFIER}\")
 target_compile_options(networkextension PRIVATE -DNETWORK_EXTENSION=1)

-set(WG_APPLE_SOURCE_DIR ${CLIENT_ROOT_DIR}/3rd/awg-apple/Sources)
+set(WG_APPLE_SOURCE_DIR ${CLIENT_ROOT_DIR}/3rd/amneziawg-apple/Sources)

 target_sources(networkextension PRIVATE
    ${WG_APPLE_SOURCE_DIR}/WireGuardKit/WireGuardAdapter.swift
--- a/client/ios/networkextension/WireGuardNetworkExtension-Bridging-Header.h
+++ b/client/ios/networkextension/WireGuardNetworkExtension-Bridging-Header.h
@ -1,6 +1,6 @@
 #include "wireguard-go-version.h"
-#include "3rd/awg-apple/Sources/WireGuardKitGo/wireguard.h"
-#include "3rd/awg-apple/Sources/WireGuardKitC/WireGuardKitC.h"
+#include "3rd/amneziawg-apple/Sources/WireGuardKitGo/wireguard.h"
+#include "3rd/amneziawg-apple/Sources/WireGuardKitC/WireGuardKitC.h"

 #include <stdbool.h>
 #include <stdint.h>
--- a/client/platforms/android/android_controller.cpp
+++ b/client/platforms/android/android_controller.cpp
@ -1,8 +1,10 @@
-#include <QCoreApplication>
 #include <QJniEnvironment>
 #include <QJsonDocument>
+#include <QQmlFile>
+#include <QEventLoop>

 #include "android_controller.h"
+#include "android_utils.h"
 #include "ui/controllers/importController.h"

 namespace
@ -106,6 +108,7 @@ bool AndroidController::initialize()
        {"onVpnDisconnected", "()V", reinterpret_cast<void *>(onVpnDisconnected)},
        {"onVpnReconnecting", "()V", reinterpret_cast<void *>(onVpnReconnecting)},
        {"onStatisticsUpdate", "(JJ)V", reinterpret_cast<void *>(onStatisticsUpdate)},
+        {"onFileOpened", "(Ljava/lang/String;)V", reinterpret_cast<void *>(onFileOpened)},
        {"onConfigImported", "(Ljava/lang/String;)V", reinterpret_cast<void *>(onConfigImported)},
        {"decodeQrCode", "(Ljava/lang/String;)Z", reinterpret_cast<bool *>(decodeQrCode)}
    };
@ -127,7 +130,7 @@ auto AndroidController::callActivityMethod(const char *methodName, const char *s
                                           const std::function<Ret()> &defValue, Args &&...args)
 {
    qDebug() << "Call activity method:" << methodName;
-    QJniObject activity = QNativeInterface::QAndroidApplication::context();
+    QJniObject activity = AndroidUtils::getActivity();
    if (activity.isValid()) {
        return activity.callMethod<Ret>(methodName, signature, std::forward<Args>(args)...);
    } else {
@ -165,6 +168,24 @@ void AndroidController::saveFile(const QString &fileName, const QString &data)
                       QJniObject::fromString(data).object<jstring>());
 }

+QString AndroidController::openFile(const QString &filter)
+{
+    QEventLoop wait;
+    QString fileName;
+    connect(this, &AndroidController::fileOpened, this,
+            [&fileName, &wait](const QString &uri) {
+                qDebug() << "Android event: file opened; uri:" << uri;
+                fileName = QQmlFile::urlToLocalFileOrQrc(uri);
+                qDebug() << "Android opened filename:" << fileName;
+                wait.quit();
+            },
+            static_cast<Qt::ConnectionType>(Qt::QueuedConnection | Qt::SingleShotConnection));
+    callActivityMethod("openFile", "(Ljava/lang/String;)V",
+                       QJniObject::fromString(filter).object<jstring>());
+    wait.exec();
+    return fileName;
+}
+
 void AndroidController::setNotificationText(const QString &title, const QString &message, int timerSec)
 {
    callActivityMethod("setNotificationText", "(Ljava/lang/String;Ljava/lang/String;I)V",
@ -285,20 +306,19 @@ void AndroidController::onStatisticsUpdate(JNIEnv *env, jobject thiz, jlong rxBy
 }

 // static
-void AndroidController::onConfigImported(JNIEnv *env, jobject thiz, jstring data)
+void AndroidController::onFileOpened(JNIEnv *env, jobject thiz, jstring uri)
 {
-    Q_UNUSED(env);
    Q_UNUSED(thiz);

-    const char *buffer = env->GetStringUTFChars(data, nullptr);
-    if (!buffer) {
-        return;
-    }
+    emit AndroidController::instance()->fileOpened(AndroidUtils::convertJString(env, uri));
+}

-    QString config(buffer);
-    env->ReleaseStringUTFChars(data, buffer);
+// static
+void AndroidController::onConfigImported(JNIEnv *env, jobject thiz, jstring data)
+{
+    Q_UNUSED(thiz);

-    emit AndroidController::instance()->configImported(config);
+    emit AndroidController::instance()->configImported(AndroidUtils::convertJString(env, data));
 }

 // static
@ -306,12 +326,5 @@ bool AndroidController::decodeQrCode(JNIEnv *env, jobject thiz, jstring data)
 {
    Q_UNUSED(thiz);

-    const char *buffer = env->GetStringUTFChars(data, nullptr);
-    if (!buffer) {
-        return false;
-    }
-
-    QString code(buffer);
-    env->ReleaseStringUTFChars(data, buffer);
-    return ImportController::decodeQrCode(code);
+    return ImportController::decodeQrCode(AndroidUtils::convertJString(env, data));
 }
--- a/client/platforms/android/android_controller.h
+++ b/client/platforms/android/android_controller.h
@ -18,7 +18,8 @@ public:
    bool initialize();

    // keep synchronized with org.amnezia.vpn.protocol.ProtocolState
-    enum class ConnectionState {
+    enum class ConnectionState
+    {
        CONNECTED,
        CONNECTING,
        DISCONNECTED,
@ -30,7 +31,8 @@ public:
    ErrorCode start(const QJsonObject &vpnConfig);
    void stop();
    void setNotificationText(const QString &title, const QString &message, int timerSec);
-    void saveFile(const QString& fileName, const QString &data);
+    void saveFile(const QString &fileName, const QString &data);
+    QString openFile(const QString &filter);
    void startQrReaderActivity();

 signals:
@ -43,6 +45,7 @@ signals:
    void vpnDisconnected();
    void vpnReconnecting();
    void statisticsUpdated(quint64 rxBytes, quint64 txBytes);
+    void fileOpened(QString uri);
    void configImported(QString config);
    void importConfigFromOutside(QString config);
    void initConnectionState(Vpn::ConnectionState state);
@ -65,6 +68,7 @@ private:
    static void onVpnReconnecting(JNIEnv *env, jobject thiz);
    static void onStatisticsUpdate(JNIEnv *env, jobject thiz, jlong rxBytes, jlong txBytes);
    static void onConfigImported(JNIEnv *env, jobject thiz, jstring data);
+    static void onFileOpened(JNIEnv *env, jobject thiz, jstring uri);
    static bool decodeQrCode(JNIEnv *env, jobject thiz, jstring data);

    template <typename Ret, typename ...Args>
--- a/client/platforms/android/android_utils.cpp
+++ b/client/platforms/android/android_utils.cpp
@ -0,0 +1,30 @@
+#include <QCoreApplication>
+#include "android_utils.h"
+
+namespace AndroidUtils
+{
+
+QJniObject getActivity()
+{
+    return QNativeInterface::QAndroidApplication::context();
+}
+
+QString convertJString(JNIEnv *env, jstring data)
+{
+    int len = env->GetStringLength(data);
+    QString res(len, Qt::Uninitialized);
+    env->GetStringRegion(data, 0, len, reinterpret_cast<jchar *>(res.data()));
+    return res;
+}
+
+void runOnAndroidThreadSync(const std::function<void()> &runnable)
+{
+    QNativeInterface::QAndroidApplication::runOnAndroidMainThread(runnable).waitForFinished();
+}
+
+void runOnAndroidThreadAsync(const std::function<void()> &runnable)
+{
+    QNativeInterface::QAndroidApplication::runOnAndroidMainThread(runnable);
+}
+
+}
--- a/client/platforms/android/android_utils.h
+++ b/client/platforms/android/android_utils.h
@ -0,0 +1,16 @@
+#ifndef ANDROID_UTILS_H
+#define ANDROID_UTILS_H
+
+#include <QJniObject>
+
+namespace AndroidUtils
+{
+QJniObject getActivity();
+
+QString convertJString(JNIEnv *env, jstring data);
+
+void runOnAndroidThreadSync(const std::function<void()> &runnable);
+void runOnAndroidThreadAsync(const std::function<void()> &runnable);
+};
+
+#endif // ANDROID_UTILS_H
--- a/client/platforms/android/androidutils.cpp
+++ b/client/platforms/android/androidutils.cpp
@ -1,183 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "androidutils.h"
-
-#include <QGuiApplication>
-#include <QJniEnvironment>
-#include <QJniObject>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QNetworkCookieJar>
-#include <QTimer>
-#include <QUrlQuery>
-
-#include "jni.h"
-
-namespace
-{
-    AndroidUtils *s_instance = nullptr;
-} // namespace
-
-// static
-QString AndroidUtils::GetDeviceName()
-{
-    QJniEnvironment env;
-    jclass BUILD = env->FindClass("android/os/Build");
-    jfieldID model = env->GetStaticFieldID(BUILD, "MODEL", "Ljava/lang/String;");
-    jstring value = (jstring)env->GetStaticObjectField(BUILD, model);
-
-    if (!value) {
-        return QString("Android Device");
-    }
-
-    const char *buffer = env->GetStringUTFChars(value, nullptr);
-    if (!buffer) {
-        return QString("Android Device");
-    }
-
-    QString res(buffer);
-    env->ReleaseStringUTFChars(value, buffer);
-
-    return res;
-};
-
-// static
-AndroidUtils *AndroidUtils::instance()
-{
-    if (!s_instance) {
-        Q_ASSERT(qApp);
-        s_instance = new AndroidUtils(qApp);
-    }
-
-    return s_instance;
-}
-
-AndroidUtils::AndroidUtils(QObject *parent) : QObject(parent)
-{
-    Q_ASSERT(!s_instance);
-    s_instance = this;
-}
-
-AndroidUtils::~AndroidUtils()
-{
-    Q_ASSERT(s_instance == this);
-    s_instance = nullptr;
-}
-
-// static
-void AndroidUtils::dispatchToMainThread(std::function<void()> callback)
-{
-    QTimer *timer = new QTimer();
-    timer->moveToThread(qApp->thread());
-    timer->setSingleShot(true);
-    QObject::connect(timer, &QTimer::timeout, [=]() {
-        callback();
-        timer->deleteLater();
-    });
-    QMetaObject::invokeMethod(timer, "start", Qt::QueuedConnection);
-}
-
-// static
-QByteArray AndroidUtils::getQByteArrayFromJString(JNIEnv *env, jstring data)
-{
-    const char *buffer = env->GetStringUTFChars(data, nullptr);
-    if (!buffer) {
-        qDebug() << "getQByteArrayFromJString - failed to parse data.";
-        return QByteArray();
-    }
-
-    QByteArray out(buffer);
-    env->ReleaseStringUTFChars(data, buffer);
-    return out;
-}
-
-// static
-QString AndroidUtils::getQStringFromJString(JNIEnv *env, jstring data)
-{
-    const char *buffer = env->GetStringUTFChars(data, nullptr);
-    if (!buffer) {
-        qDebug() << "getQStringFromJString - failed to parse data.";
-        return QString();
-    }
-
-    QString out(buffer);
-    env->ReleaseStringUTFChars(data, buffer);
-    return out;
-}
-
-// static
-QJsonObject AndroidUtils::getQJsonObjectFromJString(JNIEnv *env, jstring data)
-{
-    QByteArray raw(getQByteArrayFromJString(env, data));
-    QJsonParseError jsonError;
-    QJsonDocument json = QJsonDocument::fromJson(raw, &jsonError);
-    if (QJsonParseError::NoError != jsonError.error) {
-        qDebug() << "getQJsonObjectFromJstring - error parsing json. Code: " << jsonError.error
-                 << "Offset: " << jsonError.offset << "Message: " << jsonError.errorString() << "Data: " << raw;
-        return QJsonObject();
-    }
-
-    if (!json.isObject()) {
-        qDebug() << "getQJsonObjectFromJString - object expected.";
-        return QJsonObject();
-    }
-
-    return json.object();
-}
-
-QJniObject AndroidUtils::getActivity()
-{
-    return QNativeInterface::QAndroidApplication::context();
-}
-
-int AndroidUtils::GetSDKVersion()
-{
-    QJniEnvironment env;
-    jclass versionClass = env->FindClass("android/os/Build$VERSION");
-    jfieldID sdkIntFieldID = env->GetStaticFieldID(versionClass, "SDK_INT", "I");
-    int sdk = env->GetStaticIntField(versionClass, sdkIntFieldID);
-
-    return sdk;
-}
-
-QString AndroidUtils::GetManufacturer()
-{
-    QJniEnvironment env;
-    jclass buildClass = env->FindClass("android/os/Build");
-    jfieldID manuFacturerField = env->GetStaticFieldID(buildClass, "MANUFACTURER", "Ljava/lang/String;");
-    jstring value = (jstring)env->GetStaticObjectField(buildClass, manuFacturerField);
-
-    const char *buffer = env->GetStringUTFChars(value, nullptr);
-
-    if (!buffer) {
-        qDebug() << "Failed to fetch MANUFACTURER";
-        return QByteArray();
-    }
-
-    QString res(buffer);
-    qDebug() << "MANUFACTURER: " << res;
-    env->ReleaseStringUTFChars(value, buffer);
-    return res;
-}
-
-void AndroidUtils::runOnAndroidThreadSync(const std::function<void()> runnable)
-{
-    QNativeInterface::QAndroidApplication::runOnAndroidMainThread(runnable).waitForFinished();
-}
-
-void AndroidUtils::runOnAndroidThreadAsync(const std::function<void()> runnable)
-{
-    QNativeInterface::QAndroidApplication::runOnAndroidMainThread(runnable);
-}
-
-// Static
-// Creates a copy of the passed QByteArray in the JVM and passes back a ref
-jbyteArray AndroidUtils::tojByteArray(const QByteArray &data)
-{
-    QJniEnvironment env;
-    jbyteArray out = env->NewByteArray(data.size());
-    env->SetByteArrayRegion(out, 0, data.size(), reinterpret_cast<const jbyte *>(data.constData()));
-    return out;
-}
--- a/client/platforms/android/androidutils.h
+++ b/client/platforms/android/androidutils.h
@ -1,49 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef ANDROIDUTILS_H
-#define ANDROIDUTILS_H
-
-#include <jni.h>
-
-#include <QJniEnvironment>
-#include <QJniObject>
-#include <QObject>
-#include <QString>
-#include <QUrl>
-
-class AndroidUtils final : public QObject
-{
-    Q_OBJECT
-    Q_DISABLE_COPY_MOVE(AndroidUtils)
-
-public:
-    static QString GetDeviceName();
-
-    static int GetSDKVersion();
-    static QString GetManufacturer();
-
-    static AndroidUtils* instance();
-
-    static void dispatchToMainThread(std::function<void()> callback);
-
-    static QByteArray getQByteArrayFromJString(JNIEnv* env, jstring data);
-
-    static jbyteArray tojByteArray(const QByteArray& data);
-
-    static QString getQStringFromJString(JNIEnv* env, jstring data);
-
-    static QJsonObject getQJsonObjectFromJString(JNIEnv* env, jstring data);
-
-    static QJniObject getActivity();
-
-    static void runOnAndroidThreadSync(const std::function<void()> runnable);
-    static void runOnAndroidThreadAsync(const std::function<void()> runnable);
-
-private:
-    AndroidUtils(QObject* parent);
-    ~AndroidUtils();
-};
-
-#endif // ANDROIDUTILS_H
--- a/client/platforms/ios/WireGuard-Bridging-Header.h
+++ b/client/platforms/ios/WireGuard-Bridging-Header.h
@ -2,7 +2,7 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

-#include "3rd/awg-apple/Sources/WireGuardKitC/WireGuardKitC.h"
+#include "3rd/amneziawg-apple/Sources/WireGuardKitC/WireGuardKitC.h"

 #include <stdbool.h>
 #include <stdint.h>
--- 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
        <source>Show other methods on Github</source>
        <translation>نمایش متد‎های دیگر در گیت هاب</translation>
    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="104"/>
+        <source>https://github.com/amnezia-vpn/amnezia-client#donate</source>
+        <translation type="unfinished"></translation>
+    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="113"/>
        <source>Contacts</source>
@ -1854,6 +1859,11 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <source>I have nothing</source>
        <translation>من هیچی ندارم</translation>
    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="138"/>
+        <source>https://amnezia.org/instructions/0_starter-guide</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>PageSetupWizardTextKey</name>
@ -2178,38 +2188,38 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::DeletePasswordJobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="104"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="104"/>
        <source>Password entry not found</source>
        <translation>Password entry not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="108"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="108"/>
        <source>Could not decrypt data</source>
        <translation>Could not decrypt data</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="552"/>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="560"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="585"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="593"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="578"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="614"/>
        <source>Could not open wallet: %1; %2</source>
        <translation>Could not open wallet: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="177"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="177"/>
        <source>Password not found</source>
        <translation>Password not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="173"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="173"/>
        <source>Could not open keystore</source>
        <translation>Could not open keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="179"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="179"/>
        <source>Could not remove private key from keystore</source>
        <translation>Could not remove private key from keystore</translation>
    </message>
@ -2217,12 +2227,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::JobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="265"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="295"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="509"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="542"/>
        <source>Access to keychain denied</source>
        <translation>Access to keychain denied</translation>
    </message>
@ -2230,27 +2240,27 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::PlainTextStore</name>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="65"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="65"/>
        <source>Could not store data in settings: access error</source>
        <translation>Could not store data in settings: access error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="67"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="67"/>
        <source>Could not store data in settings: format error</source>
        <translation>Could not store data in settings: format error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="85"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="85"/>
        <source>Could not delete data from settings: access error</source>
        <translation>Could not delete data from settings: access error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="87"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="87"/>
        <source>Could not delete data from settings: format error</source>
        <translation>Could not delete data from settings: format error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="104"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="104"/>
        <source>Entry not found</source>
        <translation>Entry not found</translation>
    </message>
@ -2258,80 +2268,80 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::ReadPasswordJobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="32"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="32"/>
        <source>Password entry not found</source>
        <translation>Password entry not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="36"/>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="139"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="36"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="139"/>
        <source>Could not decrypt data</source>
        <translation>Could not decrypt data</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="178"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="205"/>
        <source>D-Bus is not running</source>
        <translation>D-Bus is not running</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="187"/>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="197"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="214"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="224"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="286"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="316"/>
        <source>No keychain service available</source>
        <translation>No keychain service available</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="288"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="318"/>
        <source>Could not open wallet: %1; %2</source>
        <translation>Could not open wallet: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="333"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="363"/>
        <source>Access to keychain denied</source>
        <translation>Access to keychain denied</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="354"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="384"/>
        <source>Could not determine data type: %1; %2</source>
        <translation>Could not determine data type: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="363"/>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="52"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="393"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="52"/>
        <source>Entry not found</source>
        <translation>Entry not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="372"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="402"/>
        <source>Unsupported entry type &apos;Map&apos;</source>
        <translation>Unsupported entry type &apos;Map&apos;</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="375"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="405"/>
        <source>Unknown kwallet entry type &apos;%1&apos;</source>
        <translation>Unknown kwallet entry type &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="96"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="96"/>
        <source>Password not found</source>
        <translation>Password not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="60"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="60"/>
        <source>Could not open keystore</source>
        <translation>Could not open keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="68"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="68"/>
        <source>Could not retrieve private key from keystore</source>
        <translation>Could not retrieve private key from keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="75"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="75"/>
        <source>Could not create decryption cipher</source>
        <translation>Could not create decryption cipher</translation>
    </message>
@ -2339,73 +2349,73 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::WritePasswordJobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="78"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="78"/>
        <source>Credential size exceeds maximum size of %1</source>
        <translation>Credential size exceeds maximum size of %1</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="87"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="87"/>
        <source>Credential key exceeds maximum size of %1</source>
        <translation>Credential key exceeds maximum size of %1</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="92"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="92"/>
        <source>Writing credentials failed: Win32 error code %1</source>
        <translation>Writing credentials failed: Win32 error code %1</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="162"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="162"/>
        <source>Encryption failed</source>
        <translation>Encryption failed</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="415"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="445"/>
        <source>D-Bus is not running</source>
        <translation>D-Bus is not running</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="425"/>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="452"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="455"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="482"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="468"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="501"/>
        <source>Could not open wallet: %1; %2</source>
        <translation>Could not open wallet: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="144"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="144"/>
        <source>Password not found</source>
        <translation>Password not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="95"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="95"/>
        <source>Could not open keystore</source>
        <translation>Could not open keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="124"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="124"/>
        <source>Could not create private key generator</source>
        <translation>Could not create private key generator</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="131"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="131"/>
        <source>Could not generate new private key</source>
        <translation>Could not generate new private key</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="139"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="139"/>
        <source>Could not retrieve private key from keystore</source>
        <translation>Could not retrieve private key from keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="147"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="147"/>
        <source>Could not create encryption cipher</source>
        <translation>Could not create encryption cipher</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="155"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="155"/>
        <source>Could not encrypt data</source>
        <translation>Could not encrypt data</translation>
    </message>
@ -2855,74 +2865,72 @@ This means that AmneziaWG keeps the fast performance of the original while addin
        <translation>سرویس Sftp</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/libsecret.cpp" line="119"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/libsecret.cpp" line="119"/>
        <source>Entry not found</source>
        <translation>Entry not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="225"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="255"/>
        <source>Access to keychain denied</source>
        <translation>Access to keychain denied</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="227"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="257"/>
        <source>No keyring daemon</source>
        <translation>No keyring daemon</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="229"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="259"/>
        <source>Already unlocked</source>
        <translation>Already unlocked</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="231"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="261"/>
        <source>No such keyring</source>
        <translation>No such keyring</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="233"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="263"/>
        <source>Bad arguments</source>
        <translation>Bad arguments</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="235"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="265"/>
        <source>I/O error</source>
        <translation>I/O error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="237"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="267"/>
        <source>Cancelled</source>
        <translation>Cancelled</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="239"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="269"/>
        <source>Keyring already exists</source>
        <translation>Keyring already exists</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="241"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="271"/>
        <source>No match</source>
        <translation>No match</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="246"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="276"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="72"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="72"/>
        <source>error 0x%1: %2</source>
        <translation>error 0x%1: %2</translation>
    </message>
    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
        <source>WireGuard Configuration Highlighter</source>
-        <translation>هایلایتر پیکربندی WireGuard</translation>
+        <translation type="vanished">هایلایتر پیکربندی WireGuard</translation>
    </message>
    <message>
-        <location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
        <source>&amp;Randomize colors</source>
-        <translation>رنگ‎های تصادفی</translation>
+        <translation type="vanished">رنگ‎های تصادفی</translation>
    </message>
 </context>
 <context>
@ -2936,13 +2944,13 @@ This means that AmneziaWG keeps the fast performance of the original while addin
 <context>
    <name>Settings</name>
    <message>
-        <location filename="../settings.cpp" line="26"/>
+        <location filename="../settings.cpp" line="30"/>
        <source>Server #1</source>
        <translation>Server #1</translation>
    </message>
    <message>
-        <location filename="../settings.cpp" line="202"/>
-        <location filename="../settings.cpp" line="209"/>
+        <location filename="../settings.cpp" line="206"/>
+        <location filename="../settings.cpp" line="213"/>
        <source>Server</source>
        <translation>Server</translation>
    </message>
@ -2950,22 +2958,22 @@ This means that AmneziaWG keeps the fast performance of the original while addin
 <context>
    <name>SettingsController</name>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="25"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="26"/>
        <source>Software version</source>
        <translation>نسخه نرم‎افزار</translation>
    </message>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="137"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="139"/>
        <source>All settings have been reset to default values</source>
        <translation>تمام تنظیمات به مقادیر پیش فرض ریست شد</translation>
    </message>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="143"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="145"/>
        <source>Cached profiles cleared</source>
        <translation>پروفایل ذخیره شده پاک شد</translation>
    </message>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="122"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="123"/>
        <source>Backup file is corrupted</source>
        <translation>فایل بک‎آپ خراب شده است</translation>
    </message>
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
@ -15,15 +15,13 @@
 <context>
    <name>AndroidController</name>
    <message>
-        <location filename="../platforms/android/android_controller.cpp" line="236"/>
        <source>AmneziaVPN</source>
-        <translation>AmneziaVPN</translation>
+        <translation type="vanished">AmneziaVPN</translation>
    </message>
    <message>
-        <location filename="../platforms/android/android_controller.cpp" line="239"/>
        <source>VPN Connected</source>
        <extracomment>Refers to the app - which is currently running the background and waiting</extracomment>
-        <translation>VPN Подключен</translation>
+        <translation type="vanished">VPN Подключен</translation>
    </message>
 </context>
 <context>
@ -151,7 +149,7 @@
 <context>
    <name>ImportController</name>
    <message>
-        <location filename="../ui/controllers/importController.cpp" line="435"/>
+        <location filename="../ui/controllers/importController.cpp" line="411"/>
        <source>Scanned %1 of %2.</source>
        <translation>Отсканировано %1 из%2.</translation>
    </message>
@ -946,6 +944,11 @@ Already installed containers were found on the server. All installed containers
        <source>Show other methods on Github</source>
        <translation>Показать другие способы на Github</translation>
    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="104"/>
+        <source>https://github.com/amnezia-vpn/amnezia-client#donate</source>
+        <translation type="unfinished"></translation>
+    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="113"/>
        <source>Contacts</source>
@ -1428,22 +1431,22 @@ Already installed containers were found on the server. All installed containers
        <translation>Имя сервера</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="110"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="111"/>
        <source>Save</source>
        <translation>Сохранить</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="137"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="142"/>
        <source>Protocols</source>
        <translation>Протоколы</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="143"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="148"/>
        <source>Services</source>
        <translation>Сервисы</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="147"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="152"/>
        <source>Data</source>
        <translation>Данные</translation>
    </message>
@ -1854,6 +1857,11 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <source>I have nothing</source>
        <translation>У меня ничего нет</translation>
    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="138"/>
+        <source>https://amnezia.org/instructions/0_starter-guide</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>PageSetupWizardTextKey</name>
@ -1941,8 +1949,8 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation type="vanished">Доступ к управлению сервером. Пользователь, с которым вы делитесь полным доступом к соединению, сможет добавлять и удалять ваши протоколы и службы на сервере, а также изменять настройки.</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="279"/>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="280"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="281"/>
        <source>Server</source>
        <translation>Сервер</translation>
    </message>
@ -2017,7 +2025,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="231"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="483"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="486"/>
        <source>Users</source>
        <translation type="unfinished">Пользователи</translation>
    </message>
@ -2027,47 +2035,52 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation type="unfinished">Имя пользователя</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="499"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="502"/>
        <source>Search</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="595"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="584"/>
+        <source>Creation date: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="598"/>
        <source>Rename</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="624"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="627"/>
        <source>Client name</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="632"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="636"/>
        <source>Save</source>
        <translation type="unfinished">Сохранить</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="660"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="668"/>
        <source>Revoke</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="663"/>
-        <source>Revoke the config for a user - </source>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="671"/>
+        <source>Revoke the config for a user - %1?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="664"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="672"/>
        <source>The user will no longer be able to connect to your server.</source>
        <translation type="unfinished">Пользователь больше не сможет подключаться к вашему серверу</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="665"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="673"/>
        <source>Continue</source>
        <translation type="unfinished">Продолжить</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="666"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="674"/>
        <source>Cancel</source>
        <translation type="unfinished">Отменить</translation>
    </message>
@ -2081,20 +2094,20 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation>Поделиться доступом к VPN, без возможности управления сервером</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="331"/>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="332"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="333"/>
        <source>Protocol</source>
        <translation>Протокол</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="428"/>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="429"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="430"/>
        <source>Connection format</source>
        <translation>Формат подключения</translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="186"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="468"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="469"/>
        <source>Share</source>
        <translation>Поделиться</translation>
    </message>
@ -2124,12 +2137,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation type="unfinished">Сервер</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="102"/>
+        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="100"/>
        <source>Accessing </source>
        <translation type="unfinished">Доступ </translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="103"/>
+        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="101"/>
        <source>File with accessing settings to </source>
        <translation type="unfinished"></translation>
    </message>
@ -2160,38 +2173,38 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::DeletePasswordJobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="104"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="104"/>
        <source>Password entry not found</source>
        <translation>Password entry not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="108"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="108"/>
        <source>Could not decrypt data</source>
        <translation>Could not decrypt data</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="552"/>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="560"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="585"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="593"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="578"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="614"/>
        <source>Could not open wallet: %1; %2</source>
        <translation>Could not open wallet: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="177"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="177"/>
        <source>Password not found</source>
        <translation>Password not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="173"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="173"/>
        <source>Could not open keystore</source>
        <translation>Could not open keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="179"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="179"/>
        <source>Could not remove private key from keystore</source>
        <translation>Could not remove private key from keystore</translation>
    </message>
@ -2199,12 +2212,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::JobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="265"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="295"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="509"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="542"/>
        <source>Access to keychain denied</source>
        <translation>Access to keychain denied</translation>
    </message>
@ -2212,27 +2225,27 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::PlainTextStore</name>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="65"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="65"/>
        <source>Could not store data in settings: access error</source>
        <translation>Could not store data in settings: access error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="67"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="67"/>
        <source>Could not store data in settings: format error</source>
        <translation>Could not store data in settings: format error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="85"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="85"/>
        <source>Could not delete data from settings: access error</source>
        <translation>Could not delete data from settings: access error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="87"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="87"/>
        <source>Could not delete data from settings: format error</source>
        <translation>Could not delete data from settings: format error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="104"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="104"/>
        <source>Entry not found</source>
        <translation>Entry not found</translation>
    </message>
@ -2240,80 +2253,80 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::ReadPasswordJobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="32"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="32"/>
        <source>Password entry not found</source>
        <translation>Password entry not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="36"/>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="139"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="36"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="139"/>
        <source>Could not decrypt data</source>
        <translation>Could not decrypt data</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="178"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="205"/>
        <source>D-Bus is not running</source>
        <translation>D-Bus is not running</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="187"/>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="197"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="214"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="224"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="286"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="316"/>
        <source>No keychain service available</source>
        <translation>No keychain service available</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="288"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="318"/>
        <source>Could not open wallet: %1; %2</source>
        <translation>Could not open wallet: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="333"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="363"/>
        <source>Access to keychain denied</source>
        <translation>Access to keychain denied</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="354"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="384"/>
        <source>Could not determine data type: %1; %2</source>
        <translation>Could not determine data type: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="363"/>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="52"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="393"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="52"/>
        <source>Entry not found</source>
        <translation>Entry not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="372"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="402"/>
        <source>Unsupported entry type &apos;Map&apos;</source>
        <translation>Unsupported entry type &apos;Map&apos;</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="375"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="405"/>
        <source>Unknown kwallet entry type &apos;%1&apos;</source>
        <translation>Unknown kwallet entry type &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="96"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="96"/>
        <source>Password not found</source>
        <translation>Password not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="60"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="60"/>
        <source>Could not open keystore</source>
        <translation>Could not open keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="68"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="68"/>
        <source>Could not retrieve private key from keystore</source>
        <translation>Could not retrieve private key from keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="75"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="75"/>
        <source>Could not create decryption cipher</source>
        <translation>Could not create decryption cipher</translation>
    </message>
@ -2321,73 +2334,73 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::WritePasswordJobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="78"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="78"/>
        <source>Credential size exceeds maximum size of %1</source>
        <translation>Credential size exceeds maximum size of %1</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="87"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="87"/>
        <source>Credential key exceeds maximum size of %1</source>
        <translation>Credential key exceeds maximum size of %1</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="92"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="92"/>
        <source>Writing credentials failed: Win32 error code %1</source>
        <translation>Writing credentials failed: Win32 error code %1</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="162"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="162"/>
        <source>Encryption failed</source>
        <translation>Encryption failed</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="415"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="445"/>
        <source>D-Bus is not running</source>
        <translation>D-Bus is not running</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="425"/>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="452"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="455"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="482"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="468"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="501"/>
        <source>Could not open wallet: %1; %2</source>
        <translation>Could not open wallet: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="144"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="144"/>
        <source>Password not found</source>
        <translation>Password not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="95"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="95"/>
        <source>Could not open keystore</source>
        <translation>Could not open keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="124"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="124"/>
        <source>Could not create private key generator</source>
        <translation>Could not create private key generator</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="131"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="131"/>
        <source>Could not generate new private key</source>
        <translation>Could not generate new private key</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="139"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="139"/>
        <source>Could not retrieve private key from keystore</source>
        <translation>Could not retrieve private key from keystore</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="147"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="147"/>
        <source>Could not create encryption cipher</source>
        <translation>Could not create encryption cipher</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="155"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="155"/>
        <source>Could not encrypt data</source>
        <translation>Could not encrypt data</translation>
    </message>
@ -2594,7 +2607,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation>VPN pool error: no available addresses</translation>
    </message>
    <message>
-        <location filename="../core/errorstrings.cpp" line="64"/>
+        <location filename="../core/errorstrings.cpp" line="63"/>
+        <source>VPN connection error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="67"/>
        <source>Internal error</source>
        <translation>Internal error</translation>
    </message>
@ -2822,62 +2840,62 @@ This means that AmneziaWG keeps the fast performance of the original while addin
        <translation>Сервис SFTP</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/libsecret.cpp" line="119"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/libsecret.cpp" line="119"/>
        <source>Entry not found</source>
        <translation>Entry not found</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="225"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="255"/>
        <source>Access to keychain denied</source>
        <translation>Access to keychain denied</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="227"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="257"/>
        <source>No keyring daemon</source>
        <translation>No keyring daemon</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="229"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="259"/>
        <source>Already unlocked</source>
        <translation>Already unlocked</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="231"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="261"/>
        <source>No such keyring</source>
        <translation>No such keyring</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="233"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="263"/>
        <source>Bad arguments</source>
        <translation>Bad arguments</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="235"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="265"/>
        <source>I/O error</source>
        <translation>I/O error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="237"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="267"/>
        <source>Cancelled</source>
        <translation>Cancelled</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="239"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="269"/>
        <source>Keyring already exists</source>
        <translation>Keyring already exists</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="241"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="271"/>
        <source>No match</source>
        <translation>No match</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="246"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="276"/>
        <source>Unknown error</source>
        <translation>Unknown error</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="72"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="72"/>
        <source>error 0x%1: %2</source>
        <translation>error 0x%1: %2</translation>
    </message>
@ -2893,13 +2911,13 @@ This means that AmneziaWG keeps the fast performance of the original while addin
 <context>
    <name>Settings</name>
    <message>
-        <location filename="../settings.cpp" line="26"/>
+        <location filename="../settings.cpp" line="30"/>
        <source>Server #1</source>
        <translation>Server #1</translation>
    </message>
    <message>
-        <location filename="../settings.cpp" line="202"/>
-        <location filename="../settings.cpp" line="209"/>
+        <location filename="../settings.cpp" line="206"/>
+        <location filename="../settings.cpp" line="213"/>
        <source>Server</source>
        <translation>Server</translation>
    </message>
@ -2907,22 +2925,22 @@ This means that AmneziaWG keeps the fast performance of the original while addin
 <context>
    <name>SettingsController</name>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="25"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="26"/>
        <source>Software version</source>
        <translation>Версия ПО</translation>
    </message>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="137"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="139"/>
        <source>All settings have been reset to default values</source>
        <translation>Все настройки были сброшены к значению &quot;По умолчанию&quot;</translation>
    </message>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="143"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="145"/>
        <source>Cached profiles cleared</source>
        <translation>Кэш профиля очищен</translation>
    </message>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="122"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="123"/>
        <source>Backup file is corrupted</source>
        <translation>Backup файл поврежден</translation>
    </message>
@ -3054,7 +3072,7 @@ This means that AmneziaWG keeps the fast performance of the original while addin
 <context>
    <name>VpnConnection</name>
    <message>
-        <location filename="../vpnconnection.cpp" line="429"/>
+        <location filename="../vpnconnection.cpp" line="432"/>
        <source>Mbps</source>
        <translation>Mbps</translation>
    </message>
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
@ -11,15 +11,9 @@
 <context>
    <name>AndroidController</name>
    <message>
-        <location filename="../platforms/android/android_controller.cpp" line="236"/>
-        <source>AmneziaVPN</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../platforms/android/android_controller.cpp" line="239"/>
        <source>VPN Connected</source>
        <extracomment>Refers to the app - which is currently running the background and waiting</extracomment>
-        <translation>VPN已连接</translation>
+        <translation type="vanished">VPN已连接</translation>
    </message>
 </context>
 <context>
@ -158,7 +152,7 @@
 <context>
    <name>ImportController</name>
    <message>
-        <location filename="../ui/controllers/importController.cpp" line="435"/>
+        <location filename="../ui/controllers/importController.cpp" line="411"/>
        <source>Scanned %1 of %2.</source>
        <translation>扫描 %1 of %2.</translation>
    </message>
@ -997,6 +991,11 @@ And if you don&apos;t like the app, all the more support it - the donation will
        <source>Show other methods on Github</source>
        <translation>其他捐款途径</translation>
    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="104"/>
+        <source>https://github.com/amnezia-vpn/amnezia-client#donate</source>
+        <translation type="unfinished"></translation>
+    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="113"/>
        <source>Contacts</source>
@ -1511,22 +1510,22 @@ And if you don&apos;t like the app, all the more support it - the donation will
        <translation>服务器名</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="110"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="111"/>
        <source>Save</source>
        <translation>保存</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="137"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="142"/>
        <source>Protocols</source>
        <translation>协议</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="143"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="148"/>
        <source>Services</source>
        <translation>服务</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="147"/>
+        <location filename="../ui/qml/Pages2/PageSettingsServerInfo.qml" line="152"/>
        <source>Data</source>
        <translation>数据</translation>
    </message>
@ -1957,6 +1956,11 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <source>I have nothing</source>
        <translation>我没有</translation>
    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageSetupWizardStart.qml" line="138"/>
+        <source>https://amnezia.org/instructions/0_starter-guide</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>PageSetupWizardTextKey</name>
@ -2078,7 +2082,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="231"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="483"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="486"/>
        <source>Users</source>
        <translation type="unfinished"></translation>
    </message>
@ -2088,47 +2092,52 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation>共享 VPN 访问，无需管理服务器</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="499"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="502"/>
        <source>Search</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="595"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="584"/>
+        <source>Creation date: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="598"/>
        <source>Rename</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="624"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="627"/>
        <source>Client name</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="632"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="636"/>
        <source>Save</source>
        <translation type="unfinished">保存</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="660"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="668"/>
        <source>Revoke</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="663"/>
-        <source>Revoke the config for a user - </source>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="671"/>
+        <source>Revoke the config for a user - %1?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="664"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="672"/>
        <source>The user will no longer be able to connect to your server.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="665"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="673"/>
        <source>Continue</source>
        <translation type="unfinished">继续</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="666"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="674"/>
        <source>Cancel</source>
        <translation type="unfinished">取消</translation>
    </message>
@ -2170,8 +2179,8 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation type="obsolete">服务器</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="279"/>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="280"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="281"/>
        <source>Server</source>
        <translation>服务器</translation>
    </message>
@ -2193,8 +2202,8 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation type="obsolete">协议</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="331"/>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="332"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="333"/>
        <source>Protocol</source>
        <translation>协议</translation>
    </message>
@ -2214,14 +2223,14 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="428"/>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="429"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="430"/>
        <source>Connection format</source>
        <translation>连接格式</translation>
    </message>
    <message>
        <location filename="../ui/qml/Pages2/PageShare.qml" line="186"/>
-        <location filename="../ui/qml/Pages2/PageShare.qml" line="468"/>
+        <location filename="../ui/qml/Pages2/PageShare.qml" line="469"/>
        <source>Share</source>
        <translation>共享</translation>
    </message>
@ -2251,12 +2260,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation type="unfinished">服务器</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="102"/>
+        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="100"/>
        <source>Accessing </source>
        <translation type="unfinished">访问</translation>
    </message>
    <message>
-        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="103"/>
+        <location filename="../ui/qml/Pages2/PageShareFullAccess.qml" line="101"/>
        <source>File with accessing settings to </source>
        <translation type="unfinished">访问配置文件的内容为:</translation>
    </message>
@ -2287,38 +2296,38 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::DeletePasswordJobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="104"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="104"/>
        <source>Password entry not found</source>
        <translation>未发现秘密</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="108"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="108"/>
        <source>Could not decrypt data</source>
        <translation>数据无法加密</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="552"/>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="560"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="585"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="593"/>
        <source>Unknown error</source>
        <translation>未知错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="578"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="614"/>
        <source>Could not open wallet: %1; %2</source>
        <translation>无法打开钱包: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="177"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="177"/>
        <source>Password not found</source>
        <translation>未发现密码</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="173"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="173"/>
        <source>Could not open keystore</source>
        <translation>无法打开密钥库</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="179"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="179"/>
        <source>Could not remove private key from keystore</source>
        <translation>无法从密钥库中删除私钥</translation>
    </message>
@ -2326,12 +2335,12 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::JobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="265"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="295"/>
        <source>Unknown error</source>
        <translation>未知错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="509"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="542"/>
        <source>Access to keychain denied</source>
        <translation>访问钥匙串被拒绝</translation>
    </message>
@ -2339,27 +2348,27 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::PlainTextStore</name>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="65"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="65"/>
        <source>Could not store data in settings: access error</source>
        <translation>无法在配置中存储数据：访问错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="67"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="67"/>
        <source>Could not store data in settings: format error</source>
        <translation>无法在陪置中存储数据：格式错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="85"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="85"/>
        <source>Could not delete data from settings: access error</source>
        <translation>无法在配置中删除数据：访问错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="87"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="87"/>
        <source>Could not delete data from settings: format error</source>
        <translation>无法在配置中删除数据：格式错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/plaintextstore.cpp" line="104"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/plaintextstore.cpp" line="104"/>
        <source>Entry not found</source>
        <translation>未找到条目</translation>
    </message>
@ -2367,80 +2376,80 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::ReadPasswordJobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="32"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="32"/>
        <source>Password entry not found</source>
        <translation>未发现密码</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="36"/>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="139"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="36"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="139"/>
        <source>Could not decrypt data</source>
        <translation>数据无法加密</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="178"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="205"/>
        <source>D-Bus is not running</source>
        <translation>D-Bus未运行</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="187"/>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="197"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="214"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="224"/>
        <source>Unknown error</source>
        <translation>未知错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="286"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="316"/>
        <source>No keychain service available</source>
        <translation>没有有效的钥匙串服务</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="288"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="318"/>
        <source>Could not open wallet: %1; %2</source>
        <translation>无法打开钱包: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="333"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="363"/>
        <source>Access to keychain denied</source>
        <translation>访问钥匙串被拒绝</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="354"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="384"/>
        <source>Could not determine data type: %1; %2</source>
        <translation>无法确定数据类型: %1； %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="363"/>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="52"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="393"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="52"/>
        <source>Entry not found</source>
        <translation>未找到记录</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="372"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="402"/>
        <source>Unsupported entry type &apos;Map&apos;</source>
        <translation>不支持的记录类型 &apos;Map&apos;</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="375"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="405"/>
        <source>Unknown kwallet entry type &apos;%1&apos;</source>
        <translation>未知钱包类型 &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="96"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="96"/>
        <source>Password not found</source>
        <translation>未发现密码</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="60"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="60"/>
        <source>Could not open keystore</source>
        <translation>无法打开密钥库</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="68"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="68"/>
        <source>Could not retrieve private key from keystore</source>
        <translation>无法从密钥存储库中检索私钥</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="75"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="75"/>
        <source>Could not create decryption cipher</source>
        <translation>无法创建解密算法</translation>
    </message>
@ -2448,73 +2457,73 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
 <context>
    <name>QKeychain::WritePasswordJobPrivate</name>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="78"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="78"/>
        <source>Credential size exceeds maximum size of %1</source>
        <translation>证书大小超过上限，最大为: %1</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="87"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="87"/>
        <source>Credential key exceeds maximum size of %1</source>
        <translation>凭证密钥大小超过上限，最大为: %1</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="92"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="92"/>
        <source>Writing credentials failed: Win32 error code %1</source>
        <translation>写入凭证失败，Win32错误码: %1</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_win.cpp" line="162"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_win.cpp" line="162"/>
        <source>Encryption failed</source>
        <translation>加密失败</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="415"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="445"/>
        <source>D-Bus is not running</source>
        <translation>D-Bus未运行</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="425"/>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="452"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="455"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="482"/>
        <source>Unknown error</source>
        <translation>未知错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="468"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="501"/>
        <source>Could not open wallet: %1; %2</source>
        <translation>无法打开钱包: %1; %2</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="144"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="144"/>
        <source>Password not found</source>
        <translation>未发现密码</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="95"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="95"/>
        <source>Could not open keystore</source>
        <translation>无法打开密钥库</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="124"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="124"/>
        <source>Could not create private key generator</source>
        <translation>无法创建私钥生成器</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="131"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="131"/>
        <source>Could not generate new private key</source>
        <translation>无法生成新的私钥</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="139"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="139"/>
        <source>Could not retrieve private key from keystore</source>
        <translation>无法从密钥库检索私钥</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="147"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="147"/>
        <source>Could not create encryption cipher</source>
        <translation>无法创建加密密码</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_android.cpp" line="155"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_android.cpp" line="155"/>
        <source>Could not encrypt data</source>
        <translation>无法加密数据</translation>
    </message>
@ -2666,6 +2675,11 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <source>Sftp error: No media was in remote drive</source>
        <translation>Sftp 错误: 远程驱动器中没有媒介</translation>
    </message>
+    <message>
+        <location filename="../core/errorstrings.cpp" line="63"/>
+        <source>VPN connection error</source>
+        <translation type="unfinished"></translation>
+    </message>
    <message>
        <source>Failed to save config to disk</source>
        <translation type="vanished">配置保存到磁盘失败</translation>
@ -2730,7 +2744,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
        <translation type="vanished">该配置不包含任何用于连接到服务器的容器和凭据。</translation>
    </message>
    <message>
-        <location filename="../core/errorstrings.cpp" line="64"/>
+        <location filename="../core/errorstrings.cpp" line="67"/>
        <source>Internal error</source>
        <translation>内部错误</translation>
    </message>
@ -2970,62 +2984,62 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
        <translation>Sftp 文件共享服务 - 安全的 FTP 服务</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/libsecret.cpp" line="119"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/libsecret.cpp" line="119"/>
        <source>Entry not found</source>
        <translation>未找到记录</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="225"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="255"/>
        <source>Access to keychain denied</source>
        <translation>访问钥匙串被拒绝</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="227"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="257"/>
        <source>No keyring daemon</source>
        <translation>没有密钥环守护进程</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="229"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="259"/>
        <source>Already unlocked</source>
        <translation>已经解锁</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="231"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="261"/>
        <source>No such keyring</source>
        <translation>没有这样的密钥环</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="233"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="263"/>
        <source>Bad arguments</source>
        <translation>错误参数</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="235"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="265"/>
        <source>I/O error</source>
        <translation>I/O错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="237"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="267"/>
        <source>Cancelled</source>
        <translation>已取消</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="239"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="269"/>
        <source>Keyring already exists</source>
        <translation>密匙环已经存在</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="241"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="271"/>
        <source>No match</source>
        <translation>不匹配</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_unix.cpp" line="246"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_unix.cpp" line="276"/>
        <source>Unknown error</source>
        <translation>未知错误</translation>
    </message>
    <message>
-        <location filename="../3rd/qtkeychain/keychain_haiku.cpp" line="72"/>
+        <location filename="../3rd/qtkeychain/qtkeychain/keychain_haiku.cpp" line="72"/>
        <source>error 0x%1: %2</source>
        <translation>错误 0x%1: %2</translation>
    </message>
@ -3041,13 +3055,13 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
 <context>
    <name>Settings</name>
    <message>
-        <location filename="../settings.cpp" line="26"/>
+        <location filename="../settings.cpp" line="30"/>
        <source>Server #1</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../settings.cpp" line="202"/>
-        <location filename="../settings.cpp" line="209"/>
+        <location filename="../settings.cpp" line="206"/>
+        <location filename="../settings.cpp" line="213"/>
        <source>Server</source>
        <translation>服务器</translation>
    </message>
@ -3055,22 +3069,22 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
 <context>
    <name>SettingsController</name>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="25"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="26"/>
        <source>Software version</source>
        <translation>软件版本</translation>
    </message>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="122"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="123"/>
        <source>Backup file is corrupted</source>
        <translation>备份文件已损坏</translation>
    </message>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="137"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="139"/>
        <source>All settings have been reset to default values</source>
        <translation>所配置恢复为默认值</translation>
    </message>
    <message>
-        <location filename="../ui/controllers/settingsController.cpp" line="143"/>
+        <location filename="../ui/controllers/settingsController.cpp" line="145"/>
        <source>Cached profiles cleared</source>
        <translation>缓存的配置文件已清除</translation>
    </message>
@ -3206,7 +3220,7 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
 <context>
    <name>VpnConnection</name>
    <message>
-        <location filename="../vpnconnection.cpp" line="429"/>
+        <location filename="../vpnconnection.cpp" line="432"/>
        <source>Mbps</source>
        <translation></translation>
    </message>
--- a/client/ui/controllers/exportController.cpp
+++ b/client/ui/controllers/exportController.cpp
@ -15,7 +15,7 @@
 #include "core/errorstrings.h"
 #include "systemController.h"
 #ifdef Q_OS_ANDROID
-    #include "platforms/android/androidutils.h"
+    #include "platforms/android/android_utils.h"
 #endif
 #include "qrcodegen.hpp"

--- a/client/ui/controllers/pageController.cpp
+++ b/client/ui/controllers/pageController.cpp
@ -7,7 +7,7 @@
 #endif

 #ifdef Q_OS_ANDROID
-    #include "../../platforms/android/androidutils.h"
+    #include "platforms/android/android_utils.h"
    #include <QJniObject>
 #endif
 #if defined Q_OS_MAC
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@ -7,8 +7,7 @@
 #include "ui/qautostart.h"
 #include "version.h"
 #ifdef Q_OS_ANDROID
-    #include "../../platforms/android/android_controller.h"
-    #include "../../platforms/android/androidutils.h"
+    #include "platforms/android/android_utils.h"
    #include <QJniObject>
 #endif

--- a/client/ui/controllers/systemController.cpp
+++ b/client/ui/controllers/systemController.cpp
@ -60,6 +60,11 @@ QString SystemController::getFileName(const QString &acceptLabel, const QString
                                      const QString &selectedFile, const bool isSaveMode, const QString &defaultSuffix)
 {
    QString fileName;
+#ifdef Q_OS_ANDROID
+    Q_ASSERT(!isSaveMode);
+    return AndroidController::instance()->openFile(nameFilter);
+#endif
+
 #ifdef Q_OS_IOS

    MobileUtils mobileUtils;
@ -108,20 +113,6 @@ QString SystemController::getFileName(const QString &acceptLabel, const QString
    }

    fileName = mainFileDialog->property("selectedFile").toString();
-
-#ifdef Q_OS_ANDROID
-    // patch for files containing spaces etc
-    const QString sep { "raw%3A%2F" };
-    if (fileName.startsWith("content://") && fileName.contains(sep)) {
-        QString contentUrl = fileName.split(sep).at(0);
-        QString rawUrl = fileName.split(sep).at(1);
-        rawUrl.replace(" ", "%20");
-        fileName = contentUrl + sep + rawUrl;
-    }
-
-    return fileName;
-#endif
-
    return QUrl(fileName).toLocalFile();
 }

--- a/client/ui/models/clientManagementModel.cpp
+++ b/client/ui/models/clientManagementModel.cpp
@ -245,8 +245,13 @@ ErrorCode ClientManagementModel::appendClient(const QString &clientId, const QSt
    const QByteArray clientsTableString = QJsonDocument(m_clientsTable).toJson();

    ServerController serverController(m_settings);
-    const QString clientsTableFile =
-            QString("/opt/amnezia/%1/clientsTable").arg(ContainerProps::containerTypeToString(container));
+    QString clientsTableFile = QString("/opt/amnezia/%1/clientsTable");
+    if (container == DockerContainer::OpenVpn || container == DockerContainer::ShadowSocks
+        || container == DockerContainer::Cloak) {
+        clientsTableFile = clientsTableFile.arg(ContainerProps::containerTypeToString(DockerContainer::OpenVpn));
+    } else {
+        clientsTableFile = clientsTableFile.arg(ContainerProps::containerTypeToString(container));
+    }

    error = serverController.uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
    if (error != ErrorCode::NoError) {
@ -273,8 +278,13 @@ ErrorCode ClientManagementModel::renameClient(const int row, const QString &clie
    const QByteArray clientsTableString = QJsonDocument(m_clientsTable).toJson();

    ServerController serverController(m_settings);
-    const QString clientsTableFile =
-            QString("/opt/amnezia/%1/clientsTable").arg(ContainerProps::containerTypeToString(container));
+    QString clientsTableFile = QString("/opt/amnezia/%1/clientsTable");
+    if (container == DockerContainer::OpenVpn || container == DockerContainer::ShadowSocks
+        || container == DockerContainer::Cloak) {
+        clientsTableFile = clientsTableFile.arg(ContainerProps::containerTypeToString(DockerContainer::OpenVpn));
+    } else {
+        clientsTableFile = clientsTableFile.arg(ContainerProps::containerTypeToString(container));
+    }

    ErrorCode error =
            serverController.uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
@ -345,8 +355,13 @@ ErrorCode ClientManagementModel::revokeOpenVpn(const int row, const DockerContai

    const QByteArray clientsTableString = QJsonDocument(m_clientsTable).toJson();

-    const QString clientsTableFile =
-            QString("/opt/amnezia/%1/clientsTable").arg(ContainerProps::containerTypeToString(container));
+    QString clientsTableFile = QString("/opt/amnezia/%1/clientsTable");
+    if (container == DockerContainer::OpenVpn || container == DockerContainer::ShadowSocks
+        || container == DockerContainer::Cloak) {
+        clientsTableFile = clientsTableFile.arg(ContainerProps::containerTypeToString(DockerContainer::OpenVpn));
+    } else {
+        clientsTableFile = clientsTableFile.arg(ContainerProps::containerTypeToString(container));
+    }
    error = serverController.uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
    if (error != ErrorCode::NoError) {
        logger.error() << "Failed to upload the clientsTable file to the server";
@ -395,8 +410,13 @@ ErrorCode ClientManagementModel::revokeWireGuard(const int row, const DockerCont

    const QByteArray clientsTableString = QJsonDocument(m_clientsTable).toJson();

-    const QString clientsTableFile =
-            QString("/opt/amnezia/%1/clientsTable").arg(ContainerProps::containerTypeToString(container));
+    QString clientsTableFile = QString("/opt/amnezia/%1/clientsTable");
+    if (container == DockerContainer::OpenVpn || container == DockerContainer::ShadowSocks
+        || container == DockerContainer::Cloak) {
+        clientsTableFile = clientsTableFile.arg(ContainerProps::containerTypeToString(DockerContainer::OpenVpn));
+    } else {
+        clientsTableFile = clientsTableFile.arg(ContainerProps::containerTypeToString(container));
+    }
    error = serverController.uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
    if (error != ErrorCode::NoError) {
        logger.error() << "Failed to upload the clientsTable file to the server";
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@ -15,6 +15,10 @@ ServersModel::ServersModel(std::shared_ptr<Settings> settings, QObject *parent)
        auto defaultContainer = ContainerProps::containerFromString(m_servers.at(serverIndex).toObject().value(config_key::defaultContainer).toString());
        emit ServersModel::defaultContainerChanged(defaultContainer);
    });
+    connect(this, &ServersModel::currentlyProcessedServerIndexChanged, this, [this](const int serverIndex) {
+        auto defaultContainer = ContainerProps::containerFromString(m_servers.at(serverIndex).toObject().value(config_key::defaultContainer).toString());
+        emit ServersModel::defaultContainerChanged(defaultContainer);
+    });
 }

 int ServersModel::rowCount(const QModelIndex &parent) const
@ -269,6 +273,7 @@ void ServersModel::removeServer()
    if (m_settings->serversCount() == 0) {
        setDefaultServerIndex(-1);
    }
+    setCurrentlyProcessedServerIndex(m_defaultServerIndex);
    endResetModel();
 }

@ -526,3 +531,8 @@ void ServersModel::toggleAmneziaDns(bool enabled)
    emit defaultServerDescriptionChanged();
 }

+bool ServersModel::isDefaultServerFromApi()
+{
+    return m_settings->server(m_defaultServerIndex).value(config_key::configVersion).toInt();
+}
+
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@ -97,6 +97,8 @@ public slots:

    void toggleAmneziaDns(bool enabled);

+    bool isDefaultServerFromApi();
+
 protected:
    QHash<int, QByteArray> roleNames() const override;

--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@ -26,6 +26,22 @@ ListView {
        id: containersRadioButtonGroup
    }

+    Connections {
+        target: ServersModel
+
+        function onCurrentlyProcessedServerIndexChanged() {
+            menuContent.checkCurrentItem()
+        }
+    }
+
+    function checkCurrentItem() {
+        var item = menuContent.itemAtIndex(currentIndex)
+        if (item !== null) {
+            var radioButton = item.children[0].children[0]
+            radioButton.checked = true
+        }
+    }
+
    delegate: Item {
        implicitWidth: rootWidth
        implicitHeight: content.implicitHeight
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@ -31,6 +31,7 @@ PageType {
                containersDropDown.rootButtonClickedFunction()
            }
        }
+
        function onForceCloseDrawer() {
            buttonContent.state = "collapsed"
        }
--- a/client/ui/qml/Pages2/PageSettingsDns.qml
+++ b/client/ui/qml/Pages2/PageSettingsDns.qml
@ -28,6 +28,14 @@ PageType {
        anchors.bottom: parent.bottom
        contentHeight: content.height

+        enabled: !ServersModel.isDefaultServerFromApi()
+
+        Component.onCompleted: {
+            if (ServersModel.isDefaultServerFromApi()) {
+                PageController.showNotificationMessage(qsTr("Default server does not support custom dns"))
+            }
+        }
+
        ColumnLayout {
            id: content

--- a/client/ui/qml/Pages2/PageSettingsServerProtocols.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocols.qml
@ -55,6 +55,9 @@ PageType {
                model: SortFilterProxyModel {
                    id: proxyContainersModel
                    sourceModel: ContainersModel
+                    sorters: [
+                        RoleSorter { roleName: "isInstalled"; sortOrder: Qt.DescendingOrder }
+                    ]
                }

                Component.onCompleted: updateContainersModelFilters()
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@ -21,7 +21,13 @@ PageType {
    id: root

    property bool pageEnabled: {
-        return !ConnectionController.isConnected
+        return !ConnectionController.isConnected && !ServersModel.isDefaultServerFromApi()
+    }
+
+    Component.onCompleted: {
+        if (ServersModel.isDefaultServerFromApi()) {
+            PageController.showNotificationMessage(qsTr("Default server does not support split tunneling function"))
+        }
    }

    Connections {
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@ -42,6 +42,7 @@ PageType {
        function onInstallServerFinished(finishedMessage) {
            if (!ConnectionController.isConnected) {
                ServersModel.setDefaultServerIndex(ServersModel.getServersCount() - 1);
+                ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
            }

            PageController.goToStartPage()
--- a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
@ -26,6 +26,7 @@ PageType {
        function onImportFinished() {
            if (!ConnectionController.isConnected) {
                ServersModel.setDefaultServerIndex(ServersModel.getServersCount() - 1);
+                ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
            }

            PageController.goToStartPage()
--- a/client/vpnconnection.cpp
+++ b/client/vpnconnection.cpp
@ -64,24 +64,26 @@ void VpnConnection::onConnectionStateChanged(Vpn::ConnectionState state)
            IpcClient::Interface()->resetIpStack();
            IpcClient::Interface()->flushDns();

-            if (m_settings->routeMode() != Settings::VpnAllSites) {
-                IpcClient::Interface()->routeDeleteList(m_vpnProtocol->vpnGateway(), QStringList() << "0.0.0.0");
-                // qDebug() << "VpnConnection::onConnectionStateChanged :: adding custom routes, count:" << forwardIps.size();
-            }
-            QString dns1 = m_vpnConfiguration.value(config_key::dns1).toString();
-            QString dns2 = m_vpnConfiguration.value(config_key::dns2).toString();
+            if (!m_vpnConfiguration.value(config_key::configVersion).toInt()) {
+                if (m_settings->routeMode() != Settings::VpnAllSites) {
+                    IpcClient::Interface()->routeDeleteList(m_vpnProtocol->vpnGateway(), QStringList() << "0.0.0.0");
+                    // qDebug() << "VpnConnection::onConnectionStateChanged :: adding custom routes, count:" << forwardIps.size();
+                }
+                QString dns1 = m_vpnConfiguration.value(config_key::dns1).toString();
+                QString dns2 = m_vpnConfiguration.value(config_key::dns2).toString();

-            IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), QStringList() << dns1 << dns2);
+                IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), QStringList() << dns1 << dns2);

-            if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
-                QTimer::singleShot(1000, m_vpnProtocol.data(),
-                                   [this]() { addSitesRoutes(m_vpnProtocol->vpnGateway(), m_settings->routeMode()); });
-            } else if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
-                IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), QStringList() << "0.0.0.0/1");
-                IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), QStringList() << "128.0.0.0/1");
+                if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
+                    QTimer::singleShot(1000, m_vpnProtocol.data(),
+                                       [this]() { addSitesRoutes(m_vpnProtocol->vpnGateway(), m_settings->routeMode()); });
+                } else if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
+                    IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), QStringList() << "0.0.0.0/1");
+                    IpcClient::Interface()->routeAddList(m_vpnProtocol->vpnGateway(), QStringList() << "128.0.0.0/1");

-                IpcClient::Interface()->routeAddList(m_vpnProtocol->routeGateway(), QStringList() << remoteAddress());
-                addSitesRoutes(m_vpnProtocol->routeGateway(), m_settings->routeMode());
+                    IpcClient::Interface()->routeAddList(m_vpnProtocol->routeGateway(), QStringList() << remoteAddress());
+                    addSitesRoutes(m_vpnProtocol->routeGateway(), m_settings->routeMode());
+                }
            }

        } else if (state == Vpn::ConnectionState::Error) {
@ -296,6 +298,7 @@ QJsonObject VpnConnection::createVpnConfiguration(int serverIndex, const ServerC
    vpnConfiguration[config_key::hostName] = server.value(config_key::hostName).toString();
    vpnConfiguration[config_key::description] = server.value(config_key::description).toString();

+    vpnConfiguration[config_key::configVersion] = server.value(config_key::configVersion).toInt();
    // TODO: try to get hostName, port, description for 3rd party configs
    // vpnConfiguration[config_key::port] = ...;

--- a/deploy/build_android.sh
+++ b/deploy/build_android.sh
@ -7,15 +7,18 @@ usage() {
  cat <<EOT

 Usage:
-  build_android [options]
+  build_android [options] <artifact_types>

-Build AmneziaVPN android client. By default, a signed Android App Bundle (AAB) is built.
+Build AmneziaVPN android client.

-Options:
- -d, --debug                      Build debug version
+Artifact types:
+ -u, --aab                        Build Android App Bundle (AAB)
 -a, --apk (<abi_list> | all)     Build APKs for the specified ABIs or for all available ABIs
                                  Available ABIs: 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
                                  <abi_list> - list of ABIs delimited by ';'
+
+Options:
+ -d, --debug                      Build debug version
 -b, --build-platform <platform>  The SDK platform used for building the Java code of the application
                                  By default, the latest available platform is used
 -m, --move                       Move the build result to the root of the build directory
@ -25,14 +28,14 @@ EOT
 }

 BUILD_TYPE="release"
-AAB=1

-opts=$(getopt -l debug,apk:,build-platform:,move,help -o "da:b:mh" -- "$@")
+opts=$(getopt -l debug,aab,apk:,build-platform:,move,help -o "dua:b:mh" -- "$@")
 eval set -- "$opts"
 while true; do
  case "$1" in
    -d | --debug) BUILD_TYPE="debug"; shift;;
-    -a | --apk) ABIS=$2; unset AAB; shift 2;;
+    -u | --aab) AAB=1; shift;;
+    -a | --apk) ABIS=$2; shift 2;;
    -b | --build-platform) ANDROID_BUILD_PLATFORM=$2; shift 2;;
    -m | --move) MOVE_RESULT=1; shift;;
    -h | --help) usage; exit 0;;
@ -49,6 +52,11 @@ if [[ -v ABIS && \
  exit 1
 fi

+# At least one artifact type must be specified
+if [[ ! (-v AAB || -v ABIS) ]]; then
+  usage; exit 0
+fi
+
 echo "Build script started..."

 PROJECT_DIR=$(pwd)
@ -137,7 +145,8 @@ gradle_opts=()

 if [ -v AAB ]; then
  gradle_opts+=(bundle"${BUILD_TYPE^}")
-else
+fi
+if [ -v ABIS ]; then
  gradle_opts+=(assemble"${BUILD_TYPE^}")
 fi

@ -151,7 +160,9 @@ if [[ -v CI || -v MOVE_RESULT ]]; then
  if [ -v AAB ]; then
    mv -u $OUT_APP_DIR/android-build/build/outputs/bundle/$BUILD_TYPE/AmneziaVPN-$BUILD_TYPE.aab \
       $PROJECT_DIR/deploy/build/
-  else
+  fi
+
+  if [ -v ABIS ]; then
    if [ "$ABIS" = "all" ]; then
      ABIS="x86;x86_64;armeabi-v7a;arm64-v8a"
    fi
--- a/deploy/build_linux.sh
+++ b/deploy/build_linux.sh
@ -83,6 +83,4 @@ ldd $CQTDEPLOYER_DIR/bin/binarycreator

 cp -r $PROJECT_DIR/deploy/installer $BUILD_DIR

-$CQTDEPLOYER_DIR/binarycreator.sh --offline-only -v -c $BUILD_DIR/installer/config/linux.xml -p $BUILD_DIR/installer/packages -f $PROJECT_DIR/deploy/AmneziaVPN_Linux_Installer
-
-
+$CQTDEPLOYER_DIR/binarycreator.sh --offline-only -v -c $BUILD_DIR/installer/config/linux.xml -p $BUILD_DIR/installer/packages -f $PROJECT_DIR/deploy/AmneziaVPN_Linux_Installer.bin
				`@ -0,0 +1 @@`
				`Subproject commit f23eee4700ed4a2ef44a800d2c20466c9ab0222b`
				`@ -1 +0,0 @@`
				`Subproject commit 233eda6760962efddc860f177a0ce2bcdf533d85`