diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 83be4c91..f14d1622 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,8 +14,8 @@ jobs: runs-on: ubuntu-20.04 env: - QT_VERSION: 6.5.1 - QIF_VERSION: 4.6 + QT_VERSION: 6.6.2 + QIF_VERSION: 4.7 steps: - name: 'Install Qt' @@ -72,8 +72,8 @@ jobs: runs-on: windows-latest env: - QT_VERSION: 6.5.1 - QIF_VERSION: 4.6 + QT_VERSION: 6.6.2 + QIF_VERSION: 4.7 BUILD_ARCH: 64 steps: @@ -134,7 +134,7 @@ jobs: runs-on: macos-13 env: - QT_VERSION: 6.5.2 + QT_VERSION: 6.6.2 CC: cc CXX: c++ @@ -245,10 +245,15 @@ jobs: modules: 'qtremoteobjects qt5compat qtshadertools' dir: ${{ runner.temp }} setup-python: 'true' - tools: 'tools_ifw' set-env: 'true' extra: '--external 7z --base ${{ env.QT_MIRROR }}' + - name: 'Install Qt Installer Framework ${{ env.QIF_VERSION }}' + run: | + mkdir -pv ${{ runner.temp }}/Qt/Tools/QtInstallerFramework + wget https://qt.amzsvc.com/tools/ifw/${{ env.QIF_VERSION }}.zip + unzip ${{ env.QIF_VERSION }}.zip -d ${{ runner.temp }}/Qt/Tools/QtInstallerFramework/ + - name: 'Get sources' uses: actions/checkout@v4 with: @@ -286,7 +291,7 @@ jobs: env: ANDROID_BUILD_PLATFORM: android-34 - QT_VERSION: 6.6.1 + QT_VERSION: 6.6.2 QT_MODULES: 'qtremoteobjects qt5compat qtimageformats qtshadertools' steps: diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 9fb07d61..439e10c5 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -15,6 +15,15 @@ set(PACKAGES Core5Compat Concurrent LinguistTools ) +execute_process( + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" + COMMAND git rev-parse --short HEAD + OUTPUT_VARIABLE GIT_COMMIT_HASH + OUTPUT_STRIP_TRAILING_WHITESPACE +) + +add_definitions(-DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}") + if(IOS) set(PACKAGES ${PACKAGES} Multimedia) endif() diff --git a/client/images/controls/split-tunneling.svg b/client/images/controls/split-tunneling.svg new file mode 100644 index 00000000..3062054d --- /dev/null +++ b/client/images/controls/split-tunneling.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/client/mozilla/localsocketcontroller.cpp b/client/mozilla/localsocketcontroller.cpp index 8583de4e..54f87a12 100644 --- a/client/mozilla/localsocketcontroller.cpp +++ b/client/mozilla/localsocketcontroller.cpp @@ -125,7 +125,7 @@ void LocalSocketController::activate(const QJsonObject &rawConfig) { json.insert("privateKey", wgConfig.value(amnezia::config_key::client_priv_key)); json.insert("deviceIpv4Address", wgConfig.value(amnezia::config_key::client_ip)); // todo review wg ipv6 -#ifndef Q_OS_WINDOWS +#ifdef Q_OS_MACOS json.insert("deviceIpv6Address", "dead::1"); #endif json.insert("serverPublicKey", wgConfig.value(amnezia::config_key::server_pub_key)); diff --git a/client/resources.qrc b/client/resources.qrc index 59a540cc..b9a69023 100644 --- a/client/resources.qrc +++ b/client/resources.qrc @@ -224,6 +224,8 @@ ui/qml/Pages2/PageShareFullAccess.qml images/controls/close.svg images/controls/search.svg + ui/qml/Components/HomeSplitTunnelingDrawer.qml + images/controls/split-tunneling.svg ui/qml/Controls2/DrawerType2.qml diff --git a/client/server_scripts/remove_all_containers.sh b/client/server_scripts/remove_all_containers.sh index 32bdc55d..ce706f80 100644 --- a/client/server_scripts/remove_all_containers.sh +++ b/client/server_scripts/remove_all_containers.sh @@ -1,4 +1,5 @@ -sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker stop -sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker rm -fv -sudo docker images -a | grep amnezia | awk '{print $3}' | xargs sudo docker rmi -sudo docker network ls | grep amnezia-dns-net | awk '{print $1}' | xargs sudo docker network rm +sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker stop;\ +sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker rm -fv;\ +sudo docker images -a | grep amnezia | awk '{print $3}' | xargs sudo docker rmi;\ +sudo docker network ls | grep amnezia-dns-net | awk '{print $1}' | xargs sudo docker network rm;\ +sudo rm -frd /opt/amnezia diff --git a/client/server_scripts/remove_container.sh b/client/server_scripts/remove_container.sh index 3f127aa0..3e894e8f 100644 --- a/client/server_scripts/remove_container.sh +++ b/client/server_scripts/remove_container.sh @@ -1,3 +1,3 @@ -sudo docker stop $CONTAINER_NAME -sudo docker rm -fv $CONTAINER_NAME +sudo docker stop $CONTAINER_NAME;\ +sudo docker rm -fv $CONTAINER_NAME;\ sudo docker rmi $CONTAINER_NAME diff --git a/client/translations/amneziavpn_ar.ts b/client/translations/amneziavpn_ar.ts index 14b6ed03..dde6bad6 100644 --- a/client/translations/amneziavpn_ar.ts +++ b/client/translations/amneziavpn_ar.ts @@ -51,17 +51,17 @@ ConnectionTypeSelectionDrawer - + Add new connection إضافة اتصال جديد - + Configure your server قم بتهيئة الخادم الخاص بك - + Open config file, key or QR code افتح ملف تعريف, مفتاح تعريف او رمز QR @@ -92,7 +92,7 @@ ExportController - + Access error! خطأ في الوصول! @@ -100,16 +100,60 @@ HomeContainersListView - + Unable change protocol while there is an active connection قم بتغيير البروتوكول عند تواجد اتصال - + The selected protocol is not supported on the current platform البروتوكول المحدد غير مدعوم علي المنصة الحالية + + HomeSplitTunnelingDrawer + + + Split tunneling + تقسيم الانفاق + + + + Allows you to connect to some sites or applications through a VPN connection and bypass others + + + + + Split tunneling on the server + + + + + Enabled +Can't be disabled for current server + + + + + Site-based split tunneling + انقسام الانفاق القائم علي الموقع + + + + Enabled + مٌفعل + + + + Disabled + مٌعطل + + + + App-based split tunneling + انقسام الانفاق القائم علي التطبيق + + ImportController @@ -270,17 +314,27 @@ Already installed containers were found on the server. All installed containers PageHome - + + Split tunneling enabled + + + + + Split tunneling disabled + + + + VPN protocol بروتوكول VPN - + Servers الخوادم - + Unable change server while there is an active connection لا يمكن تغير الخادم بينما هناك اتصال مفعل @@ -288,87 +342,42 @@ Already installed containers were found on the server. All installed containers PageProtocolAwgSettings - + AmneziaWG settings اعدادات AmneziaWG - + Port منفذ - - Junk packet count - عدد الحزم الغير مرغوب فيها - - - - Junk packet minimum size - الحد الادني لحجم الحزمة الغير مرغوب فيها - - - - Junk packet maximum size - الحجم الاقصي للحزمة الغير مرغوب فيها - - - - Init packet junk size - Init packet junk size - - - - Response packet junk size - حجم حزمة الاستجابة الغير مرغوب فيها - - - - Init packet magic header - إطلاق حزمة magic header - - - - Response packet magic header - حزمة الرد magic header - - - - Transport packet magic header - نقل حزمة magic header - - - - Underload packet magic header - تحميل حزمة magic header - - - + Remove AmneziaWG قم بحذف AmneziaWG - + Remove AmneziaWG from server? قم بحذف AmneziaWG من الخادم؟ - + All users with whom you shared a connection will no longer be able to connect to it. جميع المستخدمين الذين قمت بمشاركة اتصال معهم لن يستطيعو الاتصال. - + Continue واصل - + Cancel إلغاء - + Save and Restart Amnezia احفظ و اعِد تشغيل Amnezia @@ -376,28 +385,28 @@ Already installed containers were found on the server. All installed containers PageProtocolCloakSettings - + Cloak settings Cloak إعدادات - + Disguised as traffic from متنكراً في حركة مرور من - + Port منفذ - - + + Cipher الشفرة - + Save and Restart Amnezia احفظ و اعِد تشغيل Amnezia @@ -405,180 +414,180 @@ Already installed containers were found on the server. All installed containers PageProtocolOpenVpnSettings - + OpenVPN settings OpenVPN اعدادات - + VPN address subnet الشبكة الفرعية لعنوان VPN - + Network protocol بروتوكول الشبكة - + Port منفذ - + Auto-negotiate encryption التفاوض التلقائي علي الشبكة - - + + Hash - + SHA512 - + SHA384 - + SHA256 - + SHA3-512 - + SHA3-384 - + SHA3-256 - + whirlpool - + BLAKE2b512 - + BLAKE2s256 - + SHA1 - - + + Cipher شفرة - + AES-256-GCM - + AES-192-GCM - + AES-128-GCM - + AES-256-CBC - + AES-192-CBC - + AES-128-CBC - + ChaCha20-Poly1305 - + ARIA-256-CBC - + CAMELLIA-256-CBC - + none لا شئ - + TLS auth TLS مصادقة - + Block DNS requests outside of VPN احظر طلبات DNS خارج ال VPN - + Additional client configuration commands اوامر تكوين العميل الاضافية - - + + Commands: الاوامر: - + Additional server configuration commands اوامر تكوين الخادم الاضافية - + Remove OpenVPN احذف OpenVPN - + Remove OpenVpn from server? احذف OpenVPN من الخادم? - + All users with whom you shared a connection will no longer be able to connect to it. جميع المستخدمين الذين شاركت معهم الاتصال لن يستطيعو الاتصال مجدداً. @@ -587,17 +596,17 @@ Already installed containers were found on the server. All installed containers جميع المستخدمين الذين شاركت اتصال معهم لن يستطيعو الاتصال بعد الان - + Continue واصل - + Cancel إلغاء - + Save and Restart Amnezia احفظ واعِد تشغيل Amnezia @@ -619,22 +628,22 @@ Already installed containers were found on the server. All installed containers اختيارات الاتصال - + Connection options %1 %1 اختيارات الاتصال - + Remove احذف - + Remove %1 from server? احذف %1 من الخادم ? - + All users with whom you shared a connection will no longer be able to connect to it. جميع المستخدمين الذين شاركت معهم اتصال لن يستطيعو الاتصال بعد الان. @@ -647,12 +656,12 @@ Already installed containers were found on the server. All installed containers جميع المستخدمين الذين شاركت اتصال معهم لن يستطيعو الاتصال بعد الان - + Continue واصل - + Cancel إلغاء @@ -660,23 +669,23 @@ Already installed containers were found on the server. All installed containers PageProtocolShadowSocksSettings - + ShadowSocks settings ShadowSocks إعدادات - + Port منفذ - - + + Cipher تشفير - + Save and Restart Amnezia احفظ واعِد تشغيل Amnezia @@ -943,62 +952,67 @@ And if you don't like the app, all the more support it - the donation will اظهر المزيد علي GitHub - + https://github.com/amnezia-vpn/amnezia-client#donate - + Contacts التواصل - + Telegram group مجموعة ال Telegram - + To discuss features لمناقشة الميزات - + https://t.me/amnezia_vpn_en - + Mail البريد - + For reviews and bug reports لل مراجعات والابلاغات عن المشاكل - + Github - + https://github.com/amnezia-vpn/amnezia-client - + Website موقع - + https://amnezia.org - + + Software version: %1 + %1 :إصدار البرنامج + + + Check for updates تحقق من وجود تحديثات @@ -1035,56 +1049,66 @@ And if you don't like the app, all the more support it - the donation will + Auto connect + الاتصال التلقائي + + + + Connect to VPN on app start + اتصل ب ال VPN عند تشغيل التطبيق + + + Start minimized ابدأ ب الحجم الادني - + Launch application minimized تشغيل التطبيق في الحد الادني - + Language اللغة - + Logging تسجيل - + Enabled مٌفعل - + Disabled مٌعطل - + Reset settings and remove all data from the application إعادة ضبط الاعدادات ومسح جميع البيانات من التطبيق - + Reset settings and remove all data from the application? إعادة ضبط الاعدادات ومسح جميع البيانات من التطبيق؟ - + All settings will be reset to default. All installed AmneziaVPN services will still remain on the server. سيتم ضبط الاعدادات الافتراضية. جميع خدمات AmneziaVPN المٌثبتة ستبقي علي الخادم. - + Continue واصل - + Cancel إلغاء @@ -1175,22 +1199,20 @@ And if you don't like the app, all the more support it - the donation will الاتصال - Auto connect - الاتصال التلقائي + الاتصال التلقائي - Connect to VPN on app start - اتصل ب ال VPN عند تشغيل التطبيق + اتصل ب ال VPN عند تشغيل التطبيق - + When AmneziaDNS is not used or installed عندما يكون AmneziaDNS غير مٌثبت او غير مستخدم - + Allows you to use the VPN only for certain Apps يسمح لك بأستخدام ال VPN علي تطبيقات معينة @@ -1199,32 +1221,32 @@ And if you don't like the app, all the more support it - the donation will استخدم AmneziaDNS إذا كان مٌثبت علي الخادم - + Use AmneziaDNS استخدم AmneziaDNS - + If AmneziaDNS is installed on the server في حالة كان AmneziaDNS مٌثبت علي الخادم - + DNS servers خوادم DNS - + Site-based split tunneling انقسام الانفاق القائم علي الموقع - + Allows you to select which sites you want to access through the VPN يسمح لك بتحديد اي موقع تريد الوصول له عن طريق ال VPN - + App-based split tunneling انقسام الانفاق القائم علي التطبيق @@ -1244,62 +1266,62 @@ And if you don't like the app, all the more support it - the donation will PageSettingsDns - + Default server does not support custom dns الخادم الافتراضي لا يدعم DNS مخصص - + DNS servers خوادم ال DNS - + If AmneziaDNS is not used or installed AmneziaVPN ليس مٌستخدم او مٌثبت - + Primary DNS الرئيسي DNS - + Secondary DNS الثانوي DNS - + Restore default استعادة الافتراضي - + Restore default DNS settings? قم بأعادة ضبط إعدادات ال DNS الافتراضية؟ - + Continue واصل - + Cancel إلغاء - + Settings have been reset لم يتم إعادة ضبط الإعدادات - + Save احفظ - + Settings saved تم حفظ الإعدادات @@ -1357,12 +1379,12 @@ And if you don't like the app, all the more support it - the donation will إلغاء - + Logs have been cleaned up تم مسح السجلات - + Clear logs احذف السجلات @@ -1395,13 +1417,12 @@ And if you don't like the app, all the more support it - the donation will حذف الملفات الشخصية المخزنة مؤقتاً؟ - + Do you want to reboot the server? هل تريد إعادة تشغيل الخادم؟ - - + Do you want to clear server from Amnezia software? هل تريد حذف الخادم من Amnezia? @@ -1412,78 +1433,74 @@ And if you don't like the app, all the more support it - the donation will - - - - - + + + + Continue واصل - - - - - + + + + Cancel إلغاء - + Check the server for previously installed Amnezia services افحص الخادم عن اي خدمات Amnezia مٌثبتة سابقاُ - + Add them to the application if they were not displayed اضفهم إلي التطبيق إذا لم يكونو ظاهرين - + Reboot server إعادة تشغيل الخادم - + The reboot process may take approximately 30 seconds. Are you sure you wish to proceed? عملية إعادة التشغيل قد تستغرق 30 ثانية, هل تريد الاستكمال؟ - + Remove server from application احذف خادم من التطبيق - + Do you want to remove the server from application? هل تريد حذف الخادم من التطبيق؟ - + Reset API config إعادة تكوين API - + Do you want to reset API config? هل تريد إعادة تكوين API? - + All installed AmneziaVPN services will still remain on the server. جميع خدمات AmneziaVPN المٌثبتة ستظل علي الخادم. - - + Clear server from Amnezia software احذف خادم من Amnezia - - + All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted. سيتم حذف جميع الحاويات, هذا يعني ان جميع ملفات التكوين, شهادات و مفاتيح التعريف سيتم حذفهم. @@ -1491,27 +1508,27 @@ And if you don't like the app, all the more support it - the donation will PageSettingsServerInfo - + Server name اسم الخادم - + Save احفظ - + Protocols البروتوكولات - + Services الخدمات - + Data البيانات @@ -1580,95 +1597,100 @@ And if you don't like the app, all the more support it - the donation will قسم نفق الموقع - + Default server does not support split tunneling function السرفر الافتراضي لا يدعم ميزة تقسيم الانفاق - + Addresses from the list should not be accessed via VPN لا يجب الولوج للعنواين المذكورة هنا من خلال ال VPN - + Split tunneling تقسيم الانفاق - + Mode وضع - + Remove احذف - + Continue واصل - + Cancel إلغاء - + Only the sites listed here will be accessed through the VPN سيتم الولوج للمواقع المذكورة هنا فقط عن طريق ال VPN - + + Cannot change split tunneling settings during active connection + + + + website or IP موقع او IP - + Import / Export Sites - + Import استرد - + Save site list احفظ قائمة المواقع - + Save sites احفظ المواقع - - - + + + Sites files (*.json) - + Import a list of sites استرد قائمة من المواقع - + Replace site list تبديل قائمة المواقع - - + + Open sites file افتح ملف المواقع - + Add imported sites to existing ones إضافة المواقع المستردة للمواقع الموجودة @@ -1723,57 +1745,57 @@ It's okay as long as it's from someone you trust. PageSetupWizardCredentials - + Configure your server تكوين الخادم الخاص بك - + Server IP address [:port] عنوان خادم IP [:منفذ] - + Login to connect via SSH قم بتسجيل الدخول للأتصال عن طريق SSH - + Continue واصل - + All data you enter will remain strictly confidential and will not be shared or disclosed to the Amnezia or any third parties ستظل جميع البيانات التي تدخلها سرية للغاية ولن تتم مشاركتها أو الكشف عنها ل Amnezia أو أي طرف ثالث - + 255.255.255.255:22 - + Password or SSH private key كلمة مرور او مفتاح SSH خاص - + Ip address cannot be empty لا يمكن لعنوان IP ان يكون فارغ - + Enter the address in the format 255.255.255.255:88 ادخل العنوان في شكل 255.255.255.255:88 - + Login cannot be empty تسجيل دخول لا يمكن ان يكون فارغ - + Password/private key cannot be empty كلمة مرور/مفتاح خاص لأ يمكن ان يكونو فارغين @@ -1801,7 +1823,7 @@ It's okay as long as it's from someone you trust. واصل - + Set up later إعداد في وقت لاحق @@ -1848,32 +1870,32 @@ It's okay as long as it's from someone you trust. PageSetupWizardProtocolSettings - + Installing %1 جاري تثبيت %1 - + More detailed اكثر تفصيلاً - + Close اغلق - + Network protocol بروتوكول شبكة - + Port منفذ - + Install تثبيت @@ -1927,7 +1949,7 @@ It's okay as long as it's from someone you trust. ليس لدي اي شئ - + https://amnezia.org/instructions/0_starter-guide @@ -1935,28 +1957,28 @@ It's okay as long as it's from someone you trust. PageSetupWizardTextKey - + Connection key مفتاح اتصال - + A line that starts with vpn://... يجب ان تٌكتب بهذه الطريقة حتي بوجود الخطأ كي تظهر بشكل صحيح داخل التطبيق سطر يبدأ ب ...//:vpn - + Key مفتاح - + Insert ادخل - + Continue واصل @@ -1992,128 +2014,138 @@ It's okay as long as it's from someone you trust. PageShare - + Save OpenVPN config احفظ تكوين OpenVPN - + Save WireGuard config احفظ تكوين WireGuard - + + Save AmneziaWG config + + + + Save ShadowSocks config احفظ تكوين ShadowSocks - + Save Cloak config احفظ تكوين Cloak - + For the AmneziaVPN app AmneziaVPN من اجل تطبيق - + OpenVpn native format تنسيق OpenVpn الاصلي - + WireGuard native format تنسيق WireGuard الاصلي - + + AmneziaWG native format + + + + ShadowSocks native format تنسيق ShadowSocks الاصلي - + Cloak native format تنسيق Cloak الاصلي - + Share VPN Access شارك اتصال VPN - + Share full access to the server and VPN شارك ولوج كامل للخادم و ال VPN - + Use for your own devices, or share with those you trust to manage the server. استخدمه للأجهزة الخاصة بك، أو شاركه مع من تثق بهم لإدارة الخادم. - - + + Users المستخدمين - + Share VPN access without the ability to manage the server شارك اتصال VPN بدون القدرة علي إدارة الخادم - + Search ابحث - + Creation date: تاريخ الإنشاء: - + Rename إعادة التسمية - + Client name اسم العميل - + Save احفظ - + Revoke سحب وإبطال - + Revoke the config for a user - %1? سحب وإبطال للمستخدم - %1? - + The user will no longer be able to connect to your server. المستخدم لن يكون قادر علي الاتصال بعد الان. - + Continue واصل - + Cancel إلغاء - + Connection الاتصال @@ -2126,13 +2158,13 @@ It's okay as long as it's from someone you trust. الخوادم - - + + Server خادم - + File with connection settings to ملف بإعدادات إلي @@ -2141,35 +2173,35 @@ It's okay as long as it's from someone you trust. البروتوكولات - - + + Protocol بروتوكول - + Connection to اتصال إلي - + Config revoked تم سحب وإبطال التكوين - + User name اسم المستخدم - - + + Connection format تنسيق الاتصال - - + + Share شارك @@ -2194,33 +2226,33 @@ It's okay as long as it's from someone you trust. إذا شاركت ولوج كامل مع الاشخاص, سيكونو قادرين علي حذف وإضافة بروتوكولات و خدمات إلي الخادم, والذي سيجعل VPN يعمل بشكل غير صحيح لجميع المستخدمين. - + Server خادم - + Accessing التواصل - + File with accessing settings to ملف مع إعدادات الوصول إلي - + Share مشاركة - + Connection to اتصال إلي - + File with connection settings to معلف مع إعدادات الاتصال إلي @@ -2978,7 +3010,7 @@ While it offers a blend of security, stability, and speed, it's essential t SelectLanguageDrawer - + Choose language اختر لغة @@ -2999,11 +3031,6 @@ While it offers a blend of security, stability, and speed, it's essential t SettingsController - - - Software version - إصدار البرنامج - Backup file is corrupted @@ -3024,33 +3051,33 @@ While it offers a blend of security, stability, and speed, it's essential t ShareConnectionDrawer - + Save AmneziaVPN config احفظ تكوين AmneziaVPN - + Share شارك - + Copy انسخ - - + + Copied تم النسخ - + Copy config string انسخ نص التكوين - + Show connection settings اظهر إعدادات الاتصال @@ -3059,7 +3086,7 @@ While it offers a blend of security, stability, and speed, it's essential t 展示内容 - + To read the QR code in the Amnezia app, select "Add server" → "I have data to connect" → "QR code, key or settings file" حتي تقرأ رمز ال QR في تطبيق Amnezia, اختار "إضافة خادم" - "لدي بيانات الاتصال" - "رمز Qr, او مفتاح تعريف او ملف إعدادات" @@ -3143,7 +3170,7 @@ While it offers a blend of security, stability, and speed, it's essential t TextFieldWithHeaderType - + The field can't be empty الحقل لا يمكن ان يكون فارغ @@ -3235,12 +3262,12 @@ While it offers a blend of security, stability, and speed, it's essential t main2 - + Private key passphrase عبارة المرور الخاصة بالمفتاح - + Save احفظ diff --git a/client/translations/amneziavpn_fa_IR.ts b/client/translations/amneziavpn_fa_IR.ts index 7a2172a8..b5caf979 100644 --- a/client/translations/amneziavpn_fa_IR.ts +++ b/client/translations/amneziavpn_fa_IR.ts @@ -27,56 +27,55 @@ ApiController - Error when retrieving configuration from cloud server - خطا در حین دریافت پیکربندی از سمت سرور + خطا در حین دریافت پیکربندی از سمت سرور ConnectionController - + VPN Protocols is not installed. Please install VPN container at first پروتکل وی‎پی‎ان نصب نشده است لطفا کانتینر وی‎پی‎ان را نصب کنید - + Connection... در حال ارتباط... - + Connected متصل - + Settings updated successfully, Reconnnection... تنظیمات به روز رسانی شد در حال اتصال دوباره... - + Settings updated successfully تنظیمات با موفقیت به‎روز‎رسانی شدند - + Reconnection... اتصال دوباره... - - - - + + + + Connect اتصال - + Disconnection... قطع ارتباط... @@ -84,17 +83,17 @@ ConnectionTypeSelectionDrawer - + Add new connection ایجاد ارتباط جدید - + Configure your server تنظیم سرور - + Open config file, key or QR code بارگذاری فایل تنظیمات، کلید یا QR Code @@ -125,7 +124,7 @@ ExportController - + Access error! خطای دسترسی! @@ -133,24 +132,68 @@ HomeContainersListView - + Unable change protocol while there is an active connection امکان تغییر پروتکل در هنگام متصل بودن وجود ندارد - + The selected protocol is not supported on the current platform پروتکل انتخاب شده بر روی این پلتفرم پشتیبانی نمی‎‎شود Reconnect via VPN Procotol: - پروتکل VPN را متصل مجدد کنید" + پروتکل VPN را متصل مجدد کنید" + + + + HomeSplitTunnelingDrawer + + + Split tunneling + جداسازی ترافیک + + + + Allows you to connect to some sites or applications through a VPN connection and bypass others + اجازه می‌دهد به شما که از طریق اتصال VPN به برخی از وب‌سایت‌ها یا برنامه‌ها وصل شوید و از دیگران عبور کنید. + + + + Split tunneling on the server + + + + + Enabled +Can't be disabled for current server + + + + + Site-based split tunneling + جداسازی ترافیک بر اساس سایت + + + + Enabled + فعال + + + + Disabled + غیر فعال + + + + App-based split tunneling + جداسازی ترافیک بر اساس نرم‎افزار ImportController - + Scanned %1 of %2. ارزیابی %1 از %2. @@ -282,17 +325,27 @@ Already installed containers were found on the server. All installed containers PageHome - + + Split tunneling enabled + فعال شدن تونل تقسیم‌شده + + + + Split tunneling disabled + تونل تقسیم‌شده غیرفعال شده + + + VPN protocol پروتکل وی‎پی‎ان - + Servers سرورها - + Unable change server while there is an active connection امکان تغییر سرور در هنگام متصل بودن وجود ندارد @@ -300,72 +353,27 @@ Already installed containers were found on the server. All installed containers PageProtocolAwgSettings - + AmneziaWG settings تنظیمات AmneziaWG - + Port پورت - - Junk packet count - تعداد بسته‎های ناخواسته - - - - Junk packet minimum size - Junk packet minimum size - - - - Junk packet maximum size - Junk packet maximum size - - - - Init packet junk size - Init packet junk size - - - - Response packet junk size - Response packet junk size - - - - Init packet magic header - Init packet magic header - - - - Response packet magic header - Response packet magic header - - - - Transport packet magic header - Transport packet magic header - - - - Underload packet magic header - Underload packet magic header - - - + Remove AmneziaWG حذف AmneziaWG - + Remove AmneziaWG from server? آیا میخواهید AmneziaWG از سرور حذف شود؟ - + All users with whom you shared a connection will no longer be able to connect to it. تمام کاربرانی که این اتصال را با آن‎ها با اشتراک گذاشته‎اید دیگر نمی‎توانند به آن متصل شوند. @@ -374,17 +382,17 @@ Already installed containers were found on the server. All installed containers همه کاربرانی که با آن‌ها این پروتکل VPN را به اشتراک گذاشته‌اید دیگر نمی‌توانند به آن متصل شوند. - + Continue ادامه - + Cancel کنسل - + Save and Restart Amnezia ذخیره و راه اندازی مجدد Amnezia @@ -392,28 +400,28 @@ Already installed containers were found on the server. All installed containers PageProtocolCloakSettings - + Cloak settings تنظیمات Cloak - + Disguised as traffic from پنهان کردن به عنوان ترافیک از - + Port پورت - - + + Cipher رمزگذاری - + Save and Restart Amnezia ذخیره و راه اندازی دوباره Amnezia @@ -421,7 +429,7 @@ Already installed containers were found on the server. All installed containers PageProtocolOpenVpnSettings - + OpenVPN settings تنظیمات OpenVPN @@ -430,175 +438,175 @@ Already installed containers were found on the server. All installed containers آدرس زیرشبکه وی‎پی‎ان - + VPN address subnet - + Network protocol پروتکل شبکه - + Port پورت - + Auto-negotiate encryption رمزگذاری خودکار - - + + Hash هش - + SHA512 SHA512 - + SHA384 SHA384 - + SHA256 SHA256 - + SHA3-512 SHA3-512 - + SHA3-384 SHA3-384 - + SHA3-256 SHA3-256 - + whirlpool whirlpool - + BLAKE2b512 BLAKE2b512 - + BLAKE2s256 BLAKE2s256 - + SHA1 SHA1 - - + + Cipher رمزگذاری - + AES-256-GCM AES-256-GCM - + AES-192-GCM AES-192-GCM - + AES-128-GCM AES-128-GCM - + AES-256-CBC AES-256-CBC - + AES-192-CBC AES-192-CBC - + AES-128-CBC AES-128-CBC - + ChaCha20-Poly1305 ChaCha20-Poly1305 - + ARIA-256-CBC ARIA-256-CBC - + CAMELLIA-256-CBC CAMELLIA-256-CBC - + none none - + TLS auth اعتبار TLS - + Block DNS requests outside of VPN مسدود کردن درخواست‎های DNS خارج از وی‎پی‎ان - + Additional client configuration commands تنظیمات و دستورات اضافه برنامه متصل شونده - - + + Commands: دستورات: - + Additional server configuration commands تنظیمات و دستورات اضافه سرور - + Remove OpenVPN حذف OpenVPN - + Remove OpenVpn from server? آیا میخواهید OpenVPN از سرور حذف شود؟ - + All users with whom you shared a connection will no longer be able to connect to it. تمام کاربرانی که این اتصال را با آن‎ها با اشتراک گذاشته‎اید دیگر نمی‎توانند به آن متصل شوند. @@ -607,17 +615,17 @@ Already installed containers were found on the server. All installed containers همه کاربرانی که با آن این پروتکل VPN را به اشتراک گذاشته‌اید دیگر نمی‌توانند به آن متصل شوند. - + Continue ادامه - + Cancel کنسل - + Save and Restart Amnezia ذخیره و راه اندازی دوباره Amnezia @@ -635,22 +643,22 @@ Already installed containers were found on the server. All installed containers نمایش تنظیمات اتصال - + Connection options %1 تنظیمات اتصال %1 - + Remove حذف - + Remove %1 from server? %1 از سرور حذف شود؟ - + All users with whom you shared a connection will no longer be able to connect to it. تمام کاربرانی که این اتصال را با آن‎ها با اشتراک گذاشته‎اید دیگر نمی‎توانند به آن متصل شوند. @@ -659,12 +667,12 @@ Already installed containers were found on the server. All installed containers همه کاربرانی که با آن این پروتکل VPN را به اشتراک گذاشته‌اید دیگر نمی‌توانند به آن متصل شوند. - + Continue ادامه - + Cancel کنسل @@ -672,23 +680,23 @@ Already installed containers were found on the server. All installed containers PageProtocolShadowSocksSettings - + ShadowSocks settings تنظیمات ShadowSocks - + Port پورت - - + + Cipher رمزگذاری - + Save and Restart Amnezia ذخیره و راه اندازی دوباره Amnezia @@ -847,8 +855,12 @@ Already installed containers were found on the server. All installed containers + Use <a href="https://www.torproject.org/download/" style="color: #FBB26A;">Tor Browser</a> to open this URL. + + + Use <a href="https://www.torproject.org/download/" style="color: #FBB26A;">Tor Browser</a> to open this URL. - استفاده <a href="https://www.torproject.org/download/" style="color: #FBB26A;">Tor Browser</a> برای باز کردن این نشانی. + استفاده <a href="https://www.torproject.org/download/" style="color: #FBB26A;">Tor Browser</a> برای باز کردن این نشانی. @@ -968,62 +980,67 @@ Already installed containers were found on the server. All installed containers نمایش متد‎های دیگر در گیت هاب - + https://github.com/amnezia-vpn/amnezia-client#donate - + Contacts مخاطب - + Telegram group گروه تلگرام - + To discuss features برای گفتگو در مورد ویژگی‎ها - + https://t.me/amnezia_vpn_en https://t.me/amnezia_vpn - + Mail ایمیل - + For reviews and bug reports برای ارائه نظرات و گزارشات باگ - + Github Github - + https://github.com/amnezia-vpn/amnezia-client https://github.com/amnezia-vpn/amnezia-client - + Website وب سایت - + https://amnezia.org https://amnezia.org - + + Software version: %1 + %1 :نسخه نرم‎افزار + + + Check for updates بررسی بروز‎رسانی @@ -1052,56 +1069,66 @@ Already installed containers were found on the server. All installed containers + Auto connect + اتصال خودکار + + + + Connect to VPN on app start + اتصال به وی‎‎پی‎ان با شروع نرم‎افزار + + + Start minimized شروع به صورت کوچک - + Launch application minimized راه‎اندازی برنامه به صورت کوچک - + Language زبان - + Logging گزارشات - + Enabled فعال - + Disabled غیر فعال - + Reset settings and remove all data from the application ریست کردن تنظیمات و حذف تمام داده‎ها از نرم‎افزار - + Reset settings and remove all data from the application? ریست کردن تنظیمات و حذف تمام داده‎ها از نرم‎افزار؟ - + All settings will be reset to default. All installed AmneziaVPN services will still remain on the server. تمام تنظیمات به حالت پیش‎فرض ریست می‎شوند. تمام سرویس‎های Amnezia بر روی سرور باقی می‎مانند. - + Continue ادامه - + Cancel کنسل @@ -1188,37 +1215,35 @@ Already installed containers were found on the server. All installed containers ارتباط - Auto connect - اتصال خودکار + اتصال خودکار - Connect to VPN on app start - اتصال به وی‎‎پی‎ان با شروع نرم‎افزار + اتصال به وی‎‎پی‎ان با شروع نرم‎افزار - + Use AmneziaDNS استفاده از AmneziaDNS - + If AmneziaDNS is installed on the server اگر AmneziaDNS بر روی سرور نصب شده باشد - + DNS servers سرورهای DNS - + When AmneziaDNS is not used or installed وقتی AmneziaDNS استفاده نشده یا نصب نشده است. - + Allows you to use the VPN only for certain Apps @@ -1227,17 +1252,17 @@ Already installed containers were found on the server. All installed containers اگر AmneziaDNS نصب نشده یا استفاده نشود - + Site-based split tunneling جداسازی ترافیک بر اساس سایت - + Allows you to select which sites you want to access through the VPN میتوانید مشخص کنید که چه سایت‎هایی از وی‎پی‎ان استفاده کنند - + App-based split tunneling جداسازی ترافیک بر اساس نرم‎افزار @@ -1249,62 +1274,62 @@ Already installed containers were found on the server. All installed containers PageSettingsDns - + Default server does not support custom dns سرور پیش‌فرض از دی‌ان‌اس سفارشی پشتیبانی نمی‌کند. - + DNS servers سرورهای DNS - + If AmneziaDNS is not used or installed اگر AmneziaDNS نصب نباشد یا استفاده نشود - + Primary DNS DNS اصلی - + Secondary DNS DNS ثانویه - + Restore default بازگشت به پیش‎فرض - + Restore default DNS settings? بازگشت به تنظیمات پیش‎فرض DNS؟ - + Continue ادامه - + Cancel کنسل - + Settings have been reset تنظیمات ریست شد - + Save ذخیره - + Settings saved ذخیره تنظیمات @@ -1362,12 +1387,12 @@ Already installed containers were found on the server. All installed containers کنسل - + Logs have been cleaned up گزارشات پاک شدند - + Clear logs پاک کردن گزارشات @@ -1406,57 +1431,69 @@ Already installed containers were found on the server. All installed containers - - - + + + + Continue ادامه - - - + + + + Cancel کنسل - + Check the server for previously installed Amnezia services چک کردن سرویس‎های نصب شده Amnezia بر روی سرور - + Add them to the application if they were not displayed اضافه کردن آنها به نرم‎افزار اگر نمایش داده نشده‎اند - + Reboot server سرور را دوباره راه‌اندازی کنید. - + Do you want to reboot the server? آیا می‌خواهید سرور را دوباره راه‌اندازی کنید؟ - + The reboot process may take approximately 30 seconds. Are you sure you wish to proceed? فرآیند راه‌اندازی ممکن است حدود ۳۰ ثانیه طول بکشد. آیا مطمئن هستید که می‌خواهید ادامه دهید؟ - + Do you want to remove the server from application? آیا می‌خواهید سرور را از برنامه حذف کنید؟ - + Do you want to clear server from Amnezia software? آیا می‌خواهید سرور را از نرم‌افزار Amnezia پاک کنید؟ - + + Reset API config + + + + + Do you want to reset API config? + + + + Remove server from application حذف کردن سرور از نرم‎افزار @@ -1465,12 +1502,12 @@ Already installed containers were found on the server. All installed containers حذف سرور؟ - + All installed AmneziaVPN services will still remain on the server. تمام سرویس‎های نصب‎شده Amnezia همچنان بر روی سرور باقی خواهند ماند. - + Clear server from Amnezia software پاک کردن سرور از نرم‎افزار Amnezia @@ -1479,7 +1516,7 @@ Already installed containers were found on the server. All installed containers سرور از نرم‎افزار Amnezia پاک شود؟ - + All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted. تمام کانتینرها از سرور پاک شوند، به این معنی که تمام فایل‎های پیکربندی، کلیدها و مجوزها حذف خواهند شد. @@ -1487,27 +1524,27 @@ Already installed containers were found on the server. All installed containers PageSettingsServerInfo - + Server name نام سرور - + Save ذخیره - + Protocols پروتکل‎ها - + Services سرویس‎ها - + Data داده @@ -1560,7 +1597,7 @@ Already installed containers were found on the server. All installed containers PageSettingsSplitTunneling - + Default server does not support split tunneling function سرور پیش‌فرض از عملکرد تونل‌سازی تقسیم شده پشتیبانی نمی‌کند. @@ -1569,32 +1606,32 @@ Already installed containers were found on the server. All installed containers دسترسی به آدرس‎های لیست از طریق وی‎پی‎ان - + Addresses from the list should not be accessed via VPN دسترسی به آدرس‎های لیست بدون وی‎پی‎ان - + Split tunneling جداسازی ترافیک - + Mode حالت - + Remove حذف - + Continue ادامه - + Cancel کنسل @@ -1607,60 +1644,65 @@ Already installed containers were found on the server. All installed containers بارگذاری / خروجی‎گرفتن از سایت‎ها - + + Cannot change split tunneling settings during active connection + + + + Only the sites listed here will be accessed through the VPN تنها سایت‌های موجود در اینجا از طریق VPN دسترسی داده خواهند شد. - + website or IP وب‌سایت یا آدرس IP - + Import / Export Sites وارد کردن / صادر کردن وب‌سایت‌ها - + Import بارگذاری - + Save site list ذخیره لیست سایت‎ها - + Save sites ذخیره سایت‎ها - - - + + + Sites files (*.json) Sites files (*.json) - + Import a list of sites بارگذاری لیست سایت‎ها - + Replace site list جایگزین کردن لیست سایت - - + + Open sites file باز کردن فایل سایت‎ها - + Add imported sites to existing ones اضافه کردن سایت‎های بارگذاری شده به سایت‎های موجود @@ -1719,7 +1761,7 @@ It's okay as long as it's from someone you trust. اتصال به سرور - + Server IP address [:port] آدرس آی‎پی سرور (:پورت) @@ -1732,7 +1774,7 @@ It's okay as long as it's from someone you trust. Password / SSH private key - + Continue ادامه @@ -1742,47 +1784,47 @@ and will not be shared or disclosed to the Amnezia or any third parties تمام داده‎هایی که شما وارد می‎کنید به شدت محرمانه‎ است و با Amnezia یا هر شخص ثالث دیگری به اشتراک گذاشته نمی‎شود - + Enter the address in the format 255.255.255.255:88 آدرس را با فرمت 255.255.255.255:88 وارد کنید - + Login to connect via SSH ورود و اتصال با استفاده از SSH - + Configure your server سرور خود را پیکربندی کنید - + 255.255.255.255:22 - + Password or SSH private key - + All data you enter will remain strictly confidential and will not be shared or disclosed to the Amnezia or any third parties تمام داده‎هایی که شما وارد می‎کنید به شدت محرمانه‎ است و با Amnezia یا هر شخص ثالث دیگری به اشتراک گذاشته نمی‎شود - + Ip address cannot be empty آدرس آی‎پی نمی‎تواند خالی باشد - + Login cannot be empty نام‎کاربری نمی‎تواند خالی باشد - + Password/private key cannot be empty پسورد یا کلید خصوصی نمی‎تواند خالی باشد @@ -1810,7 +1852,7 @@ and will not be shared or disclosed to the Amnezia or any third parties ادامه - + Set up later بعدا تنظیم شود @@ -1822,23 +1864,15 @@ and will not be shared or disclosed to the Amnezia or any third parties The server has already been added to the application سرور در حال حاضر به نرم‎افزار اضافه شده است - - Amnezia has detected that your server is currently - Amnezia has detected that your server is currently - - - busy installing other software. Amnezia installation - busy installing other software. Amnezia installation - Amnezia has detected that your server is currently - برنامه Amnezia تشخیص داده است که سرور در حال حاضر + Amnezia has detected that your server is currently busy installing other software. Amnezia installation - مشغول نصب نرم‎افزار دیگری است. نصب Amnezia + busy installing other software. Amnezia installation @@ -1865,32 +1899,32 @@ and will not be shared or disclosed to the Amnezia or any third parties PageSetupWizardProtocolSettings - + Installing %1 در حال نصب %1 - + More detailed جزییات بیشتر - + Close بستن - + Network protocol پروتکل شبکه - + Port پورت - + Install نصب @@ -1944,7 +1978,7 @@ and will not be shared or disclosed to the Amnezia or any third parties من هیچی ندارم - + https://amnezia.org/instructions/0_starter-guide @@ -1952,27 +1986,27 @@ and will not be shared or disclosed to the Amnezia or any third parties PageSetupWizardTextKey - + Connection key کلید ارتباط - + A line that starts with vpn://... یک کلید متنی که با vpn:// شروع می‎شود - + Key کلید - + Insert وارد کردن - + Continue ادامه @@ -1980,27 +2014,27 @@ and will not be shared or disclosed to the Amnezia or any third parties PageSetupWizardViewConfig - + New connection ارتباط جدید - + Do not use connection code from public sources. It could be created to intercept your data. از کد اتصالی که در منابع عمومی هست استفاده نکنید. ممکن است برای شنود اطلاعات شما ایجاد شده باشد. - + Collapse content جمع کردن محتوا - + Show content نمایش محتوا - + Connect اتصال @@ -2008,12 +2042,12 @@ and will not be shared or disclosed to the Amnezia or any third parties PageShare - + OpenVpn native format فرمت OpenVPN - + WireGuard native format فرمت WireGuard @@ -2022,7 +2056,7 @@ and will not be shared or disclosed to the Amnezia or any third parties دسترسی VPN - + Connection ارتباط @@ -2035,8 +2069,8 @@ and will not be shared or disclosed to the Amnezia or any third parties دسترسی به مدیریت سرور. کاربری که با او دسترسی کامل به اتصال را به اشتراک می‌گذارید، می‌تواند پروتکل‌ها و سرویس‌های شما را در سرور اضافه و حذف کند، همچنین تنظیمات را تغییر دهد. - - + + Server سرور @@ -2049,113 +2083,123 @@ and will not be shared or disclosed to the Amnezia or any third parties فایل شامل تنظیمات دسترسی به - + Config revoked تنظیمات ابطال‎شد - + Connection to ارتباط با - + File with connection settings to فایل شامل تنظیمات ارتباط با - + Save OpenVPN config ذخیره تنظیمات OpenVPN - + Save WireGuard config ذخیره تنظیمات WireGuard - + + Save AmneziaWG config + + + + Save ShadowSocks config ذخیره تنظیمات ShadowSocks - + Save Cloak config ذخیره تنظیمات Cloak - + For the AmneziaVPN app برای نرم‎افزار AmneziaVPN - + + AmneziaWG native format + + + + ShadowSocks native format فرمت ShadowSocks - + Cloak native format فرمت Cloak - + Share VPN Access به اشتراک گذاشتن دسترسی وی‎پی‎ان - + Share full access to the server and VPN به اشتراک گذاشتن دسترسی کامل به سرور و وی‎پی‎ان - + Use for your own devices, or share with those you trust to manage the server. برای دستگاه‎های خودتان استفاده کنید یا با آنهایی که برای مدیریت سرور به آن‎ها اعتماد دارید به اشتراک بگذارید. - - + + Users کاربران - + User name نام کاربری - + Search جستجو - + Creation date: تاریخ ایجاد: - + Rename تغییر نام - + Client name نام کلاینت - + Save ذخیره - + Revoke ابطال - + Revoke the config for a user - %1? لغو پیکربندی برای یک کاربر %1؟ @@ -2164,17 +2208,17 @@ and will not be shared or disclosed to the Amnezia or any third parties ابطال تنظیمات برای کاربر - + The user will no longer be able to connect to your server. کاربر دیگر نمی‎تواند به سرور وصل شود. - + Continue ادامه - + Cancel کنسل @@ -2183,7 +2227,7 @@ and will not be shared or disclosed to the Amnezia or any third parties دسترسی کامل - + Share VPN access without the ability to manage the server به اشتراک گذاشتن دسترسی وی‎پی‎ان بدون امکان مدیریت سرور @@ -2192,20 +2236,20 @@ and will not be shared or disclosed to the Amnezia or any third parties به اشتراک گذاری دسترسی به مدیریت سرور. کاربری که دسترسی کامل سرور با او به اشتراک گذاشته می‎شود می‎تواند پروتکل‌‎ها و سرویس‎ها را در سرور حذف یا اضافه کند و یا تنظیمات سرور را تغییر دهد. - - + + Protocol پروتکل - - + + Connection format فرمت ارتباط - - + + Share اشتراک‎گذاری @@ -2230,33 +2274,33 @@ and will not be shared or disclosed to the Amnezia or any third parties اگر دسترسی کامل را با دیگران به اشتراک بگذارید، آن‎ها می‎توانند پروتکل‎ها و سرویس‎ها را حذف یا اضافه کنند که باعث می‎شود که وی‎پی‎ان دیگر برای سایر کاربران کار نکند. - + Server سرور - + Accessing در حال دسترسی به - + File with accessing settings to فایل شامل تنظیمات دسترسی به - + Share اشتراک‎گذاری - + Connection to ارتباط با - + File with connection settings to فایل شامل تنظیمات ارتباط با @@ -2657,7 +2701,17 @@ and will not be shared or disclosed to the Amnezia or any third parties - + + Error when retrieving configuration from API + + + + + This config has already been added to the application + + + + ErrorCode: %1. @@ -2720,7 +2774,7 @@ and will not be shared or disclosed to the Amnezia or any third parties The config does not contain any containers and credentiaks for connecting to the server - + Internal error Internal error @@ -3086,7 +3140,7 @@ This means that AmneziaWG keeps the fast performance of the original while addin SelectLanguageDrawer - + Choose language انتخاب زبان @@ -3108,22 +3162,17 @@ This means that AmneziaWG keeps the fast performance of the original while addin SettingsController - - Software version - نسخه نرم‎افزار - - - + All settings have been reset to default values تمام تنظیمات به مقادیر پیش فرض ریست شد - + Cached profiles cleared پروفایل ذخیره شده پاک شد - + Backup file is corrupted فایل بک‎آپ خراب شده است @@ -3132,38 +3181,38 @@ This means that AmneziaWG keeps the fast performance of the original while addin ShareConnectionDrawer - + Save AmneziaVPN config ذخیره تنظیمات AmneziaVPN - + Share اشتراک‎گذاری - + Copy کپی - - + + Copied کپی شد - + Copy config string کپی‎کردن متن تنظیمات - + Show connection settings نمایش تنظیمات ارتباط - + To read the QR code in the Amnezia app, select "Add server" → "I have data to connect" → "QR code, key or settings file" برای خواندن QR Code در نرم‎افزار AmneziaVPN "اضافه کردن سرور" -> "من داده برای اتصال دارم" -> "QR Code، کلید یا فایل تنظیمات" @@ -3247,7 +3296,7 @@ This means that AmneziaWG keeps the fast performance of the original while addin TextFieldWithHeaderType - + The field can't be empty این فیلد نمی‌تواند خالی باشد. @@ -3359,12 +3408,12 @@ This means that AmneziaWG keeps the fast performance of the original while addin main2 - + Private key passphrase عبارت کلید خصوصی - + Save ذخیره diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts index e0ae9b79..ceeb434a 100644 --- a/client/translations/amneziavpn_ru.ts +++ b/client/translations/amneziavpn_ru.ts @@ -24,58 +24,50 @@ VPN Подключен - - ApiController - - - Error when retrieving configuration from cloud server - - - ConnectionController - + VPN Protocols is not installed. Please install VPN container at first VPN протоколы не установлены. Пожалуйста, установите протокол - + Connection... Подключение... - + Connected Подключено - + Settings updated successfully, Reconnnection... Настройки успешно обновлены. Подключение... - + Settings updated successfully Настройки успешно обновлены - + Reconnection... Переподключение... - - - - + + + + Connect Подключиться - + Disconnection... Отключение... @@ -83,17 +75,17 @@ ConnectionTypeSelectionDrawer - + Add new connection Добавить новое соединение - + Configure your server Настроить свой сервер - + Open config file, key or QR code Открыть файл конфига, ключ или QR код @@ -124,7 +116,7 @@ ExportController - + Access error! Ошибка доступа! @@ -132,12 +124,12 @@ HomeContainersListView - + Unable change protocol while there is an active connection Невозможно изменить протокол при активном соединении - + The selected protocol is not supported on the current platform Выбранный протокол не поддерживается на данном устройстве @@ -146,10 +138,54 @@ Переподключение через VPN протокол: + + HomeSplitTunnelingDrawer + + + Split tunneling + Раздельное VPN-туннелирование + + + + Allows you to connect to some sites or applications through a VPN connection and bypass others + Позволяет подключаться к одним сайтам или приложениям через защищенное соединение, а к другим в обход него + + + + Split tunneling on the server + + + + + Enabled +Can't be disabled for current server + + + + + Site-based split tunneling + Раздельное туннелирование сайтов + + + + Enabled + Включено + + + + Disabled + Отключено + + + + App-based split tunneling + Раздельное VPN-туннелирование приложений + + ImportController - + Scanned %1 of %2. Отсканировано %1 из%2. @@ -280,17 +316,27 @@ Already installed containers were found on the server. All installed containers PageHome - + + Split tunneling enabled + Раздельное туннелирование включено + + + + Split tunneling disabled + Раздельное туннелирование выключено + + + VPN protocol VPN протокол - + Servers Серверы - + Unable change server while there is an active connection Невозможно изменить сервер при активном соединении @@ -298,72 +344,27 @@ Already installed containers were found on the server. All installed containers PageProtocolAwgSettings - + AmneziaWG settings AmneziaWG настройки - + Port Порт - - Junk packet count - Junk packet count - - - - Junk packet minimum size - Junk packet minimum size - - - - Junk packet maximum size - Junk packet maximum size - - - - Init packet junk size - Init packet junk size - - - - Response packet junk size - Response packet junk size - - - - Init packet magic header - Init packet magic header - - - - Response packet magic header - Response packet magic header - - - - Transport packet magic header - Transport packet magic header - - - - Underload packet magic header - Underload packet magic header - - - + Remove AmneziaWG Удалить AmneziaWG - + Remove AmneziaWG from server? Удалить AmneziaWG с сервера? - + All users with whom you shared a connection will no longer be able to connect to it. Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться. @@ -372,17 +373,17 @@ Already installed containers were found on the server. All installed containers Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться. - + Continue Продолжить - + Cancel Отменить - + Save and Restart Amnezia Сохранить и перезагрузить Amnezia @@ -390,28 +391,28 @@ Already installed containers were found on the server. All installed containers PageProtocolCloakSettings - + Cloak settings Настройки Cloak - + Disguised as traffic from Замаскировать трафик под - + Port Порт - - + + Cipher Шифрование - + Save and Restart Amnezia Сохранить и перезагрузить Amnezia @@ -419,7 +420,7 @@ Already installed containers were found on the server. All installed containers PageProtocolOpenVpnSettings - + OpenVPN settings OpenVPN настройки @@ -428,175 +429,175 @@ Already installed containers were found on the server. All installed containers Подсеть для VPN - + VPN address subnet - + Network protocol Сетевой протокол - + Port Порт - + Auto-negotiate encryption Шифрование с автоматическим согласованием - - + + Hash Хэш - + SHA512 SHA512 - + SHA384 SHA384 - + SHA256 SHA256 - + SHA3-512 SHA3-512 - + SHA3-384 SHA3-384 - + SHA3-256 SHA3-256 - + whirlpool whirlpool - + BLAKE2b512 BLAKE2b512 - + BLAKE2s256 BLAKE2s256 - + SHA1 SHA1 - - + + Cipher Шифрование - + AES-256-GCM AES-256-GCM - + AES-192-GCM AES-192-GCM - + AES-128-GCM AES-128-GCM - + AES-256-CBC AES-256-CBC - + AES-192-CBC AES-192-CBC - + AES-128-CBC AES-128-CBC - + ChaCha20-Poly1305 ChaCha20-Poly1305 - + ARIA-256-CBC ARIA-256-CBC - + CAMELLIA-256-CBC CAMELLIA-256-CBC - + none none - + TLS auth TLS авторизация - + Block DNS requests outside of VPN Блокировать DNS запросы за пределами VPN - + Additional client configuration commands Дополнительные команды конфигурации клиента - - + + Commands: Commands: - + Additional server configuration commands Дополнительные команды конфигурации сервера - + Remove OpenVPN Удалить OpenVPN - + Remove OpenVpn from server? Удалить OpenVpn с сервера? - + All users with whom you shared a connection will no longer be able to connect to it. Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться. @@ -605,17 +606,17 @@ Already installed containers were found on the server. All installed containers Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться. - + Continue Продолжить - + Cancel Отменить - + Save and Restart Amnezia Сохранить и перезагрузить @@ -633,22 +634,22 @@ Already installed containers were found on the server. All installed containers Показать параметры подключения - + Connection options %1 Параметры подключения %1 - + Remove Удалить - + Remove %1 from server? Удалить %1 с сервера? - + All users with whom you shared a connection will no longer be able to connect to it. Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться. @@ -657,12 +658,12 @@ Already installed containers were found on the server. All installed containers Все пользователи, с которыми вы поделились этим VPN-протоколом, больше не смогут к нему подключаться. - + Continue Продолжить - + Cancel Отменить @@ -670,23 +671,23 @@ Already installed containers were found on the server. All installed containers PageProtocolShadowSocksSettings - + ShadowSocks settings Настройки ShadowSocks - + Port Порт - - + + Cipher Шифрование - + Save and Restart Amnezia Сохранить и перезагрузить Amnezia @@ -846,20 +847,12 @@ Already installed containers were found on the server. All installed containers Use <a href="https://www.torproject.org/download/" style="color: #FBB26A;">Tor Browser</a> to open this URL. - + Используйте <a href="https://www.torproject.org/download/" style="color: #FBB26A;">Tor Browser</a> для открытия этой ссылки. After creating your onion site, it takes a few minutes for the Tor network to make it available for use. - - - - Use <a href="https://www.torproject.org/download/" style="color: #FBB26A;">Tor Browser</a> to open this URL. - Используйте <a href="https://www.torproject.org/download/" style="color: #FBB26A;">Tor Browser</a> для открытия этой ссылки. - - - After creating your onion site, it takes a few minutes for the Tor network to make it available for use. - Через несколько минут после установки ваш Onion сайт станет доступен в сети Tor. + Через несколько минут после установки ваш Onion сайт станет доступен в сети Tor. @@ -966,62 +959,67 @@ Already installed containers were found on the server. All installed containers Показать другие способы на Github - + https://github.com/amnezia-vpn/amnezia-client#donate - + Contacts Контакты - + Telegram group Группа в Telegram - + To discuss features Для обсуждений - + https://t.me/amnezia_vpn_en https://t.me/amnezia_vpn - + Mail Почта - + For reviews and bug reports Для отзывов и сообщений об ошибках - + Github Github - + https://github.com/amnezia-vpn/amnezia-client https://github.com/amnezia-vpn/amnezia-client - + Website Веб-сайт - + https://amnezia.org https://amnezia.org - + + Software version: %1 + Версия ПО: %1 + + + Check for updates Проверить обновления @@ -1050,56 +1048,66 @@ Already installed containers were found on the server. All installed containers + Auto connect + Автоподключение + + + + Connect to VPN on app start + Подключение к VPN при запуске приложения + + + Start minimized Запускать в свернутом виде - + Launch application minimized Запускать приложение в свернутом виде - + Language Язык - + Logging Логирование - + Enabled Включено - + Disabled Отключено - + Reset settings and remove all data from the application Сбросить настройки и удалить все данные из приложения - + Reset settings and remove all data from the application? Сбросить настройки и удалить все данные из приложения? - + All settings will be reset to default. All installed AmneziaVPN services will still remain on the server. Все данные из приложения будут удалены, все установленные сервисы AmneziaVPN останутся на сервере. - + Continue Продолжить - + Cancel Отменить @@ -1186,56 +1194,50 @@ Already installed containers were found on the server. All installed containers Соединение - Auto connect - Автоподключение + Автоподключение - Connect to VPN on app start - Подключение к VPN при запуске приложения + Подключение к VPN при запуске приложения - + Use AmneziaDNS Использовать Amnezia DNS - + If AmneziaDNS is installed on the server Если он уставновлен на сервере - + DNS servers DNS сервер - + When AmneziaDNS is not used or installed - + Эти адреса будут использоваться, если не включен AmneziaDNS - + Allows you to use the VPN only for certain Apps - When AmneziaDNS is not used or installed - Эти адреса будут использоваться, если не включен AmneziaDNS - - - + Site-based split tunneling Раздельное туннелирование сайтов - + Allows you to select which sites you want to access through the VPN Позволяет подключаться к одним сайтам через VPN, а к другим в обход него - + App-based split tunneling Раздельное VPN-туннелирование приложений @@ -1247,62 +1249,66 @@ Already installed containers were found on the server. All installed containers PageSettingsDns - + Default server does not support custom dns - + DNS servers DNS сервер - When AmneziaDNS is not used or installed - Эти адреса будут использоваться, если не включен или не установлен AmneziaDNS + Эти адреса будут использоваться, если не включен или не установлен AmneziaDNS - + + If AmneziaDNS is not used or installed + + + + Primary DNS Первичный DNS - + Secondary DNS Вторичный DNS - + Restore default Восстановить по умолчанию - + Restore default DNS settings? Восстановить настройки DNS по умолчанию? - + Continue Продолжить - + Cancel Отменить - + Settings have been reset Настройки сброшены - + Save Сохранить - + Settings saved Сохранить настройки @@ -1360,12 +1366,12 @@ Already installed containers were found on the server. All installed containers Отменить - + Logs have been cleaned up Логи удалены - + Clear logs Удалить логи @@ -1404,57 +1410,69 @@ Already installed containers were found on the server. All installed containers - - - + + + + Continue Продолжить - - - + + + + Cancel Отменить - + Check the server for previously installed Amnezia services Проверить сервер на наличие ранее установленных сервисов Amnezia - + Add them to the application if they were not displayed Добавить их в приложение, если они не были отображены - + Reboot server Перезагрузить сервер - + Do you want to reboot the server? Вы уверены, что хотите перезагрузить сервер? - + The reboot process may take approximately 30 seconds. Are you sure you wish to proceed? Процесс перезагрузки может занять около 30 секунд. Вы уверены, что хотите продолжить? - + Do you want to remove the server from application? Вы уверена что хотите удалить сервер из приложения? - + Do you want to clear server from Amnezia software? Вы хотите очистить сервер от всех сервисов Amnezia? - + + Reset API config + + + + + Do you want to reset API config? + + + + Remove server from application Удалить сервер из приложения @@ -1463,12 +1481,12 @@ Already installed containers were found on the server. All installed containers Удалить сервер? - + All installed AmneziaVPN services will still remain on the server. Все установленные сервисы и протоколы Amnezia всё ещё останутся на сервере. - + Clear server from Amnezia software Очистить сервер от протоколов и сервисов Amnezia @@ -1477,7 +1495,7 @@ Already installed containers were found on the server. All installed containers Удалить все сервисы и протоколы Amnezia с сервера? - + All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted. На сервере будут удалены все данные, связанные с Amnezia: протоколы, сервисы, конфигурационные файлы, ключи и сертификаты. @@ -1485,27 +1503,27 @@ Already installed containers were found on the server. All installed containers PageSettingsServerInfo - + Server name Имя сервера - + Save Сохранить - + Protocols Протоколы - + Services Сервисы - + Data Данные @@ -1558,41 +1576,41 @@ Already installed containers were found on the server. All installed containers PageSettingsSplitTunneling - + Default server does not support split tunneling function - Only the sites listed here will be accesed via VPN + Only the sites listed here will be accessed via VPN Только адреса из списка должны открываться через VPN - + Addresses from the list should not be accessed via VPN Адреса из списка не должны открываться через VPN - + Split tunneling Раздельное VPN-туннелирование - + Mode Режим - + Remove Удалить - + Continue Продолжить - + Cancel Отменить @@ -1601,64 +1619,65 @@ Already installed containers were found on the server. All installed containers Сайт или IP + Import / Export Sites - Импорт/экспорт Сайтов + Импорт/экспорт сайтов - + Only the sites listed here will be accessed through the VPN - + Только адреса из списка должны открываться через VPN - + + Cannot change split tunneling settings during active connection + Невозможно изменить настройки раздельного туннелирования при включенном VPN + + + website or IP - - Import / Export Sites - - - - + Import Импорт - + Save site list Сохранить список сайтов - + Save sites Сохранить - - - + + + Sites files (*.json) Sites files (*.json) - + Import a list of sites Импортировать список с сайтами - + Replace site list Заменить список сайтов - - + + Open sites file Открыть список с сайтами - + Add imported sites to existing ones Добавить импортированные сайты к существующим @@ -1717,7 +1736,7 @@ It's okay as long as it's from someone you trust. Подключение к серверу - + Server IP address [:port] Server IP address [:port] @@ -1730,7 +1749,7 @@ It's okay as long as it's from someone you trust. Password / SSH private key - + Continue Продолжить @@ -1740,47 +1759,47 @@ and will not be shared or disclosed to the Amnezia or any third parties Все данные, которые вы вводите, останутся строго конфиденциальными и не будут переданы или раскрыты Amnezia или каким-либо третьим сторонам - + Enter the address in the format 255.255.255.255:88 Введите адрес в формате 255.255.255.255:88 - + Login to connect via SSH Login to connect via SSH - + Configure your server Настроить ваш сервер - + 255.255.255.255:22 - + Password or SSH private key - + All data you enter will remain strictly confidential and will not be shared or disclosed to the Amnezia or any third parties Все введенные вами данные останутся строго конфиденциальными и не будут переданы или раскрыты Amnezia или третьим лицам - + Ip address cannot be empty Поле Ip address не может быть пустым - + Login cannot be empty Поле Login не может быть пустым - + Password/private key cannot be empty Поле Password/private key не может быть пустым @@ -1808,7 +1827,7 @@ and will not be shared or disclosed to the Amnezia or any third parties Продолжить - + Set up later Настроить позднее @@ -1863,32 +1882,32 @@ and will not be shared or disclosed to the Amnezia or any third parties PageSetupWizardProtocolSettings - + Installing %1 Установить %1 - + More detailed Подробнее - + Close Закрыть - + Network protocol Сетевой протокол - + Port Порт - + Install Установить @@ -1942,7 +1961,7 @@ and will not be shared or disclosed to the Amnezia or any third parties У меня ничего нет - + https://amnezia.org/instructions/0_starter-guide @@ -1950,27 +1969,27 @@ and will not be shared or disclosed to the Amnezia or any third parties PageSetupWizardTextKey - + Connection key Ключ для подключения - + A line that starts with vpn://... Строка, которая начинается с vpn://... - + Key Ключ - + Insert Вставить - + Continue Продолжить @@ -1978,27 +1997,27 @@ and will not be shared or disclosed to the Amnezia or any third parties PageSetupWizardViewConfig - + New connection Новое соединение - + Do not use connection code from public sources. It could be created to intercept your data. Не используйте код подключения из публичных источников. Его могли создать, чтобы перехватывать ваши данные. - + Collapse content Свернуть - + Show content Показать содержимое ключа - + Connect Подключиться @@ -2006,12 +2025,12 @@ and will not be shared or disclosed to the Amnezia or any third parties PageShare - + OpenVpn native format OpenVpn нативный формат - + WireGuard native format WireGuard нативный формат @@ -2020,7 +2039,7 @@ and will not be shared or disclosed to the Amnezia or any third parties VPN-Доступ - + Connection Соединение @@ -2033,8 +2052,8 @@ and will not be shared or disclosed to the Amnezia or any third parties Доступ к управлению сервером. Пользователь, с которым вы делитесь полным доступом к соединению, сможет добавлять и удалять ваши протоколы и службы на сервере, а также изменять настройки. - - + + Server Сервер @@ -2043,128 +2062,138 @@ and will not be shared or disclosed to the Amnezia or any third parties Доступ - + Config revoked - + Connection to Подключение к - + File with connection settings to Файл с настройками доступа к - + Save OpenVPN config Сохранить OpenVPN config - + Save WireGuard config Сохранить WireGuard config - + + Save AmneziaWG config + + + + Save ShadowSocks config Сохранить конфигурацию ShadowSocks - + Save Cloak config Сохранить конфигурацию Cloak - + For the AmneziaVPN app Для AmneziaVPN - + + AmneziaWG native format + + + + ShadowSocks native format ShadowSocks нативный формат - + Cloak native format Cloak нативный формат - + Share VPN Access Поделиться VPN - + Share full access to the server and VPN Поделиться полным доступом к серверу - + Use for your own devices, or share with those you trust to manage the server. Используйте для собственных устройств или передайте управление сервером тем, кому вы доверяете. - - + + Users Пользователи - + User name Имя пользователя - + Search - + Creation date: Дата создания - + Rename Переименовать - + Client name - + Save Сохранить - + Revoke Отозвать - + Revoke the config for a user - %1? Отозвать доступ для пользователя - %1? - + The user will no longer be able to connect to your server. Пользователь больше не сможет подключаться к вашему серверу - + Continue Продолжить - + Cancel Отменить @@ -2173,25 +2202,25 @@ and will not be shared or disclosed to the Amnezia or any third parties Полный доступ - + Share VPN access without the ability to manage the server Поделиться доступом к VPN, без возможности управления сервером - - + + Protocol Протокол - - + + Connection format Формат подключения - - + + Share Поделиться @@ -2215,33 +2244,33 @@ and will not be shared or disclosed to the Amnezia or any third parties Если вы поделитесь полным доступом с другими людьми, то они смогут удалять и добавлять протоколы и сервисы на сервер, что приведет к некорректной работе VPN для всех пользователей. - + Server Сервер - + Accessing Доступ - + File with accessing settings to - + Share Поделиться - + Connection to Подключение к - + File with connection settings to Файл с настройками доступа к @@ -2637,7 +2666,17 @@ and will not be shared or disclosed to the Amnezia or any third parties Конфиг не содержит контейнеров и учетных данных для подключения к серверу - + + Error when retrieving configuration from API + + + + + This config has already been added to the application + + + + ErrorCode: %1. @@ -2701,7 +2740,7 @@ and will not be shared or disclosed to the Amnezia or any third parties - + Internal error Internal error @@ -2713,17 +2752,17 @@ and will not be shared or disclosed to the Amnezia or any third parties ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but it may be recognized by analysis systems in some highly censored regions. - + ShadowSocks - маскирует VPN-трафик под обычный веб-трафик, но распознается системами анализа в некоторых регионах с высоким уровнем цензуры. OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probing detection. Ideal for bypassing blocking in regions with the highest levels of censorship. - + OpenVPN over Cloak - OpenVPN с маскировкой VPN под web-трафик и защитой от обнаружения active-probbing. Подходит для регионов с самым высоким уровнем цензуры. Create a file vault on your server to securely store and transfer files. - + Создайте на сервере файловое хранилище для безопасного хранения и передачи файлов. @@ -2807,14 +2846,6 @@ While it offers a blend of security, stability, and speed, it's essential t OpenVPN is the most popular VPN protocol, with flexible configuration options. It uses its own security protocol with SSL/TLS for key exchange. OpenVPN - популярный VPN-протокол, с гибкой настройкой. Имеет собственный протокол безопасности с SSL/TLS для обмена ключами. - - ShadowSocks - masks VPN traffic, making it similar to normal web traffic, but it may be recognized by analysis systems in some highly censored regions. - ShadowSocks - маскирует VPN-трафик под обычный веб-трафик, но распознается системами анализа в некоторых регионах с высоким уровнем цензуры. - - - OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probing detection. Ideal for bypassing blocking in regions with the highest levels of censorship. - OpenVPN over Cloak - OpenVPN с маскировкой VPN под web-трафик и защитой от обнаружения active-probbing. Подходит для регионов с самым высоким уровнем цензуры. - WireGuard - New popular VPN protocol with high performance, high speed and low power consumption. Recommended for regions with low levels of censorship. @@ -2840,10 +2871,6 @@ While it offers a blend of security, stability, and speed, it's essential t Replace the current DNS server with your own. This will increase your privacy level. Замените DNS-сервер на Amnezia DNS. Это повысит уровень конфиденциальности. - - Create a file vault on your server to securely store and transfer files. - Создайте на сервере файловое хранилище для безопасного хранения и передачи файлов. - OpenVPN stands as one of the most popular and time-tested VPN protocols available. @@ -3037,7 +3064,7 @@ This means that AmneziaWG keeps the fast performance of the original while addin SelectLanguageDrawer - + Choose language Выберите язык @@ -3059,22 +3086,17 @@ This means that AmneziaWG keeps the fast performance of the original while addin SettingsController - - Software version - Версия ПО - - - + All settings have been reset to default values Все настройки были сброшены к значению "По умолчанию" - + Cached profiles cleared Кэш профиля очищен - + Backup file is corrupted Backup файл поврежден @@ -3083,38 +3105,38 @@ This means that AmneziaWG keeps the fast performance of the original while addin ShareConnectionDrawer - + Save AmneziaVPN config Сохранить config AmneziaVPN - + Share Поделиться - + Copy Скопировать - - + + Copied Скопировано - + Copy config string - + Show connection settings Показать настройки подключения - + To read the QR code in the Amnezia app, select "Add server" → "I have data to connect" → "QR code, key or settings file" Для считывания QR-кода в приложении Amnezia выберите "Добавить сервер" → "У меня есть данные для подключения" → "QR-код, ключ или файл настроек" @@ -3198,7 +3220,7 @@ This means that AmneziaWG keeps the fast performance of the original while addin TextFieldWithHeaderType - + The field can't be empty Поле не может быть пустым @@ -3310,12 +3332,12 @@ This means that AmneziaWG keeps the fast performance of the original while addin main2 - + Private key passphrase Кодовая фраза для закрытого ключа - + Save Сохранить diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts index 8eacc183..8410f8e2 100644 --- a/client/translations/amneziavpn_zh_CN.ts +++ b/client/translations/amneziavpn_zh_CN.ts @@ -16,57 +16,49 @@ VPN已连接 - - ApiController - - - Error when retrieving configuration from cloud server - - - ConnectionController - - - - + + + + Connect 连接 - + VPN Protocols is not installed. Please install VPN container at first 请先安装VPN协议 - + Connection... 连接中 - + Connected 已连接 - + Reconnection... 重连中 - + Disconnection... 断开中 - + Settings updated successfully, Reconnnection... 配置已更新，重连中 - + Settings updated successfully 配置更新成功 @@ -78,17 +70,17 @@ 连接方式 - + Add new connection 添加新连接 - + Configure your server 配置您的服务器 - + Open config file, key or QR code 配置文件，授权码或二维码 @@ -127,7 +119,7 @@ ExportController - + Access error! 访问错误 @@ -135,12 +127,12 @@ HomeContainersListView - + Unable change protocol while there is an active connection 已建立连接时无法更改服务器配置 - + The selected protocol is not supported on the current platform 当前平台不支持所选协议 @@ -149,10 +141,54 @@ 重连VPN基于协议: + + HomeSplitTunnelingDrawer + + + Split tunneling + 隧道分离 + + + + Allows you to connect to some sites or applications through a VPN connection and bypass others + 允许您通过 VPN 连接连接到某些站点或应用程序，并绕过其他站点或应用程序 + + + + Split tunneling on the server + + + + + Enabled +Can't be disabled for current server + + + + + Site-based split tunneling + 基于网站的隧道分离 + + + + Enabled + 开启 + + + + Disabled + 禁用 + + + + App-based split tunneling + 基于应用的隧道分离 + + ImportController - + Scanned %1 of %2. 扫描 %1 of %2. @@ -307,17 +343,27 @@ Already installed containers were found on the server. All installed containers PageHome - + + Split tunneling enabled + 用户分隔隧道已启用 + + + + Split tunneling disabled + 分隔隧道已禁用 + + + VPN protocol VPN协议 - + Servers 服务器 - + Unable change server while there is an active connection 已建立连接时无法更改服务器配置 @@ -325,72 +371,27 @@ Already installed containers were found on the server. All installed containers PageProtocolAwgSettings - + AmneziaWG settings AmneziaWG 配置 - + Port 端口 - - Junk packet count - 垃圾包数量 - - - - Junk packet minimum size - 垃圾包最小值 - - - - Junk packet maximum size - 垃圾包最大值 - - - - Init packet junk size - 初始化垃圾包大小 - - - - Response packet junk size - 响应垃圾包大小 - - - - Init packet magic header - 初始化数据包魔数头 - - - - Response packet magic header - 响应包魔数头 - - - - Transport packet magic header - 传输包魔数头 - - - - Underload packet magic header - 低负载数据包魔数头 - - - + Remove AmneziaWG 移除AmneziaWG - + Remove AmneziaWG from server? 从服务上移除AmneziaWG？ - + All users with whom you shared a connection will no longer be able to connect to it. 与您共享连接的所有用户将无法再连接到该连接。 @@ -399,17 +400,17 @@ Already installed containers were found on the server. All installed containers 使用此共享连接的所有用户，将无法再连接它。 - + Continue 继续 - + Cancel 取消 - + Save and Restart Amnezia 保存并重启Amnezia @@ -417,28 +418,28 @@ Already installed containers were found on the server. All installed containers PageProtocolCloakSettings - + Cloak settings Cloak 配置 - + Disguised as traffic from 伪装流量为 - + Port 端口 - - + + Cipher 加密算法 - + Save and Restart Amnezia 保存并重启Amnezia @@ -446,7 +447,7 @@ Already installed containers were found on the server. All installed containers PageProtocolOpenVpnSettings - + OpenVPN settings OpenVPN 配置 @@ -455,175 +456,175 @@ Already installed containers were found on the server. All installed containers VPN子网掩码 - + VPN address subnet - + Network protocol 网络协议 - + Port 端口 - + Auto-negotiate encryption 自定义加密方式 - - + + Hash - + SHA512 - + SHA384 - + SHA256 - + SHA3-512 - + SHA3-384 - + SHA3-256 - + whirlpool - + BLAKE2b512 - + BLAKE2s256 - + SHA1 - - + + Cipher - + AES-256-GCM - + AES-192-GCM - + AES-128-GCM - + AES-256-CBC - + AES-192-CBC - + AES-128-CBC - + ChaCha20-Poly1305 - + ARIA-256-CBC - + CAMELLIA-256-CBC - + none 无 - + TLS auth TLS认证 - + Block DNS requests outside of VPN 阻止VPN外的DNS请求 - + Additional client configuration commands 附加客户端配置命令 - - + + Commands: 命令: - + Additional server configuration commands 附加服务器端配置命令 - + Remove OpenVPN 移除OpenVPN - + Remove OpenVpn from server? 从服务器移除OpenVPN吗? - + All users with whom you shared a connection will no longer be able to connect to it. 与您共享连接的所有用户将无法再连接到该连接。 @@ -636,17 +637,17 @@ Already installed containers were found on the server. All installed containers 与您共享连接的所有用户将无法再连接到此链接 - + Continue 继续 - + Cancel 取消 - + Save and Restart Amnezia 保存并重启Amnezia @@ -668,22 +669,22 @@ Already installed containers were found on the server. All installed containers 连接选项 - + Connection options %1 %1 连接选项 - + Remove 移除 - + Remove %1 from server? 从服务器移除 %1 ? - + All users with whom you shared a connection will no longer be able to connect to it. 与您共享连接的所有用户将无法再连接到该连接。 @@ -700,12 +701,12 @@ Already installed containers were found on the server. All installed containers 与您共享连接的所有用户将无法再连接到此链接 - + Continue 继续 - + Cancel 取消 @@ -713,23 +714,23 @@ Already installed containers were found on the server. All installed containers PageProtocolShadowSocksSettings - + ShadowSocks settings ShadowSocks 配置 - + Port 端口 - - + + Cipher 加密算法 - + Save and Restart Amnezia 保存并重启Amnezia @@ -886,17 +887,13 @@ Already installed containers were found on the server. All installed containers Use <a href="https://www.torproject.org/download/" style="color: #FBB26A;">Tor Browser</a> to open this URL. - + 用 <a href="https://www.torproject.org/download/" style="color: #FBB26A;">Tor 浏览器</a> 打开上面网址 After creating your onion site, it takes a few minutes for the Tor network to make it available for use. 创建您的洋葱网站后，需要几分钟时间，才能使其在Tor网络上可用 - - Use <a href="https://www.torproject.org/download/" style="color: #FBB26A;">Tor Browser</a> to open this URL. - 用 <a href="https://www.torproject.org/download/" style="color: #FBB26A;">Tor 浏览器</a> 打开上面网址 - After installation it takes several minutes while your onion site will become available in the Tor Network. 完成安装几分钟后,洋葱站点才会在 Tor 网络中生效。 @@ -1013,62 +1010,67 @@ And if you don't like the app, all the more support it - the donation will 其他捐款途径 - + https://github.com/amnezia-vpn/amnezia-client#donate - + Contacts 联系方式 - + Telegram group 电报群 - + To discuss features 用于功能讨论 - + https://t.me/amnezia_vpn_en - + Mail 邮件 - + For reviews and bug reports 用于评论和提交软件的缺陷 - + Github - + https://github.com/amnezia-vpn/amnezia-client - + Website 官网 - + https://amnezia.org - + + Software version: %1 + 软件版本: %1 + + + Check for updates 检查更新 @@ -1109,56 +1111,66 @@ And if you don't like the app, all the more support it - the donation will + Auto connect + 自动连接 + + + + Connect to VPN on app start + 应用开启时连接VPN + + + Start minimized 最小化 - + Launch application minimized 开启应用软件时窗口最小化 - + Language 语言 - + Logging 日志 - + Enabled 开启 - + Disabled 禁用 - + Reset settings and remove all data from the application 重置并清理应用的所有数据 - + Reset settings and remove all data from the application? 重置并清理应用的所有数据？ - + All settings will be reset to default. All installed AmneziaVPN services will still remain on the server. 所有配置恢复为默认值。服务器已安装的AmneziaVPN服务将被保留。 - + Continue 继续 - + Cancel 取消 @@ -1249,22 +1261,20 @@ And if you don't like the app, all the more support it - the donation will 连接 - Auto connect - 自动连接 + 自动连接 - Connect to VPN on app start - 应用开启时连接VPN + 应用开启时连接VPN - + When AmneziaDNS is not used or installed 当未使用或未安装AmneziaDNS时 - + Allows you to use the VPN only for certain Apps @@ -1273,17 +1283,17 @@ And if you don't like the app, all the more support it - the donation will 使用AmneziaDNS，如其已安装在服务器上 - + Use AmneziaDNS 使用AmneziaDNS - + If AmneziaDNS is installed on the server 如果已在服务器安装AmneziaDNS - + DNS servers DNS服务器 @@ -1292,17 +1302,17 @@ And if you don't like the app, all the more support it - the donation will 如果未使用或未安装AmneziaDNS - + Site-based split tunneling 基于网站的隧道分离 - + Allows you to select which sites you want to access through the VPN 配置想要通过VPN访问网站 - + App-based split tunneling 基于应用的隧道分离 @@ -1326,62 +1336,62 @@ And if you don't like the app, all the more support it - the donation will PageSettingsDns - + Default server does not support custom dns - + DNS servers DNS服务器 - + If AmneziaDNS is not used or installed 如果未使用或未安装AmneziaDNS - + Primary DNS 首选 DNS - + Secondary DNS 备用 DNS - + Restore default 恢复默认配置 - + Restore default DNS settings? 是否恢复默认DNS配置？ - + Continue 继续 - + Cancel 取消 - + Settings have been reset 已重置 - + Save 保存 - + Settings saved 配置已保存 @@ -1439,12 +1449,12 @@ And if you don't like the app, all the more support it - the donation will 取消 - + Logs have been cleaned up 日志已清理 - + Clear logs 清理日志 @@ -1477,12 +1487,12 @@ And if you don't like the app, all the more support it - the donation will 清除缓存？ - + Do you want to reboot the server? 您想重新启动服务器吗？ - + Do you want to clear server from Amnezia software? 您要清除服务器上的Amnezia软件吗？ @@ -1493,61 +1503,73 @@ And if you don't like the app, all the more support it - the donation will - - - + + + + Continue 继续 - - - + + + + Cancel 取消 - + Check the server for previously installed Amnezia services 检查服务器上，是否存在之前安装的 Amnezia 服务 - + Add them to the application if they were not displayed 如果存在且未显示，则添加到应用软件 - + Reboot server 重新启动服务器 - + The reboot process may take approximately 30 seconds. Are you sure you wish to proceed? 重新启动过程可能需要大约30秒。您确定要继续吗？ - + Remove server from application 移除本地服务器信息 - + Do you want to remove the server from application? 您想要从应用程序中移除服务器吗？ + + + Reset API config + + + + + Do you want to reset API config? + + Remove server? 移除本地服务器信息? - + All installed AmneziaVPN services will still remain on the server. 所有已安装的 AmneziaVPN 服务仍将保留在服务器上。 - + Clear server from Amnezia software 清理Amnezia中服务器信息 @@ -1556,7 +1578,7 @@ And if you don't like the app, all the more support it - the donation will 清理Amnezia中服务器信息 - + All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted. 服务器上的所有容器都将被删除。配置文件、密钥和证书也将被删除。 @@ -1564,27 +1586,27 @@ And if you don't like the app, all the more support it - the donation will PageSettingsServerInfo - + Server name 服务器名 - + Save 保存 - + Protocols 协议 - + Services 服务 - + Data 数据 @@ -1657,7 +1679,7 @@ And if you don't like the app, all the more support it - the donation will 网站级VPN分流 - + Default server does not support split tunneling function @@ -1666,32 +1688,32 @@ And if you don't like the app, all the more support it - the donation will 仅使用VPN访问 - + Addresses from the list should not be accessed via VPN 不使用VPN访问 - + Split tunneling 隧道分离 - + Mode 规则 - + Remove 移除 - + Continue 继续 - + Cancel 取消 @@ -1704,60 +1726,65 @@ And if you don't like the app, all the more support it - the donation will 导入/导出网站 - + + Cannot change split tunneling settings during active connection + + + + Only the sites listed here will be accessed through the VPN 只有这里列出的网站将通过VPN访问 - + website or IP 网站或IP - + Import / Export Sites 导入/导出网站 - + Import 导入 - + Save site list 保存网址 - + Save sites 保存网址 - - - + + + Sites files (*.json) - + Import a list of sites 导入网址列表 - + Replace site list 替换网址列表 - - + + Open sites file 打开网址文件 - + Add imported sites to existing ones 将导入的网址添加到现有网址中 @@ -1815,17 +1842,17 @@ It's okay as long as it's from someone you trust. 连接服务器 - + Configure your server 配置服务器 - + Server IP address [:port] 服务器IP [:端口] - + Login to connect via SSH 用户 @@ -1834,12 +1861,12 @@ It's okay as long as it's from someone you trust. 密码 或 私钥 - + Continue 继续 - + All data you enter will remain strictly confidential and will not be shared or disclosed to the Amnezia or any third parties @@ -1850,32 +1877,32 @@ and will not be shared or disclosed to the Amnezia or any third parties 不会向 Amnezia 或任何第三方分享或披露 - + 255.255.255.255:22 - + Password or SSH private key - + Ip address cannot be empty IP不能为空 - + Enter the address in the format 255.255.255.255:88 按照这种格式输入 255.255.255.255:88 - + Login cannot be empty 账号不能为空 - + Password/private key cannot be empty 密码或私钥不能为空 @@ -1903,7 +1930,7 @@ and will not be shared or disclosed to the Amnezia or any third parties 继续 - + Set up later 稍后设置 @@ -1958,32 +1985,32 @@ and will not be shared or disclosed to the Amnezia or any third parties PageSetupWizardProtocolSettings - + Installing %1 正在安装 %1 - + More detailed 更多细节 - + Close 关闭 - + Network protocol 网络协议 - + Port 端口 - + Install 安装 @@ -2037,7 +2064,7 @@ and will not be shared or disclosed to the Amnezia or any third parties 我没有 - + https://amnezia.org/instructions/0_starter-guide @@ -2045,27 +2072,27 @@ and will not be shared or disclosed to the Amnezia or any third parties PageSetupWizardTextKey - + Connection key 连接授权码 - + A line that starts with vpn://... 以 vpn://... 开始的行 - + Key 授权码 - + Insert 插入 - + Continue 继续 @@ -2073,27 +2100,27 @@ and will not be shared or disclosed to the Amnezia or any third parties PageSetupWizardViewConfig - + New connection 新连接 - + Do not use connection code from public sources. It could be created to intercept your data. 请勿使用公共来源的连接码。它可以被创建来拦截您的数据。 - + Collapse content 折叠内容 - + Show content 显示内容 - + Connect 连接 @@ -2101,123 +2128,133 @@ and will not be shared or disclosed to the Amnezia or any third parties PageShare - + Save OpenVPN config 保存OpenVPN配置 - + Save WireGuard config 保存WireGuard配置 - + + Save AmneziaWG config + + + + Save ShadowSocks config - + Save Cloak config - + For the AmneziaVPN app AmneziaVPN 应用 - + OpenVpn native format OpenVPN原生格式 - + WireGuard native format WireGuard原生格式 - + + AmneziaWG native format + + + + ShadowSocks native format ShadowSocks原生格式 - + Cloak native format Cloak原生格式 - + Share VPN Access 共享 VPN 访问 - + Share full access to the server and VPN 共享服务器和VPN的完全访问权限 - + Use for your own devices, or share with those you trust to manage the server. 用于您自己的设备，或与您信任的人共享以管理服务器 - - + + Users 用户 - + Share VPN access without the ability to manage the server 共享 VPN 访问，无需管理服务器 - + Search - + Creation date: - + Rename - + Client name - + Save 保存 - + Revoke 撤销 - + Revoke the config for a user - %1? 撤销用户的配置- %1? - + The user will no longer be able to connect to your server. 该用户将无法再连接到您的服务器 - + Continue 继续 - + Cancel 取消 @@ -2230,7 +2267,7 @@ and will not be shared or disclosed to the Amnezia or any third parties 访问VPN - + Connection 连接 @@ -2259,8 +2296,8 @@ and will not be shared or disclosed to the Amnezia or any third parties 服务器 - - + + Server 服务器 @@ -2273,7 +2310,7 @@ and will not be shared or disclosed to the Amnezia or any third parties 访问配置文件的内容为: - + File with connection settings to 连接配置文件的内容为: @@ -2282,35 +2319,35 @@ and will not be shared or disclosed to the Amnezia or any third parties 协议 - - + + Protocol 协议 - + Connection to 连接到 - + Config revoked 配置已撤销 - + User name 用户名 - - + + Connection format 连接格式 - - + + Share 共享 @@ -2334,33 +2371,33 @@ and will not be shared or disclosed to the Amnezia or any third parties 如果您与其他人共享完全访问权限，他们可以从服务器中删除和添加协议和服务，这将导致VPN对所有用户的工作出现问题。 - + Server 服务器 - + Accessing 访问 - + File with accessing settings to 访问配置文件的内容为: - + Share 共享 - + Connection to 连接到 - + File with connection settings to 连接配置文件的内容为: @@ -2761,7 +2798,17 @@ and will not be shared or disclosed to the Amnezia or any third parties - + + Error when retrieving configuration from API + + + + + This config has already been added to the application + + + + ErrorCode: %1. @@ -2829,7 +2876,7 @@ and will not be shared or disclosed to the Amnezia or any third parties 该配置不包含任何用于连接到服务器的容器和凭据。 - + Internal error @@ -2865,9 +2912,8 @@ and will not be shared or disclosed to the Amnezia or any third parties ShadowSocks - 掩盖VPN流量，使其类似于正常的网络流量，但在一些高度审查的地区可能会被分析系统识别 - OpenVPN over Cloak - OpenVPN with masquerading as web traffic and protection against active-probing detection. Ideal for bypassing blocking in regions with the highest levels of censorship. - OpenVPN over Cloak - OpenVPN与VPN结合，伪装成Web流量，并保护免受主动探测的侦测。非常适合在具有最高审查水平的地区绕过封锁 + OpenVPN over Cloak - OpenVPN与VPN结合，伪装成Web流量，并保护免受主动探测的侦测。非常适合在具有最高审查水平的地区绕过封锁 @@ -2922,8 +2968,9 @@ WireGuard非常容易被阻挡，因为其独特的数据包签名。与一些 ShadowSocks - 混淆 VPN 流量，使其与正常的 Web 流量相似，但在一些审查力度高的地区可以被分析系统识别。 + OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probing detection. Ideal for bypassing blocking in regions with the highest levels of censorship. - OpenVPN over Cloak - OpenVPN与VPN结合，伪装成Web流量，并保护免受主动探测的侦测。非常适合在具有最高审查水平的地区绕过封锁 + OpenVPN over Cloak - OpenVPN与VPN结合，伪装成Web流量，并保护免受主动探测的侦测。非常适合在具有最高审查水平的地区绕过封锁 @@ -3185,7 +3232,7 @@ While it offers a blend of security, stability, and speed, it's essential t SelectLanguageDrawer - + Choose language 选择语言 @@ -3207,22 +3254,17 @@ While it offers a blend of security, stability, and speed, it's essential t SettingsController - - Software version - 软件版本 - - - + Backup file is corrupted 备份文件已损坏 - + All settings have been reset to default values 所配置恢复为默认值 - + Cached profiles cleared 缓存的配置文件已清除 @@ -3231,33 +3273,33 @@ While it offers a blend of security, stability, and speed, it's essential t ShareConnectionDrawer - + Save AmneziaVPN config 保存配置 - + Share 共享 - + Copy 拷贝 - - + + Copied 已拷贝 - + Copy config string 复制配置字符串 - + Show connection settings 显示连接配置 @@ -3266,7 +3308,7 @@ While it offers a blend of security, stability, and speed, it's essential t 展示内容 - + To read the QR code in the Amnezia app, select "Add server" → "I have data to connect" → "QR code, key or settings file" 要应用二维码到 Amnezia，请底部工具栏点击“+”→“连接方式”→“二维码、授权码或配置文件” @@ -3350,7 +3392,7 @@ While it offers a blend of security, stability, and speed, it's essential t TextFieldWithHeaderType - + The field can't be empty 输入不能为空 @@ -3462,12 +3504,12 @@ While it offers a blend of security, stability, and speed, it's essential t main2 - + Private key passphrase 私钥密码 - + Save 保存 diff --git a/client/ui/controllers/exportController.cpp b/client/ui/controllers/exportController.cpp index 0c328326..57d864e9 100644 --- a/client/ui/controllers/exportController.cpp +++ b/client/ui/controllers/exportController.cpp @@ -8,6 +8,7 @@ #include #include +#include "configurators/awg_configurator.h" #include "configurators/cloak_configurator.h" #include "configurators/openvpn_configurator.h" #include "configurators/shadowsocks_configurator.h" @@ -228,6 +229,45 @@ void ExportController::generateWireGuardConfig(const QString &clientName) emit exportConfigChanged(); } +void ExportController::generateAwgConfig(const QString &clientName) +{ + clearPreviousConfig(); + + int serverIndex = m_serversModel->getProcessedServerIndex(); + ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex); + + DockerContainer container = static_cast(m_containersModel->getCurrentlyProcessedContainerIndex()); + QJsonObject containerConfig = m_containersModel->getContainerConfig(container); + containerConfig.insert(config_key::container, ContainerProps::containerToString(container)); + + QString clientId; + ErrorCode errorCode = ErrorCode::NoError; + QString config = m_configurator->awgConfigurator->genAwgConfig(credentials, container, containerConfig, + clientId, &errorCode); + if (errorCode) { + emit exportErrorOccurred(errorString(errorCode)); + return; + } + config = m_configurator->processConfigWithExportSettings(serverIndex, container, Proto::Awg, config); + + auto configJson = QJsonDocument::fromJson(config.toUtf8()).object(); + QStringList lines = configJson.value(config_key::config).toString().replace("\r", "").split("\n"); + for (const QString &line : lines) { + m_config.append(line + "\n"); + } + + qrcodegen::QrCode qr = qrcodegen::QrCode::encodeText(m_config.toUtf8(), qrcodegen::QrCode::Ecc::LOW); + m_qrCodes << svgToBase64(QString::fromStdString(toSvgString(qr, 1))); + + errorCode = m_clientManagementModel->appendClient(clientId, clientName, container, credentials); + if (errorCode) { + emit exportErrorOccurred(errorString(errorCode)); + return; + } + + emit exportConfigChanged(); +} + void ExportController::generateShadowSocksConfig() { clearPreviousConfig(); diff --git a/client/ui/controllers/exportController.h b/client/ui/controllers/exportController.h index a6dc468b..e5bd1657 100644 --- a/client/ui/controllers/exportController.h +++ b/client/ui/controllers/exportController.h @@ -34,6 +34,7 @@ public slots: void generateConnectionConfig(const QString &clientName); void generateOpenVpnConfig(const QString &clientName); void generateWireGuardConfig(const QString &clientName); + void generateAwgConfig(const QString &clientName); void generateShadowSocksConfig(); void generateCloakConfig(); diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp index 99645cde..6ec55321 100644 --- a/client/ui/controllers/settingsController.cpp +++ b/client/ui/controllers/settingsController.cpp @@ -28,7 +28,7 @@ SettingsController::SettingsController(const QSharedPointer &serve m_sitesModel(sitesModel), m_settings(settings) { - m_appVersion = QString("%1: %2 (%3)").arg(tr("Software version"), QString(APP_VERSION), __DATE__); + m_appVersion = QString("%1 (%2, %3)").arg(QString(APP_VERSION), __DATE__, GIT_COMMIT_HASH); #ifdef Q_OS_ANDROID if (!m_settings->isScreenshotsEnabled()) { diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp index a4420255..3c72ee49 100644 --- a/client/ui/models/servers_model.cpp +++ b/client/ui/models/servers_model.cpp @@ -220,6 +220,11 @@ bool ServersModel::isDefaultServerCurrentlyProcessed() return m_defaultServerIndex == m_processedServerIndex; } +bool ServersModel::isDefaultServerFromApi() +{ + return qvariant_cast(data(m_defaultServerIndex, IsServerFromApiRole)); +} + bool ServersModel::isProcessedServerHasWriteAccess() { return qvariant_cast(data(m_processedServerIndex, HasWriteAccessRole)); @@ -249,7 +254,7 @@ void ServersModel::editServer(const QJsonObject &server, const int serverIndex) } updateContainersModel(); - if (isDefaultServerCurrentlyProcessed()) { + if (serverIndex == m_defaultServerIndex) { auto defaultContainer = qvariant_cast(getDefaultServerData("defaultContainer")); emit defaultServerDefaultContainerChanged(defaultContainer); } @@ -577,3 +582,18 @@ void ServersModel::setProcessedServerData(const QString roleString, const QVaria } +bool ServersModel::isDefaultServerDefaultContainerHasSplitTunneling() +{ + auto server = m_servers.at(m_defaultServerIndex).toObject(); + auto defaultContainer = ContainerProps::containerFromString(server.value(config_key::defaultContainer).toString()); + auto containerConfig = server.value(config_key::containers).toArray().at(defaultContainer).toObject(); + auto protocolConfig = containerConfig.value(ContainerProps::containerTypeToString(defaultContainer)).toObject(); + + if (defaultContainer == DockerContainer::Awg || defaultContainer == DockerContainer::WireGuard) { + return !(protocolConfig.value(config_key::last_config).toString().contains("AllowedIPs = 0.0.0.0/0, ::/0")); + } else if (defaultContainer == DockerContainer::Cloak || defaultContainer == DockerContainer::OpenVpn || defaultContainer == DockerContainer::ShadowSocks) { + return !(protocolConfig.value(config_key::last_config).toString().contains("redirect-gateway")); + } + + return false; +} diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h index 1adaebae..3e24e46c 100644 --- a/client/ui/models/servers_model.h +++ b/client/ui/models/servers_model.h @@ -48,6 +48,8 @@ public: Q_PROPERTY(QString defaultServerDefaultContainerName READ getDefaultServerDefaultContainerName NOTIFY defaultServerDefaultContainerChanged) Q_PROPERTY(QString defaultServerDescriptionCollapsed READ getDefaultServerDescriptionCollapsed NOTIFY defaultServerDefaultContainerChanged) Q_PROPERTY(QString defaultServerDescriptionExpanded READ getDefaultServerDescriptionExpanded NOTIFY defaultServerDefaultContainerChanged) + Q_PROPERTY(bool isDefaultServerDefaultContainerHasSplitTunneling READ isDefaultServerDefaultContainerHasSplitTunneling NOTIFY defaultServerDefaultContainerChanged) + Q_PROPERTY(bool isDefaultServerFromApi READ isDefaultServerFromApi NOTIFY defaultServerIndexChanged) Q_PROPERTY(int processedIndex READ getProcessedServerIndex WRITE setProcessedServerIndex NOTIFY processedServerIndexChanged) @@ -59,6 +61,7 @@ public slots: const QString getDefaultServerDescriptionExpanded(); const QString getDefaultServerDefaultContainerName(); bool isDefaultServerCurrentlyProcessed(); + bool isDefaultServerFromApi(); bool isProcessedServerHasWriteAccess(); bool isDefaultServerHasWriteAccess(); @@ -103,6 +106,8 @@ public slots: QVariant getProcessedServerData(const QString roleString); void setProcessedServerData(const QString roleString, const QVariant &value); + bool isDefaultServerDefaultContainerHasSplitTunneling(); + protected: QHash roleNames() const override; diff --git a/client/ui/models/sites_model.cpp b/client/ui/models/sites_model.cpp index f6cb9b13..96b6ca60 100644 --- a/client/ui/models/sites_model.cpp +++ b/client/ui/models/sites_model.cpp @@ -113,6 +113,7 @@ void SitesModel::toggleSplitTunneling(bool enabled) m_settings->setRouteMode(Settings::RouteMode::VpnAllSites); } m_isSplitTunnelingEnabled = enabled; + emit splitTunnelingToggled(); } QVector > SitesModel::getCurrentSites() diff --git a/client/ui/models/sites_model.h b/client/ui/models/sites_model.h index ad16b7a3..803b7fd1 100644 --- a/client/ui/models/sites_model.h +++ b/client/ui/models/sites_model.h @@ -22,6 +22,7 @@ public: QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; Q_PROPERTY(int routeMode READ getRouteMode WRITE setRouteMode NOTIFY routeModeChanged) + Q_PROPERTY(bool isTunnelingEnabled READ isSplitTunnelingEnabled NOTIFY splitTunnelingToggled) public slots: bool addSite(const QString &hostname, const QString &ip); @@ -38,6 +39,7 @@ public slots: signals: void routeModeChanged(); + void splitTunnelingToggled(); protected: QHash roleNames() const override; diff --git a/client/ui/qml/Components/HomeSplitTunnelingDrawer.qml b/client/ui/qml/Components/HomeSplitTunnelingDrawer.qml new file mode 100644 index 00000000..bc1f1008 --- /dev/null +++ b/client/ui/qml/Components/HomeSplitTunnelingDrawer.qml @@ -0,0 +1,92 @@ +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts + +import PageEnum 1.0 + +import "../Controls2" +import "../Controls2/TextTypes" +import "../Config" + +DrawerType2 { + id: root + + anchors.fill: parent + expandedHeight: parent.height * 0.7 + + expandedContent: ColumnLayout { + id: content + + anchors.top: parent.top + anchors.left: parent.left + anchors.right: parent.right + spacing: 0 + + Header2Type { + Layout.fillWidth: true + Layout.topMargin: 24 + Layout.rightMargin: 16 + Layout.leftMargin: 16 + Layout.bottomMargin: 16 + + headerText: qsTr("Split tunneling") + descriptionText: qsTr("Allows you to connect to some sites or applications through a VPN connection and bypass others") + } + + LabelWithButtonType { + Layout.fillWidth: true + Layout.topMargin: 16 + + visible: ServersModel.isDefaultServerDefaultContainerHasSplitTunneling && ServersModel.getDefaultServerData("isServerFromApi") + + text: qsTr("Split tunneling on the server") + descriptionText: qsTr("Enabled \nCan't be disabled for current server") + rightImageSource: "qrc:/images/controls/chevron-right.svg" + + clickedFunction: function() { +// PageController.goToPage(PageEnum.PageSettingsSplitTunneling) +// root.close() + } + } + + DividerType { + visible: ServersModel.isDefaultServerDefaultContainerHasSplitTunneling && ServersModel.getDefaultServerData("isServerFromApi") + } + + LabelWithButtonType { + Layout.fillWidth: true + Layout.topMargin: 16 + + enabled: ! ServersModel.isDefaultServerDefaultContainerHasSplitTunneling || !ServersModel.getDefaultServerData("isServerFromApi") + + text: qsTr("Site-based split tunneling") + descriptionText: enabled && SitesModel.isTunnelingEnabled ? qsTr("Enabled") : qsTr("Disabled") + rightImageSource: "qrc:/images/controls/chevron-right.svg" + + clickedFunction: function() { + PageController.goToPage(PageEnum.PageSettingsSplitTunneling) + root.close() + } + } + + DividerType { + } + + LabelWithButtonType { + Layout.fillWidth: true + visible: false + + text: qsTr("App-based split tunneling") + rightImageSource: "qrc:/images/controls/chevron-right.svg" + + clickedFunction: function() { +// PageController.goToPage(PageEnum.PageSetupWizardConfigSource) + root.close() + } + } + + DividerType { + visible: false + } + } +} diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml index c209c1ce..d816cd41 100644 --- a/client/ui/qml/Components/ShareConnectionDrawer.qml +++ b/client/ui/qml/Components/ShareConnectionDrawer.qml @@ -107,13 +107,6 @@ DrawerType2 { text: qsTr("Copy") imageSource: "qrc:/images/controls/copy.svg" - - clickedFunc: function() { - configText.selectAll() - configText.copy() - configText.select(0, 0) - PageController.showNotificationMessage(qsTr("Copied")) - } } BasicButtonType { @@ -132,13 +125,6 @@ DrawerType2 { text: qsTr("Copy config string") imageSource: "qrc:/images/controls/copy.svg" - - clickedFunc: function() { - nativeConfigString.selectAll() - nativeConfigString.copy() - nativeConfigString.select(0, 0) - PageController.showNotificationMessage(qsTr("Copied")) - } } BasicButtonType { @@ -201,7 +187,7 @@ DrawerType2 { anchors.topMargin: 16 backButtonFunction: function() { - configContentDrawer.open() + configContentDrawer.close() } } diff --git a/client/ui/qml/Controls2/BasicButtonType.qml b/client/ui/qml/Controls2/BasicButtonType.qml index 77d4b5fb..257486d6 100644 --- a/client/ui/qml/Controls2/BasicButtonType.qml +++ b/client/ui/qml/Controls2/BasicButtonType.qml @@ -21,6 +21,8 @@ Button { property int borderFocusedWidth: 1 property string imageSource + property string rightImageSource + property string leftImageColor: textColor property bool squareLeftSide: false @@ -118,7 +120,7 @@ Button { layer { enabled: true effect: ColorOverlay { - color: textColor + color: leftImageColor } } } @@ -131,6 +133,21 @@ Button { horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } + + Image { + Layout.preferredHeight: 20 + Layout.preferredWidth: 20 + + source: root.rightImageSource + visible: root.rightImageSource === "" ? false : true + + layer { + enabled: true + effect: ColorOverlay { + color: textColor + } + } + } } } diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml index 7b4e2601..e1ea6a4f 100644 --- a/client/ui/qml/Pages2/PageHome.qml +++ b/client/ui/qml/Pages2/PageHome.qml @@ -35,8 +35,45 @@ PageType { anchors.bottomMargin: drawer.collapsedHeight ConnectButton { + id: connectButton anchors.centerIn: parent } + + BasicButtonType { + anchors.horizontalCenter: parent.horizontalCenter + anchors.bottom: parent.bottom + anchors.bottomMargin: 34 + leftPadding: 16 + rightPadding: 16 + + implicitHeight: 36 + + defaultColor: "transparent" + hoveredColor: Qt.rgba(1, 1, 1, 0.08) + pressedColor: Qt.rgba(1, 1, 1, 0.12) + disabledColor: "#878B91" + textColor: "#878B91" + leftImageColor: "transparent" + borderWidth: 0 + + property bool isSplitTunnelingEnabled: SitesModel.isTunnelingEnabled || + (ServersModel.isDefaultServerDefaultContainerHasSplitTunneling && ServersModel.getDefaultServerData("isServerFromApi")) + + text: isSplitTunnelingEnabled ? qsTr("Split tunneling enabled") : qsTr("Split tunneling disabled") + + imageSource: isSplitTunnelingEnabled ? "qrc:/images/controls/split-tunneling.svg" : "" + rightImageSource: "qrc:/images/controls/chevron-down.svg" + + onClicked: { + homeSplitTunnelingDrawer.open() + } + + HomeSplitTunnelingDrawer { + id: homeSplitTunnelingDrawer + + parent: root + } + } } DrawerType2 { @@ -155,7 +192,7 @@ PageType { LabelTextType { id: expandedServersMenuDescription - Layout.bottomMargin: 24 + Layout.bottomMargin: ServersModel.isDefaultServerFromApi ? 69 : 24 Layout.fillWidth: true horizontalAlignment: Qt.AlignHCenter verticalAlignment: Qt.AlignVCenter @@ -166,6 +203,9 @@ PageType { Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter spacing: 8 + visible: !ServersModel.isDefaultServerFromApi + onVisibleChanged: expandedServersMenuDescription.Layout + DropDownType { id: containersDropDown diff --git a/client/ui/qml/Pages2/PageProtocolAwgSettings.qml b/client/ui/qml/Pages2/PageProtocolAwgSettings.qml index df9f0b9f..16946fdf 100644 --- a/client/ui/qml/Pages2/PageProtocolAwgSettings.qml +++ b/client/ui/qml/Pages2/PageProtocolAwgSettings.qml @@ -111,7 +111,7 @@ PageType { Layout.fillWidth: true Layout.topMargin: 16 - headerText: qsTr("Junk packet count") + headerText: "Jc - Junk packet count" textFieldText: junkPacketCount textField.validator: IntValidator { bottom: 0 } @@ -136,7 +136,7 @@ PageType { Layout.fillWidth: true Layout.topMargin: 16 - headerText: qsTr("Junk packet minimum size") + headerText: "Jmin - Junk packet minimum size" textFieldText: junkPacketMinSize textField.validator: IntValidator { bottom: 0 } @@ -156,7 +156,7 @@ PageType { Layout.fillWidth: true Layout.topMargin: 16 - headerText: qsTr("Junk packet maximum size") + headerText: "Jmax - Junk packet maximum size" textFieldText: junkPacketMaxSize textField.validator: IntValidator { bottom: 0 } @@ -176,7 +176,7 @@ PageType { Layout.fillWidth: true Layout.topMargin: 16 - headerText: qsTr("Init packet junk size") + headerText: "S1 - Init packet junk size" textFieldText: initPacketJunkSize textField.validator: IntValidator { bottom: 0 } @@ -196,7 +196,7 @@ PageType { Layout.fillWidth: true Layout.topMargin: 16 - headerText: qsTr("Response packet junk size") + headerText: "S2 - Response packet junk size" textFieldText: responsePacketJunkSize textField.validator: IntValidator { bottom: 0 } @@ -216,7 +216,7 @@ PageType { Layout.fillWidth: true Layout.topMargin: 16 - headerText: qsTr("Init packet magic header") + headerText: "H1 - Init packet magic header" textFieldText: initPacketMagicHeader textField.validator: IntValidator { bottom: 0 } @@ -236,7 +236,7 @@ PageType { Layout.fillWidth: true Layout.topMargin: 16 - headerText: qsTr("Response packet magic header") + headerText: "H2 - Response packet magic header" textFieldText: responsePacketMagicHeader textField.validator: IntValidator { bottom: 0 } @@ -256,7 +256,7 @@ PageType { Layout.fillWidth: true Layout.topMargin: 16 - headerText: qsTr("Transport packet magic header") + headerText: "H4 - Transport packet magic header" textFieldText: transportPacketMagicHeader textField.validator: IntValidator { bottom: 0 } @@ -276,7 +276,7 @@ PageType { Layout.fillWidth: true Layout.topMargin: 16 - headerText: qsTr("Underload packet magic header") + headerText: "H3 - Underload packet magic header" textFieldText: underloadPacketMagicHeader textField.validator: IntValidator { bottom: 0 } diff --git a/client/ui/qml/Pages2/PageSettingsAbout.qml b/client/ui/qml/Pages2/PageSettingsAbout.qml index b20c7440..b912e2cd 100644 --- a/client/ui/qml/Pages2/PageSettingsAbout.qml +++ b/client/ui/qml/Pages2/PageSettingsAbout.qml @@ -175,7 +175,7 @@ PageType { horizontalAlignment: Text.AlignHCenter - text: SettingsController.getAppVersion() + text: qsTr("Software version: %1").arg(SettingsController.getAppVersion()) color: "#878B91" } diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml index 372cd69e..af029b7b 100644 --- a/client/ui/qml/Pages2/PageSettingsApplication.qml +++ b/client/ui/qml/Pages2/PageSettingsApplication.qml @@ -84,6 +84,27 @@ PageType { visible: !GC.isMobile() } + SwitcherType { + visible: !GC.isMobile() + + Layout.fillWidth: true + Layout.margins: 16 + + text: qsTr("Auto connect") + descriptionText: qsTr("Connect to VPN on app start") + + checked: SettingsController.isAutoConnectEnabled() + onCheckedChanged: { + if (checked !== SettingsController.isAutoConnectEnabled()) { + SettingsController.toggleAutoConnect(checked) + } + } + } + + DividerType { + visible: !GC.isMobile() + } + SwitcherType { visible: !GC.isMobile() diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml index 3a0c5c3c..4d88b397 100644 --- a/client/ui/qml/Pages2/PageSettingsConnection.qml +++ b/client/ui/qml/Pages2/PageSettingsConnection.qml @@ -41,27 +41,6 @@ PageType { headerText: qsTr("Connection") } - SwitcherType { - visible: !GC.isMobile() - - Layout.fillWidth: true - Layout.margins: 16 - - text: qsTr("Auto connect") - descriptionText: qsTr("Connect to VPN on app start") - - checked: SettingsController.isAutoConnectEnabled() - onCheckedChanged: { - if (checked !== SettingsController.isAutoConnectEnabled()) { - SettingsController.toggleAutoConnect(checked) - } - } - } - - DividerType { - visible: !GC.isMobile() - } - SwitcherType { Layout.fillWidth: true Layout.margins: 16 diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml index 729a6e9d..1ce3cd64 100644 --- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml +++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml @@ -29,8 +29,14 @@ PageType { } Component.onCompleted: { - if (isServerFromApi) { + if (ConnectionController.isConnected) { + PageController.showNotificationMessage(qsTr("Cannot change split tunneling settings during active connection")) + root.pageEnabled = false + } else if (ServersModel.isDefaultServerDefaultContainerHasSplitTunneling && isServerFromApi) { PageController.showNotificationMessage(qsTr("Default server does not support split tunneling function")) + root.pageEnabled = false + } else { + root.pageEnabled = true } } @@ -108,7 +114,7 @@ PageType { Layout.fillWidth: true Layout.rightMargin: 16 - checked: SitesModel.isSplitTunnelingEnabled() + checked: SitesModel.isTunnelingEnabled onToggled: { SitesModel.toggleSplitTunneling(checked) selector.text = root.routeModesModel[getRouteModesModelIndex()].name diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml index cd012e27..cd7e7958 100644 --- a/client/ui/qml/Pages2/PageShare.qml +++ b/client/ui/qml/Pages2/PageShare.qml @@ -22,6 +22,7 @@ PageType { AmneziaConnection, OpenVpn, WireGuard, + Awg, ShadowSocks, Cloak } @@ -48,7 +49,10 @@ PageType { PageController.showBusyIndicator(true) switch (type) { - case PageShare.ConfigType.AmneziaConnection: ExportController.generateConnectionConfig(clientNameTextField.textFieldText); break; + case PageShare.ConfigType.AmneziaConnection: { + ExportController.generateConnectionConfig(clientNameTextField.textFieldText); + break; + } case PageShare.ConfigType.OpenVpn: { ExportController.generateOpenVpnConfig(clientNameTextField.textFieldText) shareConnectionDrawer.configCaption = qsTr("Save OpenVPN config") @@ -63,6 +67,13 @@ PageType { shareConnectionDrawer.configFileName = "amnezia_for_wireguard" break } + case PageShare.ConfigType.Awg: { + ExportController.generateAwgConfig(clientNameTextField.textFieldText) + shareConnectionDrawer.configCaption = qsTr("Save AmneziaWG config") + shareConnectionDrawer.configExtension = ".conf" + shareConnectionDrawer.configFileName = "amnezia_for_awg" + break + } case PageShare.ConfigType.ShadowSocks: { ExportController.generateShadowSocksConfig() shareConnectionDrawer.configCaption = qsTr("Save ShadowSocks config") @@ -110,6 +121,11 @@ PageType { property string name: qsTr("WireGuard native format") property var type: PageShare.ConfigType.WireGuard } + QtObject { + id: awgConnectionFormat + property string name: qsTr("AmneziaWG native format") + property var type: PageShare.ConfigType.Awg + } QtObject { id: shadowSocksConnectionFormat property string name: qsTr("ShadowSocks native format") @@ -402,6 +418,8 @@ PageType { root.connectionTypesModel.push(openVpnConnectionFormat) } else if (index === ContainerProps.containerFromString("amnezia-wireguard")) { root.connectionTypesModel.push(wireGuardConnectionFormat) + } else if (index === ContainerProps.containerFromString("amnezia-awg")) { + root.connectionTypesModel.push(awgConnectionFormat) } else if (index === ContainerProps.containerFromString("amnezia-shadowsocks")) { root.connectionTypesModel.push(openVpnConnectionFormat) root.connectionTypesModel.push(shadowSocksConnectionFormat) diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml index 38a8e0b8..dac9db93 100644 --- a/client/ui/qml/Pages2/PageStart.qml +++ b/client/ui/qml/Pages2/PageStart.qml @@ -44,6 +44,7 @@ PageType { function onClosePage() { tabBar.isServerInfoShow = tabBarStackView.currentItem.objectName !== PageController.getPagePath(PageEnum.PageSettingsServerInfo) + && tabBarStackView.currentItem.objectName !== PageController.getPagePath(PageEnum.PageSettingsSplitTunneling) if (tabBarStackView.depth <= 1) { return @@ -60,7 +61,7 @@ PageType { tabBarStackView.push(pagePath, { "objectName" : pagePath }, StackView.Immediate) } - tabBar.isServerInfoShow = page === PageEnum.PageSettingsServerInfo || tabBar.isServerInfoShow + tabBar.isServerInfoShow = page === PageEnum.PageSettingsServerInfo || PageEnum.PageSettingsSplitTunneling || tabBar.isServerInfoShow } function onGoToStartPage() { diff --git a/deploy/build_ios.sh b/deploy/build_ios.sh index 7f16b916..5dc11ff1 100755 --- a/deploy/build_ios.sh +++ b/deploy/build_ios.sh @@ -20,7 +20,7 @@ PLIST_NAME=$APP_NAME.plist # Search Qt if [ -z "${QT_VERSION+x}" ]; then - QT_VERSION=6.5.2; + QT_VERSION=6.6.2; QT_BIN_DIR=$HOME/Qt/$QT_VERSION/ios/bin fi diff --git a/deploy/build_linux.sh b/deploy/build_linux.sh index c90e781a..57217a1e 100755 --- a/deploy/build_linux.sh +++ b/deploy/build_linux.sh @@ -36,7 +36,7 @@ QMAKE_STASH_FILE=$PROJECT_DIR/.qmake_stash # Search Qt if [ -z "${QT_VERSION+x}" ]; then - QT_VERSION=5.15.2 + QT_VERSION=6.6.2 if [ -f /opt/Qt/$QT_VERSION/gcc_64/bin/qmake ]; then QT_BIN_DIR=/opt/Qt/$QT_VERSION/gcc_64/bin elif [ -f $HOME/Qt/$QT_VERSION/gcc_64/bin/qmake ]; then diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh index 0d64a9ec..5f6e9786 100755 --- a/deploy/build_macos.sh +++ b/deploy/build_macos.sh @@ -37,7 +37,7 @@ DMG_FILENAME=$PROJECT_DIR/${APP_NAME}.dmg # Search Qt if [ -z "${QT_VERSION+x}" ]; then -QT_VERSION=6.5.1; +QT_VERSION=6.4.3; QIF_VERSION=4.6 QT_BIN_DIR=$HOME/Qt/$QT_VERSION/macos/bin QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin @@ -146,7 +146,8 @@ if [ "${MAC_CERT_PW+x}" ]; then fi echo "Building DMG installer..." -hdiutil create -size 120mb -volname AmneziaVPN -srcfolder $BUILD_DIR/installer/$APP_NAME.app -ov -format UDZO $DMG_FILENAME +# Allow Terminal to make changes in Privacy & Security > App Management +hdiutil create -size 256mb -volname AmneziaVPN -srcfolder $BUILD_DIR/installer/$APP_NAME.app -ov -format UDZO $DMG_FILENAME if [ "${MAC_CERT_PW+x}" ]; then echo "Signing DMG installer..."