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

Merge branch 'feature/special-handshake' of github.com:amnezia-vpn/amnezia-client into HEAD

Browse source
This commit is contained in:
vladimir.kuznetsov 2025-07-05 11:11:45 +08:00
commit 416efaf082
14 changed files with 311 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/platforms/ios/ios_controller.mm
View file

@ -607,6 +607,8 @@ bool IosController::setupAwg()
wgConfig.insert(config_key::initPacketJunkSize, config[config_key::initPacketJunkSize]); wgConfig.insert(config_key::initPacketJunkSize, config[config_key::initPacketJunkSize]);
wgConfig.insert(config_key::responsePacketJunkSize, config[config_key::responsePacketJunkSize]); wgConfig.insert(config_key::responsePacketJunkSize, config[config_key::responsePacketJunkSize]);
wgConfig.insert(config_key::cookieReplyPacketJunkSize, config[config_key::cookieReplyPacketJunkSize]);
wgConfig.insert(config_key::transportPacketJunkSize, config[config_key::transportPacketJunkSize]);
wgConfig.insert(config_key::junkPacketCount, config[config_key::junkPacketCount]); wgConfig.insert(config_key::junkPacketCount, config[config_key::junkPacketCount]);
wgConfig.insert(config_key::junkPacketMinSize, config[config_key::junkPacketMinSize]); wgConfig.insert(config_key::junkPacketMinSize, config[config_key::junkPacketMinSize]);

44
client/translations/amneziavpn_ar_EG.ts
View file

@ -502,24 +502,24 @@ Can&apos;t be disabled for current server</source>
<context> <context>
<name>InstallController</name> <name>InstallController</name>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="168"/> <location filename="../ui/controllers/installController.cpp" line="198"/>
<source>%1 installed successfully. </source> <source>%1 installed successfully. </source>
<translation>%1 تم التثبيت بنجاح. </translation> <translation>%1 تم التثبيت بنجاح. </translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="170"/> <location filename="../ui/controllers/installController.cpp" line="201"/>
<source>%1 is already installed on the server. </source> <source>%1 is already installed on the server. </source>
<translation>%1 بالفعل مٌثبت علي الخادم. </translation> <translation>%1 بالفعل مٌثبت علي الخادم. </translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="190"/> <location filename="../ui/controllers/installController.cpp" line="222"/>
<source> <source>
Added containers that were already installed on the server</source> Added containers that were already installed on the server</source>
<translation> <translation>
تمت إضافة الحاويات التي كانت مٌثبتة بالفعل علي الخادم</translation> تمت إضافة الحاويات التي كانت مٌثبتة بالفعل علي الخادم</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="270"/> <location filename="../ui/controllers/installController.cpp" line="305"/>
<source> <source>
Already installed containers were found on the server. All installed containers have been added to the application</source> Already installed containers were found on the server. All installed containers have been added to the application</source>
<translation> <translation>
@ -527,47 +527,47 @@ Already installed containers were found on the server. All installed containers
تمت إضافة جميع الحاويات المٌثبتة إلي التطبيق</translation> تمت إضافة جميع الحاويات المٌثبتة إلي التطبيق</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="608"/> <location filename="../ui/controllers/installController.cpp" line="654"/>
<source>Settings updated successfully</source> <source>Settings updated successfully</source>
<translation>تم تحديث الاعدادات بنجاح</translation> <translation>تم تحديث الاعدادات بنجاح</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="625"/> <location filename="../ui/controllers/installController.cpp" line="671"/>
<source>Server &apos;%1&apos; was rebooted</source> <source>Server &apos;%1&apos; was rebooted</source>
<translation>تمت إعادة تشغيل الخادم%1</translation> <translation>تمت إعادة تشغيل الخادم%1</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="637"/> <location filename="../ui/controllers/installController.cpp" line="683"/>
<source>Server &apos;%1&apos; was removed</source> <source>Server &apos;%1&apos; was removed</source>
<translation>تمت إزالة الخادم &apos;%1&apos;</translation> <translation>تمت إزالة الخادم &apos;%1&apos;</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="648"/> <location filename="../ui/controllers/installController.cpp" line="694"/>
<source>All containers from server &apos;%1&apos; have been removed</source> <source>All containers from server &apos;%1&apos; have been removed</source>
<translation>قد تم حذفها &apos;%1&apos; جميع الحاويات من الخادم</translation> <translation>قد تم حذفها &apos;%1&apos; جميع الحاويات من الخادم</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="666"/> <location filename="../ui/controllers/installController.cpp" line="713"/>
<source>%1 has been removed from the server &apos;%2&apos;</source> <source>%1 has been removed from the server &apos;%2&apos;</source>
<translation>%1 تم حدف &apos;%2&apos; اسم الخادم</translation> <translation>%1 تم حدف &apos;%2&apos; اسم الخادم</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="675"/> <location filename="../ui/controllers/installController.cpp" line="722"/>
<source>Api config removed</source> <source>Api config removed</source>
<translation>تم حذف تكوين Api</translation> <translation>تم حذف تكوين Api</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="697"/> <location filename="../ui/controllers/installController.cpp" line="744"/>
<source>%1 cached profile cleared</source> <source>%1 cached profile cleared</source>
<translation>تم مسح ملف تعريف %1 المخزن مؤقتًا</translation> <translation>تم مسح ملف تعريف %1 المخزن مؤقتًا</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="836"/> <location filename="../ui/controllers/installController.cpp" line="887"/>
<source>Please login as the user</source> <source>Please login as the user</source>
<translation>من فضلك قم بتسجيل الدخول كمستخدم</translation> <translation>من فضلك قم بتسجيل الدخول كمستخدم</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="864"/> <location filename="../ui/controllers/installController.cpp" line="915"/>
<source>Server added successfully</source> <source>Server added successfully</source>
<translation>تمت إضافة الخادم بنجاح</translation> <translation>تمت إضافة الخادم بنجاح</translation>
</message> </message>
@ -852,7 +852,12 @@ Thank you for staying with us!</source>
<translation>منفذ</translation> <translation>منفذ</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="426"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="422"/>
<source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92) + S3 + cookie reply size (64) + S4 + transport packet size (32)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="428"/>
<source>All users with whom you shared a connection with will no longer be able to connect to it.</source> <source>All users with whom you shared a connection with will no longer be able to connect to it.</source>
<translation>جميع المستخدمين الذين شاركت معهم اتصال لن يكونو قادرين علي الاتصال مرة اخري.</translation> <translation>جميع المستخدمين الذين شاركت معهم اتصال لن يكونو قادرين علي الاتصال مرة اخري.</translation>
</message> </message>
@ -927,27 +932,26 @@ Thank you for staying with us!</source>
<translation>يجب أن تكون قيم الحقول H1-H4 فريدة</translation> <translation>يجب أن تكون قيم الحقول H1-H4 فريدة</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="420"/>
<source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)</source> <source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)</source>
<translation>يجب ألا تساوي قيمة الحقل S1 + حجم بدء الرسالة (148) S2 + حجم استجابة الرسالة (92)</translation> <translation type="vanished">يجب ألا تساوي قيمة الحقل S1 + حجم بدء الرسالة (148) S2 + حجم استجابة الرسالة (92)</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="425"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="427"/>
<source>Save settings?</source> <source>Save settings?</source>
<translation>احفظ الإعدادات؟</translation> <translation>احفظ الإعدادات؟</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="427"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="429"/>
<source>Continue</source> <source>Continue</source>
<translation>واصل</translation> <translation>واصل</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="428"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="430"/>
<source>Cancel</source> <source>Cancel</source>
<translation>إلغاء</translation> <translation>إلغاء</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="432"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="434"/>
<source>Unable change settings while there is an active connection</source> <source>Unable change settings while there is an active connection</source>
<translation>لا يمكن تغيير الإعدادات أثناء وجود اتصال نشط</translation> <translation>لا يمكن تغيير الإعدادات أثناء وجود اتصال نشط</translation>
</message> </message>

40
client/translations/amneziavpn_fa_IR.ts
View file

@ -507,71 +507,71 @@ Can&apos;t be disabled for current server</source>
<context> <context>
<name>InstallController</name> <name>InstallController</name>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="168"/> <location filename="../ui/controllers/installController.cpp" line="198"/>
<source>%1 installed successfully. </source> <source>%1 installed successfully. </source>
<translation>%1 با موفقیت نصب شد. </translation> <translation>%1 با موفقیت نصب شد. </translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="170"/> <location filename="../ui/controllers/installController.cpp" line="201"/>
<source>%1 is already installed on the server. </source> <source>%1 is already installed on the server. </source>
<translation>%1 در حال حاضر بر روی سرور نصب شده است. </translation> <translation>%1 در حال حاضر بر روی سرور نصب شده است. </translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="190"/> <location filename="../ui/controllers/installController.cpp" line="222"/>
<source> <source>
Added containers that were already installed on the server</source> Added containers that were already installed on the server</source>
<translation> <translation>
کانتینرهایی که بر روی سرور موجود بودند اضافه شدند</translation> کانتینرهایی که بر روی سرور موجود بودند اضافه شدند</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="270"/> <location filename="../ui/controllers/installController.cpp" line="305"/>
<source> <source>
Already installed containers were found on the server. All installed containers have been added to the application</source> Already installed containers were found on the server. All installed containers have been added to the application</source>
<translation> <translation>
کانتینرهای نصب شده بر روی سرور شناسایی شدند. تمام کانتینترهای نصب شده به نرم افزار اضافه شدند</translation> کانتینرهای نصب شده بر روی سرور شناسایی شدند. تمام کانتینترهای نصب شده به نرم افزار اضافه شدند</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="608"/> <location filename="../ui/controllers/installController.cpp" line="654"/>
<source>Settings updated successfully</source> <source>Settings updated successfully</source>
<translation>تنظیمات با موفقیت به‎روز‎رسانی شدند</translation> <translation>تنظیمات با موفقیت به‎روز‎رسانی شدند</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="625"/> <location filename="../ui/controllers/installController.cpp" line="671"/>
<source>Server &apos;%1&apos; was rebooted</source> <source>Server &apos;%1&apos; was rebooted</source>
<translation>سرور %1 راه اندازی مجدد شد</translation> <translation>سرور %1 راه اندازی مجدد شد</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="637"/> <location filename="../ui/controllers/installController.cpp" line="683"/>
<source>Server &apos;%1&apos; was removed</source> <source>Server &apos;%1&apos; was removed</source>
<translation>سرور %1 حذف شد</translation> <translation>سرور %1 حذف شد</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="648"/> <location filename="../ui/controllers/installController.cpp" line="694"/>
<source>All containers from server &apos;%1&apos; have been removed</source> <source>All containers from server &apos;%1&apos; have been removed</source>
<translation>تمام کانتینترها از سرور %1 حذف شدند</translation> <translation>تمام کانتینترها از سرور %1 حذف شدند</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="666"/> <location filename="../ui/controllers/installController.cpp" line="713"/>
<source>%1 has been removed from the server &apos;%2&apos;</source> <source>%1 has been removed from the server &apos;%2&apos;</source>
<translation>%1 از سرور %2 حذف شد</translation> <translation>%1 از سرور %2 حذف شد</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="675"/> <location filename="../ui/controllers/installController.cpp" line="722"/>
<source>Api config removed</source> <source>Api config removed</source>
<translation>پیکربندی API حذف شد.</translation> <translation>پیکربندی API حذف شد.</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="697"/> <location filename="../ui/controllers/installController.cpp" line="744"/>
<source>%1 cached profile cleared</source> <source>%1 cached profile cleared</source>
<translation>%1 پروفایل ذخیره شده پاک شد.</translation> <translation>%1 پروفایل ذخیره شده پاک شد.</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="836"/> <location filename="../ui/controllers/installController.cpp" line="887"/>
<source>Please login as the user</source> <source>Please login as the user</source>
<translation>لطفا به عنوان کاربر وارد شوید</translation> <translation>لطفا به عنوان کاربر وارد شوید</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="864"/> <location filename="../ui/controllers/installController.cpp" line="915"/>
<source>Server added successfully</source> <source>Server added successfully</source>
<translation>سرور با موفقیت اضافه شد</translation> <translation>سرور با موفقیت اضافه شد</translation>
</message> </message>
@ -864,7 +864,7 @@ Thank you for staying with us!</source>
<translation type="vanished">آیا میخواهید AmneziaWG از سرور حذف شود؟</translation> <translation type="vanished">آیا میخواهید AmneziaWG از سرور حذف شود؟</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="426"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="428"/>
<source>All users with whom you shared a connection with will no longer be able to connect to it.</source> <source>All users with whom you shared a connection with will no longer be able to connect to it.</source>
<translation>همه کاربرانی که با آن‌ها ارتباطی به اشتراک گذاشته‌اید دیگر قادر به اتصال به آن نخواهند بود.</translation> <translation>همه کاربرانی که با آن‌ها ارتباطی به اشتراک گذاشته‌اید دیگر قادر به اتصال به آن نخواهند بود.</translation>
</message> </message>
@ -939,27 +939,27 @@ Thank you for staying with us!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="420"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="422"/>
<source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)</source> <source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92) + S3 + cookie reply size (64) + S4 + transport packet size (32)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="425"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="427"/>
<source>Save settings?</source> <source>Save settings?</source>
<translation>تنظیمات را ذخیره کن?</translation> <translation>تنظیمات را ذخیره کن?</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="427"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="429"/>
<source>Continue</source> <source>Continue</source>
<translation>ادامه</translation> <translation>ادامه</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="428"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="430"/>
<source>Cancel</source> <source>Cancel</source>
<translation>کنسل</translation> <translation>کنسل</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="432"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="434"/>
<source>Unable change settings while there is an active connection</source> <source>Unable change settings while there is an active connection</source>
<translation>نمی‌توان تنظیمات را تغییر داد در حالی که اتصال فعال است.</translation> <translation>نمی‌توان تنظیمات را تغییر داد در حالی که اتصال فعال است.</translation>
</message> </message>

44
client/translations/amneziavpn_hi_IN.ts
View file

@ -483,71 +483,71 @@ Can&apos;t be disabled for current server</source>
<context> <context>
<name>InstallController</name> <name>InstallController</name>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="168"/> <location filename="../ui/controllers/installController.cpp" line="198"/>
<source>%1 installed successfully. </source> <source>%1 installed successfully. </source>
<translation>%1 सफलतापूर्वक स्थापित हुआ. </translation> <translation>%1 सफलतापूर्वक स्थापित हुआ. </translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="170"/> <location filename="../ui/controllers/installController.cpp" line="201"/>
<source>%1 is already installed on the server. </source> <source>%1 is already installed on the server. </source>
<translation>%1 पहले से ही सर्वर पर स्थापित है. </translation> <translation>%1 पहले से ही सर्वर पर स्थापित है. </translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="190"/> <location filename="../ui/controllers/installController.cpp" line="222"/>
<source> <source>
Added containers that were already installed on the server</source> Added containers that were already installed on the server</source>
<translation> <translation>
सर्वर पर पहले से स्थापित कंटेनर जोड़े गए</translation> सर्वर पर पहले से स्थापित कंटेनर जोड़े गए</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="270"/> <location filename="../ui/controllers/installController.cpp" line="305"/>
<source> <source>
Already installed containers were found on the server. All installed containers have been added to the application</source> Already installed containers were found on the server. All installed containers have been added to the application</source>
<translation> <translation>
सर्वर पर पहले से स्थापित कंटेनर पाए गए। सभी स्थापित कंटेनरों को एप्लिकेशन में जोड़ दिया गया है</translation> सर्वर पर पहले से स्थापित कंटेनर पाए गए। सभी स्थापित कंटेनरों को एप्लिकेशन में जोड़ दिया गया है</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="608"/> <location filename="../ui/controllers/installController.cpp" line="654"/>
<source>Settings updated successfully</source> <source>Settings updated successfully</source>
<translation>सेटिंग्स सफलतापूर्वक अपडेट हो गईं</translation> <translation>सेटिंग्स सफलतापूर्वक अपडेट हो गईं</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="625"/> <location filename="../ui/controllers/installController.cpp" line="671"/>
<source>Server &apos;%1&apos; was rebooted</source> <source>Server &apos;%1&apos; was rebooted</source>
<translation>सर्वर &apos;%1&apos; रीबूट किया गया था</translation> <translation>सर्वर &apos;%1&apos; रीबूट किया गया था</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="637"/> <location filename="../ui/controllers/installController.cpp" line="683"/>
<source>Server &apos;%1&apos; was removed</source> <source>Server &apos;%1&apos; was removed</source>
<translation>सर्वर &apos;%1&apos; रीबूट किया गया था</translation> <translation>सर्वर &apos;%1&apos; रीबूट किया गया था</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="648"/> <location filename="../ui/controllers/installController.cpp" line="694"/>
<source>All containers from server &apos;%1&apos; have been removed</source> <source>All containers from server &apos;%1&apos; have been removed</source>
<translation>सर्वर &apos;%1&apos; से सभी कंटेनर हटा दिए गए हैं</translation> <translation>सर्वर &apos;%1&apos; से सभी कंटेनर हटा दिए गए हैं</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="666"/> <location filename="../ui/controllers/installController.cpp" line="713"/>
<source>%1 has been removed from the server &apos;%2&apos;</source> <source>%1 has been removed from the server &apos;%2&apos;</source>
<translation>%1 को सर्वर &apos;%2&apos; से हटा दिया गया है</translation> <translation>%1 को सर्वर &apos;%2&apos; से हटा दिया गया है</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="675"/> <location filename="../ui/controllers/installController.cpp" line="722"/>
<source>Api config removed</source> <source>Api config removed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="697"/> <location filename="../ui/controllers/installController.cpp" line="744"/>
<source>%1 cached profile cleared</source> <source>%1 cached profile cleared</source>
<translation>%1 कैश्ड प्रोफ़ाइल साफ़ की गई</translation> <translation>%1 कैश्ड प्रोफ़ाइल साफ़ की गई</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="836"/> <location filename="../ui/controllers/installController.cpp" line="887"/>
<source>Please login as the user</source> <source>Please login as the user</source>
<translation>कृपया उपयोगकर्ता के रूप में लॉगिन करें</translation> <translation>कृपया उपयोगकर्ता के रूप में लॉगिन करें</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="864"/> <location filename="../ui/controllers/installController.cpp" line="915"/>
<source>Server added successfully</source> <source>Server added successfully</source>
<translation>सर्वर सफलतापूर्वक जोड़ा गया</translation> <translation>सर्वर सफलतापूर्वक जोड़ा गया</translation>
</message> </message>
@ -839,27 +839,26 @@ Thank you for staying with us!</source>
<translation>H1-H4 फ़ील्ड का मान अद्वितीय होना चाहिए</translation> <translation>H1-H4 फ़ील्ड का मान अद्वितीय होना चाहिए</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="420"/>
<source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)</source> <source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)</source>
<translation>फ़ील्ड S1 + संदेश आरंभ आकार (148) का मान S2 + संदेश प्रतिक्रिया आकार (92) के बराबर नहीं होना चाहिए</translation> <translation type="vanished">फ़ील्ड S1 + संदेश आरंभ आकार (148) का मान S2 + संदेश प्रतिक्रिया आकार (92) के बराबर नहीं होना चाहिए</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="425"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="427"/>
<source>Save settings?</source> <source>Save settings?</source>
<translation>सेटिंग्स सेव करें?</translation> <translation>सेटिंग्स सेव करें?</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="426"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="428"/>
<source>All users with whom you shared a connection with will no longer be able to connect to it.</source> <source>All users with whom you shared a connection with will no longer be able to connect to it.</source>
<translation>वे सभी उपयोगकर्ता जिनके साथ आपने कनेक्शन साझा किया था, वे अब इससे कनेक्ट नहीं हो पाएंगे.</translation> <translation>वे सभी उपयोगकर्ता जिनके साथ आपने कनेक्शन साझा किया था, वे अब इससे कनेक्ट नहीं हो पाएंगे.</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="432"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="434"/>
<source>Unable change settings while there is an active connection</source> <source>Unable change settings while there is an active connection</source>
<translation>सक्रिय कनेक्शन होने पर सेटिंग बदलने में असमर्थ</translation> <translation>सक्रिय कनेक्शन होने पर सेटिंग बदलने में असमर्थ</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="427"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="429"/>
<source>Continue</source> <source>Continue</source>
<translation>जारी रखना</translation> <translation>जारी रखना</translation>
</message> </message>
@ -919,7 +918,12 @@ Thank you for staying with us!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="428"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="422"/>
<source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92) + S3 + cookie reply size (64) + S4 + transport packet size (32)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="430"/>
<source>Cancel</source> <source>Cancel</source>
<translation>रद्द करना</translation> <translation>रद्द करना</translation>
</message> </message>

44
client/translations/amneziavpn_my_MM.ts
View file

@ -503,71 +503,71 @@ Can&apos;t be disabled for current server</source>
<context> <context>
<name>InstallController</name> <name>InstallController</name>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="168"/> <location filename="../ui/controllers/installController.cpp" line="198"/>
<source>%1 installed successfully. </source> <source>%1 installed successfully. </source>
<translation>%1 ကို အောင်မြင်စွာ ထည့်သွင်းပြီးပါပြီ. </translation> <translation>%1 ကို အောင်မြင်စွာ ထည့်သွင်းပြီးပါပြီ. </translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="170"/> <location filename="../ui/controllers/installController.cpp" line="201"/>
<source>%1 is already installed on the server. </source> <source>%1 is already installed on the server. </source>
<translation>%1 ကို ဆာဗာတွင် ထည့်သွင်းပြီးဖြစ်သည်. </translation> <translation>%1 ကို ဆာဗာတွင် ထည့်သွင်းပြီးဖြစ်သည်. </translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="190"/> <location filename="../ui/controllers/installController.cpp" line="222"/>
<source> <source>
Added containers that were already installed on the server</source> Added containers that were already installed on the server</source>
<translation> <translation>
ဆာဗာတွင် ထည့်သွင်းပြီးသား ကွန်တိန်နာများကို ပေါင်းထည့်ပြီးပါပြီ။</translation> ဆာဗာတွင် ထည့်သွင်းပြီးသား ကွန်တိန်နာများကို ပေါင်းထည့်ပြီးပါပြီ။</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="270"/> <location filename="../ui/controllers/installController.cpp" line="305"/>
<source> <source>
Already installed containers were found on the server. All installed containers have been added to the application</source> Already installed containers were found on the server. All installed containers have been added to the application</source>
<translation> <translation>
ထည့်သွင်းပြီးသား ကွန်တိန်နာများကို ဆာဗာပေါ်တွင် တွေ့ရှိခဲ့သည်။ ထည့်သွင်းထားသည့် ကွန်တိန်နာအားလုံးကို အပလီကေးရှင်းထဲသို့ ပေါင်းထည့်ပြီးပါပြီ။</translation> ထည့်သွင်းပြီးသား ကွန်တိန်နာများကို ဆာဗာပေါ်တွင် တွေ့ရှိခဲ့သည်။ ထည့်သွင်းထားသည့် ကွန်တိန်နာအားလုံးကို အပလီကေးရှင်းထဲသို့ ပေါင်းထည့်ပြီးပါပြီ။</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="608"/> <location filename="../ui/controllers/installController.cpp" line="654"/>
<source>Settings updated successfully</source> <source>Settings updated successfully</source>
<translation>ဆက်တင်များကို အောင်မြင်စွာ အပ်ဒိတ်လုပ်ပြီးပါပြီ။</translation> <translation>ဆက်တင်များကို အောင်မြင်စွာ အပ်ဒိတ်လုပ်ပြီးပါပြီ။</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="625"/> <location filename="../ui/controllers/installController.cpp" line="671"/>
<source>Server &apos;%1&apos; was rebooted</source> <source>Server &apos;%1&apos; was rebooted</source>
<translation>ဆာဗာ &apos;%1&apos; ကို ပြန်လည်စတင်ခဲ့သည်။</translation> <translation>ဆာဗာ &apos;%1&apos; ကို ပြန်လည်စတင်ခဲ့သည်။</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="637"/> <location filename="../ui/controllers/installController.cpp" line="683"/>
<source>Server &apos;%1&apos; was removed</source> <source>Server &apos;%1&apos; was removed</source>
<translation>ဆာဗာ &apos;%1&apos; ကို ဖယ်ရှားခဲ့သည်။</translation> <translation>ဆာဗာ &apos;%1&apos; ကို ဖယ်ရှားခဲ့သည်။</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="648"/> <location filename="../ui/controllers/installController.cpp" line="694"/>
<source>All containers from server &apos;%1&apos; have been removed</source> <source>All containers from server &apos;%1&apos; have been removed</source>
<translation>ဆာဗာ &apos;%1&apos; မှ ကွန်တိန်နာအားလုံးကို ဖယ်ရှားလိုက်ပါပြီ။</translation> <translation>ဆာဗာ &apos;%1&apos; မှ ကွန်တိန်နာအားလုံးကို ဖယ်ရှားလိုက်ပါပြီ။</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="666"/> <location filename="../ui/controllers/installController.cpp" line="713"/>
<source>%1 has been removed from the server &apos;%2&apos;</source> <source>%1 has been removed from the server &apos;%2&apos;</source>
<translation>%1 ကို ဆာဗာ &apos;%2&apos; မှ ဖယ်ရှားလိုက်ပါပြီ</translation> <translation>%1 ကို ဆာဗာ &apos;%2&apos; မှ ဖယ်ရှားလိုက်ပါပြီ</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="675"/> <location filename="../ui/controllers/installController.cpp" line="722"/>
<source>Api config removed</source> <source>Api config removed</source>
<translation>Api config ကိုဖယ်ရှားလိုက်သည်</translation> <translation>Api config ကိုဖယ်ရှားလိုက်သည်</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="697"/> <location filename="../ui/controllers/installController.cpp" line="744"/>
<source>%1 cached profile cleared</source> <source>%1 cached profile cleared</source>
<translation>ကက်ရှ်လုပ်ထားတဲ့ ပရိုဖိုင် %1 ခုကို ရှင်းပြီးပါပြီ</translation> <translation>ကက်ရှ်လုပ်ထားတဲ့ ပရိုဖိုင် %1 ခုကို ရှင်းပြီးပါပြီ</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="836"/> <location filename="../ui/controllers/installController.cpp" line="887"/>
<source>Please login as the user</source> <source>Please login as the user</source>
<translation>အသုံးပြုသူအဖြစ် log in ဝင်ရောက်ပါ</translation> <translation>အသုံးပြုသူအဖြစ် log in ဝင်ရောက်ပါ</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="864"/> <location filename="../ui/controllers/installController.cpp" line="915"/>
<source>Server added successfully</source> <source>Server added successfully</source>
<translation>ဆာဗာကို အောင်မြင်စွာ ထည့်သွင်းပြီးပါပြီ</translation> <translation>ဆာဗာကို အောင်မြင်စွာ ထည့်သွင်းပြီးပါပြီ</translation>
</message> </message>
@ -856,7 +856,7 @@ Thank you for staying with us!</source>
<translation type="vanished">MTU</translation> <translation type="vanished">MTU</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="426"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="428"/>
<source>All users with whom you shared a connection with will no longer be able to connect to it.</source> <source>All users with whom you shared a connection with will no longer be able to connect to it.</source>
<translation>သင်နှင့်အတူချိတ်ဆက်မှုတစ်ခုကို မျှဝေထားသည့် အသုံးပြုသူအားလုံး ချိတ်ဆက်နိုင်တော့မည်မဟုတ်ပါ.</translation> <translation>သင်နှင့်အတူချိတ်ဆက်မှုတစ်ခုကို မျှဝေထားသည့် အသုံးပြုသူအားလုံး ချိတ်ဆက်နိုင်တော့မည်မဟုတ်ပါ.</translation>
</message> </message>
@ -920,6 +920,11 @@ Thank you for staying with us!</source>
<source>H4 - Transport packet magic header</source> <source>H4 - Transport packet magic header</source>
<translation>H4 - Transport packet magic header</translation> <translation>H4 - Transport packet magic header</translation>
</message> </message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="422"/>
<source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92) + S3 + cookie reply size (64) + S4 + transport packet size (32)</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="336"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="336"/>
<source>H3 - Underload packet magic header</source> <source>H3 - Underload packet magic header</source>
@ -931,27 +936,26 @@ Thank you for staying with us!</source>
<translation>H1-H4 အကွက်များ၏ တန်ဖိုးများသည် အခြားတန်ဖိုးများနှင့်မတူ တမူထူးခြားနေရပါမည်</translation> <translation>H1-H4 အကွက်များ၏ တန်ဖိုးများသည် အခြားတန်ဖိုးများနှင့်မတူ တမူထူးခြားနေရပါမည်</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="420"/>
<source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)</source> <source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)</source>
<translation>အကွက် S1 + မက်ဆေ့ချ် စတင်ခြင်း အရွယ်အစား (148) ၏ တန်ဖိုးသည် S2 + မက်ဆေ့ချ် တုံ့ပြန်မှု အရွယ်အစား (92) နှင့် မညီမျှရပါ</translation> <translation type="vanished">အကွက် S1 + မက်ဆေ့ချ် စတင်ခြင်း အရွယ်အစား (148) ၏ တန်ဖိုးသည် S2 + မက်ဆေ့ချ် တုံ့ပြန်မှု အရွယ်အစား (92) နှင့် မညီမျှရပါ</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="425"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="427"/>
<source>Save settings?</source> <source>Save settings?</source>
<translation>ဆက်တင်များကို သိမ်းဆည်းမည်လား?</translation> <translation>ဆက်တင်များကို သိမ်းဆည်းမည်လား?</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="427"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="429"/>
<source>Continue</source> <source>Continue</source>
<translation>ဆက်လက်လုပ်ဆောင်မည်</translation> <translation>ဆက်လက်လုပ်ဆောင်မည်</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="428"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="430"/>
<source>Cancel</source> <source>Cancel</source>
<translation>ပယ်ဖျက်မည်</translation> <translation>ပယ်ဖျက်မည်</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="432"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="434"/>
<source>Unable change settings while there is an active connection</source> <source>Unable change settings while there is an active connection</source>
<translation>လက်ရှိချိတ်ဆက်မှုတစ်ခုရှိနေချိန်တွင် ဆက်တင်များကို ပြောင်းလဲ၍မရပါ</translation> <translation>လက်ရှိချိတ်ဆက်မှုတစ်ခုရှိနေချိန်တွင် ဆက်တင်များကို ပြောင်းလဲ၍မရပါ</translation>
</message> </message>

44
client/translations/amneziavpn_ru_RU.ts
View file

@ -454,71 +454,71 @@ Can&apos;t be disabled for current server</source>
<context> <context>
<name>InstallController</name> <name>InstallController</name>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="168"/> <location filename="../ui/controllers/installController.cpp" line="198"/>
<source>%1 installed successfully. </source> <source>%1 installed successfully. </source>
<translation>%1 успешно установлен. </translation> <translation>%1 успешно установлен. </translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="170"/> <location filename="../ui/controllers/installController.cpp" line="201"/>
<source>%1 is already installed on the server. </source> <source>%1 is already installed on the server. </source>
<translation>%1 уже установлен на сервер. </translation> <translation>%1 уже установлен на сервер. </translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="190"/> <location filename="../ui/controllers/installController.cpp" line="222"/>
<source> <source>
Added containers that were already installed on the server</source> Added containers that were already installed on the server</source>
<translation> <translation>
Добавлены сервисы и протоколы, которые были ранее установлены на сервер</translation> Добавлены сервисы и протоколы, которые были ранее установлены на сервер</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="270"/> <location filename="../ui/controllers/installController.cpp" line="305"/>
<source> <source>
Already installed containers were found on the server. All installed containers have been added to the application</source> Already installed containers were found on the server. All installed containers have been added to the application</source>
<translation> <translation>
На сервере обнаружены установленные протоколы и сервисы. Все они были добавлены в приложение</translation> На сервере обнаружены установленные протоколы и сервисы. Все они были добавлены в приложение</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="608"/> <location filename="../ui/controllers/installController.cpp" line="654"/>
<source>Settings updated successfully</source> <source>Settings updated successfully</source>
<translation>Настройки успешно обновлены</translation> <translation>Настройки успешно обновлены</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="625"/> <location filename="../ui/controllers/installController.cpp" line="671"/>
<source>Server &apos;%1&apos; was rebooted</source> <source>Server &apos;%1&apos; was rebooted</source>
<translation>Сервер &apos;%1&apos; был перезагружен</translation> <translation>Сервер &apos;%1&apos; был перезагружен</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="637"/> <location filename="../ui/controllers/installController.cpp" line="683"/>
<source>Server &apos;%1&apos; was removed</source> <source>Server &apos;%1&apos; was removed</source>
<translation>Сервер &apos;%1&apos; был удален</translation> <translation>Сервер &apos;%1&apos; был удален</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="648"/> <location filename="../ui/controllers/installController.cpp" line="694"/>
<source>All containers from server &apos;%1&apos; have been removed</source> <source>All containers from server &apos;%1&apos; have been removed</source>
<translation>Все протоколы и сервисы были удалены с сервера &apos;%1&apos;</translation> <translation>Все протоколы и сервисы были удалены с сервера &apos;%1&apos;</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="666"/> <location filename="../ui/controllers/installController.cpp" line="713"/>
<source>%1 has been removed from the server &apos;%2&apos;</source> <source>%1 has been removed from the server &apos;%2&apos;</source>
<translation>%1 был удален с сервера &apos;%2&apos;</translation> <translation>%1 был удален с сервера &apos;%2&apos;</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="675"/> <location filename="../ui/controllers/installController.cpp" line="722"/>
<source>Api config removed</source> <source>Api config removed</source>
<translation>Конфигурация API удалена</translation> <translation>Конфигурация API удалена</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="697"/> <location filename="../ui/controllers/installController.cpp" line="744"/>
<source>%1 cached profile cleared</source> <source>%1 cached profile cleared</source>
<translation>%1 закэшированный профиль очищен</translation> <translation>%1 закэшированный профиль очищен</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="836"/> <location filename="../ui/controllers/installController.cpp" line="887"/>
<source>Please login as the user</source> <source>Please login as the user</source>
<translation>Пожалуйста, войдите в систему от имени пользователя</translation> <translation>Пожалуйста, войдите в систему от имени пользователя</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="864"/> <location filename="../ui/controllers/installController.cpp" line="915"/>
<source>Server added successfully</source> <source>Server added successfully</source>
<translation>Сервер успешно добавлен</translation> <translation>Сервер успешно добавлен</translation>
</message> </message>
@ -788,7 +788,12 @@ Thank you for staying with us!</source>
<translation>Порт</translation> <translation>Порт</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="426"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="422"/>
<source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92) + S3 + cookie reply size (64) + S4 + transport packet size (32)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="428"/>
<source>All users with whom you shared a connection with will no longer be able to connect to it.</source> <source>All users with whom you shared a connection with will no longer be able to connect to it.</source>
<translation>Все пользователи, с которыми вы поделились конфигурацией вашего VPN, больше не смогут к нему подключаться.</translation> <translation>Все пользователи, с которыми вы поделились конфигурацией вашего VPN, больше не смогут к нему подключаться.</translation>
</message> </message>
@ -863,27 +868,26 @@ Thank you for staying with us!</source>
<translation>Значения в полях H1-H4 должны быть уникальными</translation> <translation>Значения в полях H1-H4 должны быть уникальными</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="420"/>
<source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)</source> <source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)</source>
<translation>Значение в поле S1 + размер инициации сообщения (148) не должно равняться значению в поле S2 + размер ответа на сообщение (92)</translation> <translation type="vanished">Значение в поле S1 + размер инициации сообщения (148) не должно равняться значению в поле S2 + размер ответа на сообщение (92)</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="425"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="427"/>
<source>Save settings?</source> <source>Save settings?</source>
<translation>Сохранить настройки?</translation> <translation>Сохранить настройки?</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="427"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="429"/>
<source>Continue</source> <source>Continue</source>
<translation>Продолжить</translation> <translation>Продолжить</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="428"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="430"/>
<source>Cancel</source> <source>Cancel</source>
<translation>Отменить</translation> <translation>Отменить</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="432"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="434"/>
<source>Unable change settings while there is an active connection</source> <source>Unable change settings while there is an active connection</source>
<translation>Невозможно изменить настройки во время активного соединения</translation> <translation>Невозможно изменить настройки во время активного соединения</translation>
</message> </message>

46
client/translations/amneziavpn_uk_UA.ts
View file

@ -534,70 +534,70 @@ Can&apos;t be disabled for current server</source>
<context> <context>
<name>InstallController</name> <name>InstallController</name>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="168"/> <location filename="../ui/controllers/installController.cpp" line="198"/>
<source>%1 installed successfully. </source> <source>%1 installed successfully. </source>
<translation>%1 встановлено. </translation> <translation>%1 встановлено. </translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="170"/> <location filename="../ui/controllers/installController.cpp" line="201"/>
<source>%1 is already installed on the server. </source> <source>%1 is already installed on the server. </source>
<translation>%1 вже встановлено на сервері. </translation> <translation>%1 вже встановлено на сервері. </translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="190"/> <location filename="../ui/controllers/installController.cpp" line="222"/>
<source> <source>
Added containers that were already installed on the server</source> Added containers that were already installed on the server</source>
<translation>Додані сервіси і протоколи, які були раніше встановлені на сервері</translation> <translation>Додані сервіси і протоколи, які були раніше встановлені на сервері</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="270"/> <location filename="../ui/controllers/installController.cpp" line="305"/>
<source> <source>
Already installed containers were found on the server. All installed containers have been added to the application</source> Already installed containers were found on the server. All installed containers have been added to the application</source>
<translation> <translation>
На сервері знайдені сервіси та протоколи, всі вони додані в застосунок</translation> На сервері знайдені сервіси та протоколи, всі вони додані в застосунок</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="608"/> <location filename="../ui/controllers/installController.cpp" line="654"/>
<source>Settings updated successfully</source> <source>Settings updated successfully</source>
<translation>Налаштування оновлено</translation> <translation>Налаштування оновлено</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="625"/> <location filename="../ui/controllers/installController.cpp" line="671"/>
<source>Server &apos;%1&apos; was rebooted</source> <source>Server &apos;%1&apos; was rebooted</source>
<translation>Сервер &apos;%1&apos; перезавантажено</translation> <translation>Сервер &apos;%1&apos; перезавантажено</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="637"/> <location filename="../ui/controllers/installController.cpp" line="683"/>
<source>Server &apos;%1&apos; was removed</source> <source>Server &apos;%1&apos; was removed</source>
<translation>Сервер &apos;%1&apos; був видалений</translation> <translation>Сервер &apos;%1&apos; був видалений</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="648"/> <location filename="../ui/controllers/installController.cpp" line="694"/>
<source>All containers from server &apos;%1&apos; have been removed</source> <source>All containers from server &apos;%1&apos; have been removed</source>
<translation>Всі сервіси та протоколи були видалені з сервера &apos;%1&apos;</translation> <translation>Всі сервіси та протоколи були видалені з сервера &apos;%1&apos;</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="666"/> <location filename="../ui/controllers/installController.cpp" line="713"/>
<source>%1 has been removed from the server &apos;%2&apos;</source> <source>%1 has been removed from the server &apos;%2&apos;</source>
<translation>%1 був видалений з сервера &apos;%2&apos;</translation> <translation>%1 був видалений з сервера &apos;%2&apos;</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="675"/> <location filename="../ui/controllers/installController.cpp" line="722"/>
<source>Api config removed</source> <source>Api config removed</source>
<translation>Конфігурацію API видалено</translation> <translation>Конфігурацію API видалено</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="697"/> <location filename="../ui/controllers/installController.cpp" line="744"/>
<source>%1 cached profile cleared</source> <source>%1 cached profile cleared</source>
<translation>Кешований профіль %1 очищено</translation> <translation>Кешований профіль %1 очищено</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="836"/> <location filename="../ui/controllers/installController.cpp" line="887"/>
<source>Please login as the user</source> <source>Please login as the user</source>
<translation>Буль-ласка, увійдіть в систему від імені користувача</translation> <translation>Буль-ласка, увійдіть в систему від імені користувача</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="864"/> <location filename="../ui/controllers/installController.cpp" line="915"/>
<source>Server added successfully</source> <source>Server added successfully</source>
<translation>Сервер додано</translation> <translation>Сервер додано</translation>
</message> </message>
@ -952,22 +952,26 @@ Thank you for staying with us!</source>
<translation>Значення полів H1-H4 мають бути унікальними</translation> <translation>Значення полів H1-H4 мають бути унікальними</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="420"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="422"/>
<source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)</source> <source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92) + S3 + cookie reply size (64) + S4 + transport packet size (32)</source>
<translation>Значення поля S1 + розмір повідомлення ініціалізації (148) не має бути рівним значенню S2 + розмір повідомлення відповіді (92)</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="425"/> <source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)</source>
<translation type="vanished">Значення поля S1 + розмір повідомлення ініціалізації (148) не має бути рівним значенню S2 + розмір повідомлення відповіді (92)</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="427"/>
<source>Save settings?</source> <source>Save settings?</source>
<translation>Зберегти налаштування?</translation> <translation>Зберегти налаштування?</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="426"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="428"/>
<source>All users with whom you shared a connection with will no longer be able to connect to it.</source> <source>All users with whom you shared a connection with will no longer be able to connect to it.</source>
<translation>Усі користувачі, з якими ви поділилися підключенням, більше не зможуть підключитися до нього.</translation> <translation>Усі користувачі, з якими ви поділилися підключенням, більше не зможуть підключитися до нього.</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="432"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="434"/>
<source>Unable change settings while there is an active connection</source> <source>Unable change settings while there is an active connection</source>
<translation>Неможливо змінити налаштування, поки є активне підключення</translation> <translation>Неможливо змінити налаштування, поки є активне підключення</translation>
</message> </message>
@ -988,12 +992,12 @@ Thank you for staying with us!</source>
<translation type="vanished">Користувачі, з якими ви поділились цим протоколм, більше не зможуть до нього підключитись.</translation> <translation type="vanished">Користувачі, з якими ви поділились цим протоколм, більше не зможуть до нього підключитись.</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="427"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="429"/>
<source>Continue</source> <source>Continue</source>
<translation>Продовжити</translation> <translation>Продовжити</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="428"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="430"/>
<source>Cancel</source> <source>Cancel</source>
<translation>Відмінити</translation> <translation>Відмінити</translation>
</message> </message>

46
client/translations/amneziavpn_ur_PK.ts
View file

@ -481,71 +481,71 @@ Can&apos;t be disabled for current server</source>
<context> <context>
<name>InstallController</name> <name>InstallController</name>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="168"/> <location filename="../ui/controllers/installController.cpp" line="198"/>
<source>%1 installed successfully. </source> <source>%1 installed successfully. </source>
<translation>%1 کامیابی سےنصب. </translation> <translation>%1 کامیابی سےنصب. </translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="170"/> <location filename="../ui/controllers/installController.cpp" line="201"/>
<source>%1 is already installed on the server. </source> <source>%1 is already installed on the server. </source>
<translation>%1 پہلے ہی سرور پر انسٹال ہے. </translation> <translation>%1 پہلے ہی سرور پر انسٹال ہے. </translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="190"/> <location filename="../ui/controllers/installController.cpp" line="222"/>
<source> <source>
Added containers that were already installed on the server</source> Added containers that were already installed on the server</source>
<translation> <translation>
وہ کنٹینرز شامل کیے گئے جو پہلے سے سرور پر نصب تھے</translation> وہ کنٹینرز شامل کیے گئے جو پہلے سے سرور پر نصب تھے</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="270"/> <location filename="../ui/controllers/installController.cpp" line="305"/>
<source> <source>
Already installed containers were found on the server. All installed containers have been added to the application</source> Already installed containers were found on the server. All installed containers have been added to the application</source>
<translation> <translation>
سرور پر پہلے سے نصب کنٹینرز پائے گئے۔ تمام نصب کنٹینرز کو ایپلی کیشن میں شامل کر دیا گیا ہے</translation> سرور پر پہلے سے نصب کنٹینرز پائے گئے۔ تمام نصب کنٹینرز کو ایپلی کیشن میں شامل کر دیا گیا ہے</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="608"/> <location filename="../ui/controllers/installController.cpp" line="654"/>
<source>Settings updated successfully</source> <source>Settings updated successfully</source>
<translation>ترتیب کامیابی کے ساتھ اپ ڈیٹ ہو گئی</translation> <translation>ترتیب کامیابی کے ساتھ اپ ڈیٹ ہو گئی</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="625"/> <location filename="../ui/controllers/installController.cpp" line="671"/>
<source>Server &apos;%1&apos; was rebooted</source> <source>Server &apos;%1&apos; was rebooted</source>
<translation>سرور %1 دوبارہ چالو کیا گیا تھا</translation> <translation>سرور %1 دوبارہ چالو کیا گیا تھا</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="637"/> <location filename="../ui/controllers/installController.cpp" line="683"/>
<source>Server &apos;%1&apos; was removed</source> <source>Server &apos;%1&apos; was removed</source>
<translation>سرور %1 ہٹا دیا گیا تھا</translation> <translation>سرور %1 ہٹا دیا گیا تھا</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="648"/> <location filename="../ui/controllers/installController.cpp" line="694"/>
<source>All containers from server &apos;%1&apos; have been removed</source> <source>All containers from server &apos;%1&apos; have been removed</source>
<translation>سرور &apos;%1&apos; سے تمام کنٹینرز ہٹا دیے گئے ہیں</translation> <translation>سرور &apos;%1&apos; سے تمام کنٹینرز ہٹا دیے گئے ہیں</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="666"/> <location filename="../ui/controllers/installController.cpp" line="713"/>
<source>%1 has been removed from the server &apos;%2&apos;</source> <source>%1 has been removed from the server &apos;%2&apos;</source>
<translation>سرور &apos;%2&apos; سے %1 ہٹا دیا گیا ہے</translation> <translation>سرور &apos;%2&apos; سے %1 ہٹا دیا گیا ہے</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="675"/> <location filename="../ui/controllers/installController.cpp" line="722"/>
<source>Api config removed</source> <source>Api config removed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="697"/> <location filename="../ui/controllers/installController.cpp" line="744"/>
<source>%1 cached profile cleared</source> <source>%1 cached profile cleared</source>
<translation>%1 کیش کردہ پروفائل ختم کر دی گئی</translation> <translation>%1 کیش کردہ پروفائل ختم کر دی گئی</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="836"/> <location filename="../ui/controllers/installController.cpp" line="887"/>
<source>Please login as the user</source> <source>Please login as the user</source>
<translation>براہ کرم صارف کے طور پر لاگ ان کریں</translation> <translation>براہ کرم صارف کے طور پر لاگ ان کریں</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="864"/> <location filename="../ui/controllers/installController.cpp" line="915"/>
<source>Server added successfully</source> <source>Server added successfully</source>
<translation>سرور کامیابی سے شامل کیا گیا</translation> <translation>سرور کامیابی سے شامل کیا گیا</translation>
</message> </message>
@ -824,7 +824,7 @@ Thank you for staying with us!</source>
<translation type="vanished">ام ٹی یو</translation> <translation type="vanished">ام ٹی یو</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="426"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="428"/>
<source>All users with whom you shared a connection with will no longer be able to connect to it.</source> <source>All users with whom you shared a connection with will no longer be able to connect to it.</source>
<translation>آپ جن لوگوں کے ساتھ آپ نے اس کنکشن کا اشتراک کیا تھا، وہ اس سے مزید جڑ نہیں سکیں گے۔</translation> <translation>آپ جن لوگوں کے ساتھ آپ نے اس کنکشن کا اشتراک کیا تھا، وہ اس سے مزید جڑ نہیں سکیں گے۔</translation>
</message> </message>
@ -899,27 +899,31 @@ Thank you for staying with us!</source>
<translation>H1 تا H4 فیلڈز کی قیمتیں مخصوص ہونی چاہیے</translation> <translation>H1 تا H4 فیلڈز کی قیمتیں مخصوص ہونی چاہیے</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="420"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="422"/>
<source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)</source> <source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92) + S3 + cookie reply size (64) + S4 + transport packet size (32)</source>
<translation>S1 + پیغام شروع کار (148) کے فیلڈ کی قیمت S2 + پیغام جواب (92) کے سائز کے برابر نہیں ہونی چاہئے</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="425"/> <source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)</source>
<translation type="vanished">S1 + پیغام شروع کار (148) کے فیلڈ کی قیمت S2 + پیغام جواب (92) کے سائز کے برابر نہیں ہونی چاہئے</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="427"/>
<source>Save settings?</source> <source>Save settings?</source>
<translation>ترتیبات محفوظ کریں?</translation> <translation>ترتیبات محفوظ کریں?</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="427"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="429"/>
<source>Continue</source> <source>Continue</source>
<translation>جاری رکھیں</translation> <translation>جاری رکھیں</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="428"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="430"/>
<source>Cancel</source> <source>Cancel</source>
<translation>منسوخ کریں</translation> <translation>منسوخ کریں</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="432"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="434"/>
<source>Unable change settings while there is an active connection</source> <source>Unable change settings while there is an active connection</source>
<translation>جب ایک فعال کنکشن موجود ہو تو ترتیبات کو تبدیل نہیں کیا جا سکتا</translation> <translation>جب ایک فعال کنکشن موجود ہو تو ترتیبات کو تبدیل نہیں کیا جا سکتا</translation>
</message> </message>

40
client/translations/amneziavpn_zh_CN.ts
View file

@ -482,60 +482,60 @@ Can&apos;t be disabled for current server</source>
<translation type="obsolete"> 已安装在服务器上</translation> <translation type="obsolete"> 已安装在服务器上</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="168"/> <location filename="../ui/controllers/installController.cpp" line="198"/>
<source>%1 installed successfully. </source> <source>%1 installed successfully. </source>
<translation>%1 安装成功。</translation> <translation>%1 安装成功。</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="170"/> <location filename="../ui/controllers/installController.cpp" line="201"/>
<source>%1 is already installed on the server. </source> <source>%1 is already installed on the server. </source>
<translation>服务器上已经安装 %1。</translation> <translation>服务器上已经安装 %1。</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="190"/> <location filename="../ui/controllers/installController.cpp" line="222"/>
<source> <source>
Added containers that were already installed on the server</source> Added containers that were already installed on the server</source>
<translation>添加已安装在服务器上的容器</translation> <translation>添加已安装在服务器上的容器</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="270"/> <location filename="../ui/controllers/installController.cpp" line="305"/>
<source> <source>
Already installed containers were found on the server. All installed containers have been added to the application</source> Already installed containers were found on the server. All installed containers have been added to the application</source>
<translation> <translation>
在服务上发现已经安装协议并添加至应用</translation> 在服务上发现已经安装协议并添加至应用</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="608"/> <location filename="../ui/controllers/installController.cpp" line="654"/>
<source>Settings updated successfully</source> <source>Settings updated successfully</source>
<translation>配置更新成功</translation> <translation>配置更新成功</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="625"/> <location filename="../ui/controllers/installController.cpp" line="671"/>
<source>Server &apos;%1&apos; was rebooted</source> <source>Server &apos;%1&apos; was rebooted</source>
<translation>服务器 &apos;%1&apos; 已重新启动</translation> <translation>服务器 &apos;%1&apos; 已重新启动</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="637"/> <location filename="../ui/controllers/installController.cpp" line="683"/>
<source>Server &apos;%1&apos; was removed</source> <source>Server &apos;%1&apos; was removed</source>
<translation>已移除服务器 &apos;%1&apos;</translation> <translation>已移除服务器 &apos;%1&apos;</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="648"/> <location filename="../ui/controllers/installController.cpp" line="694"/>
<source>All containers from server &apos;%1&apos; have been removed</source> <source>All containers from server &apos;%1&apos; have been removed</source>
<translation>服务器 &apos;%1&apos; 的所有容器已移除</translation> <translation>服务器 &apos;%1&apos; 的所有容器已移除</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="666"/> <location filename="../ui/controllers/installController.cpp" line="713"/>
<source>%1 has been removed from the server &apos;%2&apos;</source> <source>%1 has been removed from the server &apos;%2&apos;</source>
<translation>%1 已从服务器 &apos;%2&apos; 上移除</translation> <translation>%1 已从服务器 &apos;%2&apos; 上移除</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="675"/> <location filename="../ui/controllers/installController.cpp" line="722"/>
<source>Api config removed</source> <source>Api config removed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="697"/> <location filename="../ui/controllers/installController.cpp" line="744"/>
<source>%1 cached profile cleared</source> <source>%1 cached profile cleared</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -556,12 +556,12 @@ Already installed containers were found on the server. All installed containers
<translation type="obsolete"> 协议已从</translation> <translation type="obsolete"> 协议已从</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="836"/> <location filename="../ui/controllers/installController.cpp" line="887"/>
<source>Please login as the user</source> <source>Please login as the user</source>
<translation>请以用户身份登录</translation> <translation>请以用户身份登录</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="864"/> <location filename="../ui/controllers/installController.cpp" line="915"/>
<source>Server added successfully</source> <source>Server added successfully</source>
<translation>增加服务器成功</translation> <translation>增加服务器成功</translation>
</message> </message>
@ -842,7 +842,7 @@ Thank you for staying with us!</source>
<translation type="vanished">从服务上移除AmneziaWG？</translation> <translation type="vanished">从服务上移除AmneziaWG？</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="426"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="428"/>
<source>All users with whom you shared a connection with will no longer be able to connect to it.</source> <source>All users with whom you shared a connection with will no longer be able to connect to it.</source>
<translation>与您共享连接的所有用户将无法再连接到该连接。</translation> <translation>与您共享连接的所有用户将无法再连接到该连接。</translation>
</message> </message>
@ -917,27 +917,27 @@ Thank you for staying with us!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="420"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="422"/>
<source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)</source> <source>The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92) + S3 + cookie reply size (64) + S4 + transport packet size (32)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="425"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="427"/>
<source>Save settings?</source> <source>Save settings?</source>
<translation>保存设置？</translation> <translation>保存设置？</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="427"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="429"/>
<source>Continue</source> <source>Continue</source>
<translation>继续</translation> <translation>继续</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="428"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="430"/>
<source>Cancel</source> <source>Cancel</source>
<translation>取消</translation> <translation>取消</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="432"/> <location filename="../ui/qml/Pages2/PageProtocolAwgSettings.qml" line="434"/>
<source>Unable change settings while there is an active connection</source> <source>Unable change settings while there is an active connection</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

156
client/ui/controllers/installController.cpp
View file

@ -8,6 +8,7 @@
#include <QStandardPaths> #include <QStandardPaths>
#include <QtConcurrent> #include <QtConcurrent>
#include "core/api/apiUtils.h"
#include "core/controllers/serverController.h" #include "core/controllers/serverController.h"
#include "core/controllers/vpnConfigurationController.h" #include "core/controllers/vpnConfigurationController.h"
#include "core/networkUtilities.h" #include "core/networkUtilities.h"
@ -15,7 +16,6 @@
#include "ui/models/protocols/awgConfigModel.h" #include "ui/models/protocols/awgConfigModel.h"
#include "ui/models/protocols/wireguardConfigModel.h" #include "ui/models/protocols/wireguardConfigModel.h"
#include "utilities.h" #include "utilities.h"
#include "core/api/apiUtils.h"
namespace namespace
{ {
@ -37,7 +37,8 @@ namespace
} }
} }
InstallController::InstallController(const QSharedPointer<ServersModel> &serversModel, const QSharedPointer<ContainersModel> &containersModel, InstallController::InstallController(const QSharedPointer<ServersModel> &serversModel,
const QSharedPointer<ContainersModel> &containersModel,
const QSharedPointer<ProtocolsModel> &protocolsModel, const QSharedPointer<ProtocolsModel> &protocolsModel,
const QSharedPointer<ClientManagementModel> &clientManagementModel, const QSharedPointer<ClientManagementModel> &clientManagementModel,
const std::shared_ptr<Settings> &settings, QObject *parent) const std::shared_ptr<Settings> &settings, QObject *parent)
@ -70,7 +71,8 @@ void InstallController::install(DockerContainer container, int port, TransportPr
if (protocol == mainProto) { if (protocol == mainProto) {
containerConfig.insert(config_key::port, QString::number(port)); containerConfig.insert(config_key::port, QString::number(port));
containerConfig.insert(config_key::transport_proto, ProtocolProps::transportProtoToString(transportProto, protocol)); containerConfig.insert(config_key::transport_proto,
ProtocolProps::transportProtoToString(transportProto, protocol));
if (container == DockerContainer::Awg) { if (container == DockerContainer::Awg) {
QString junkPacketCount = QString::number(QRandomGenerator::global()->bounded(2, 5)); QString junkPacketCount = QString::number(QRandomGenerator::global()->bounded(2, 5));
@ -79,12 +81,37 @@ void InstallController::install(DockerContainer container, int port, TransportPr
int s1 = QRandomGenerator::global()->bounded(15, 150); int s1 = QRandomGenerator::global()->bounded(15, 150);
int s2 = QRandomGenerator::global()->bounded(15, 150); int s2 = QRandomGenerator::global()->bounded(15, 150);
while (s1 + AwgConstant::messageInitiationSize == s2 + AwgConstant::messageResponseSize) { int s3 = QRandomGenerator::global()->bounded(15, 150);
int s4 = QRandomGenerator::global()->bounded(15, 150);
// Ensure all values are unique and don't create equal packet sizes
QSet<int> usedValues;
usedValues.insert(s1);
while (usedValues.contains(s2)
|| s1 + AwgConstant::messageInitiationSize == s2 + AwgConstant::messageResponseSize) {
s2 = QRandomGenerator::global()->bounded(15, 150); s2 = QRandomGenerator::global()->bounded(15, 150);
} }
usedValues.insert(s2);
while (usedValues.contains(s3)
|| s1 + AwgConstant::messageInitiationSize == s3 + AwgConstant::messageCookieReplySize
|| s2 + AwgConstant::messageResponseSize == s3 + AwgConstant::messageCookieReplySize) {
s3 = QRandomGenerator::global()->bounded(15, 150);
}
usedValues.insert(s3);
while (usedValues.contains(s4)
|| s1 + AwgConstant::messageInitiationSize == s4 + AwgConstant::messageTransportSize
|| s2 + AwgConstant::messageResponseSize == s4 + AwgConstant::messageTransportSize
|| s3 + AwgConstant::messageCookieReplySize == s4 + AwgConstant::messageTransportSize) {
s4 = QRandomGenerator::global()->bounded(15, 150);
}
QString initPacketJunkSize = QString::number(s1); QString initPacketJunkSize = QString::number(s1);
QString responsePacketJunkSize = QString::number(s2); QString responsePacketJunkSize = QString::number(s2);
QString cookieReplyPacketJunkSize = QString::number(s3);
QString transportPacketJunkSize = QString::number(s4);
QSet<QString> headersValue; QSet<QString> headersValue;
while (headersValue.size() != 4) { while (headersValue.size() != 4) {
@ -104,6 +131,8 @@ void InstallController::install(DockerContainer container, int port, TransportPr
containerConfig[config_key::junkPacketMaxSize] = junkPacketMaxSize; containerConfig[config_key::junkPacketMaxSize] = junkPacketMaxSize;
containerConfig[config_key::initPacketJunkSize] = initPacketJunkSize; containerConfig[config_key::initPacketJunkSize] = initPacketJunkSize;
containerConfig[config_key::responsePacketJunkSize] = responsePacketJunkSize; containerConfig[config_key::responsePacketJunkSize] = responsePacketJunkSize;
containerConfig[config_key::cookieReplyPacketJunkSize] = cookieReplyPacketJunkSize;
containerConfig[config_key::transportPacketJunkSize] = transportPacketJunkSize;
containerConfig[config_key::initPacketMagicHeader] = initPacketMagicHeader; containerConfig[config_key::initPacketMagicHeader] = initPacketMagicHeader;
containerConfig[config_key::responsePacketMagicHeader] = responsePacketMagicHeader; containerConfig[config_key::responsePacketMagicHeader] = responsePacketMagicHeader;
containerConfig[config_key::underloadPacketMagicHeader] = underloadPacketMagicHeader; containerConfig[config_key::underloadPacketMagicHeader] = underloadPacketMagicHeader;
@ -141,7 +170,8 @@ void InstallController::install(DockerContainer container, int port, TransportPr
serverCredentials = m_processedServerCredentials; serverCredentials = m_processedServerCredentials;
} else { } else {
int serverIndex = m_serversModel->getProcessedServerIndex(); int serverIndex = m_serversModel->getProcessedServerIndex();
serverCredentials = qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole)); serverCredentials =
qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
} }
QSharedPointer<ServerController> serverController(new ServerController(m_settings)); QSharedPointer<ServerController> serverController(new ServerController(m_settings));
@ -167,7 +197,8 @@ void InstallController::install(DockerContainer container, int port, TransportPr
installedContainers.insert(container, config); installedContainers.insert(container, config);
finishMessage = tr("%1 installed successfully. ").arg(ContainerProps::containerHumanNames().value(container)); finishMessage = tr("%1 installed successfully. ").arg(ContainerProps::containerHumanNames().value(container));
} else { } else {
finishMessage = tr("%1 is already installed on the server. ").arg(ContainerProps::containerHumanNames().value(container)); finishMessage =
tr("%1 is already installed on the server. ").arg(ContainerProps::containerHumanNames().value(container));
} }
if (errorCode) { if (errorCode) {
@ -182,9 +213,10 @@ void InstallController::install(DockerContainer container, int port, TransportPr
} }
} }
void InstallController::installServer(const DockerContainer container, const QMap<DockerContainer, QJsonObject> &installedContainers, void InstallController::installServer(const DockerContainer container,
const ServerCredentials &serverCredentials, const QSharedPointer<ServerController> &serverController, const QMap<DockerContainer, QJsonObject> &installedContainers,
QString &finishMessage) const ServerCredentials &serverCredentials,
const QSharedPointer<ServerController> &serverController, QString &finishMessage)
{ {
if (installedContainers.size() > 1) { if (installedContainers.size() > 1) {
finishMessage += tr("\nAdded containers that were already installed on the server"); finishMessage += tr("\nAdded containers that were already installed on the server");
@ -203,8 +235,8 @@ void InstallController::installServer(const DockerContainer container, const QMa
auto containerConfig = iterator.value(); auto containerConfig = iterator.value();
if (ContainerProps::isSupportedByCurrentPlatform(container)) { if (ContainerProps::isSupportedByCurrentPlatform(container)) {
auto errorCode = vpnConfigurationController.createProtocolConfigForContainer(m_processedServerCredentials, iterator.key(), auto errorCode = vpnConfigurationController.createProtocolConfigForContainer(
containerConfig); m_processedServerCredentials, iterator.key(), containerConfig);
if (errorCode) { if (errorCode) {
emit installationErrorOccurred(errorCode); emit installationErrorOccurred(errorCode);
return; return;
@ -212,7 +244,8 @@ void InstallController::installServer(const DockerContainer container, const QMa
containerConfigs.append(containerConfig); containerConfigs.append(containerConfig);
errorCode = m_clientManagementModel->appendClient(iterator.key(), serverCredentials, containerConfig, errorCode = m_clientManagementModel->appendClient(iterator.key(), serverCredentials, containerConfig,
QString("Admin [%1]").arg(QSysInfo::prettyProductName()), serverController); QString("Admin [%1]").arg(QSysInfo::prettyProductName()),
serverController);
if (errorCode) { if (errorCode) {
emit installationErrorOccurred(errorCode); emit installationErrorOccurred(errorCode);
return; return;
@ -230,7 +263,8 @@ void InstallController::installServer(const DockerContainer container, const QMa
emit installServerFinished(finishMessage); emit installServerFinished(finishMessage);
} }
void InstallController::installContainer(const DockerContainer container, const QMap<DockerContainer, QJsonObject> &installedContainers, void InstallController::installContainer(const DockerContainer container,
const QMap<DockerContainer, QJsonObject> &installedContainers,
const ServerCredentials &serverCredentials, const ServerCredentials &serverCredentials,
const QSharedPointer<ServerController> &serverController, QString &finishMessage) const QSharedPointer<ServerController> &serverController, QString &finishMessage)
{ {
@ -243,15 +277,16 @@ void InstallController::installContainer(const DockerContainer container, const
containerConfig = iterator.value(); containerConfig = iterator.value();
if (ContainerProps::isSupportedByCurrentPlatform(container)) { if (ContainerProps::isSupportedByCurrentPlatform(container)) {
auto errorCode = auto errorCode = vpnConfigurationController.createProtocolConfigForContainer(
vpnConfigurationController.createProtocolConfigForContainer(serverCredentials, iterator.key(), containerConfig); serverCredentials, iterator.key(), containerConfig);
if (errorCode) { if (errorCode) {
emit installationErrorOccurred(errorCode); emit installationErrorOccurred(errorCode);
return; return;
} }
m_serversModel->addContainerConfig(iterator.key(), containerConfig); m_serversModel->addContainerConfig(iterator.key(), containerConfig);
errorCode = m_clientManagementModel->appendClient(iterator.key(), serverCredentials, containerConfig, errorCode = m_clientManagementModel->appendClient(
iterator.key(), serverCredentials, containerConfig,
QString("Admin [%1]").arg(QSysInfo::prettyProductName()), serverController); QString("Admin [%1]").arg(QSysInfo::prettyProductName()), serverController);
if (errorCode) { if (errorCode) {
emit installationErrorOccurred(errorCode); emit installationErrorOccurred(errorCode);
@ -280,7 +315,8 @@ bool InstallController::isServerAlreadyExists()
auto modelIndex = m_serversModel->index(i); auto modelIndex = m_serversModel->index(i);
const ServerCredentials credentials = const ServerCredentials credentials =
qvariant_cast<ServerCredentials>(m_serversModel->data(modelIndex, ServersModel::Roles::CredentialsRole)); qvariant_cast<ServerCredentials>(m_serversModel->data(modelIndex, ServersModel::Roles::CredentialsRole));
if (m_processedServerCredentials.hostName == credentials.hostName && m_processedServerCredentials.port == credentials.port) { if (m_processedServerCredentials.hostName == credentials.hostName
&& m_processedServerCredentials.port == credentials.port) {
emit serverAlreadyExists(i); emit serverAlreadyExists(i);
return true; return true;
} }
@ -309,17 +345,17 @@ void InstallController::scanServerForInstalledContainers()
containerConfig = iterator.value(); containerConfig = iterator.value();
if (ContainerProps::isSupportedByCurrentPlatform(container)) { if (ContainerProps::isSupportedByCurrentPlatform(container)) {
auto errorCode = auto errorCode = vpnConfigurationController.createProtocolConfigForContainer(
vpnConfigurationController.createProtocolConfigForContainer(serverCredentials, container, containerConfig); serverCredentials, container, containerConfig);
if (errorCode) { if (errorCode) {
emit installationErrorOccurred(errorCode); emit installationErrorOccurred(errorCode);
return; return;
} }
m_serversModel->addContainerConfig(container, containerConfig); m_serversModel->addContainerConfig(container, containerConfig);
errorCode = m_clientManagementModel->appendClient(container, serverCredentials, containerConfig, errorCode = m_clientManagementModel->appendClient(
QString("Admin [%1]").arg(QSysInfo::prettyProductName()), container, serverCredentials, containerConfig,
serverController); QString("Admin [%1]").arg(QSysInfo::prettyProductName()), serverController);
if (errorCode) { if (errorCode) {
emit installationErrorOccurred(errorCode); emit installationErrorOccurred(errorCode);
return; return;
@ -383,8 +419,8 @@ ErrorCode InstallController::getAlreadyInstalledContainers(const ServerCredentia
containerConfig.insert(config_key::transport_proto, transportProto); containerConfig.insert(config_key::transport_proto, transportProto);
if (protocol == Proto::Awg) { if (protocol == Proto::Awg) {
QString serverConfig = serverController->getTextFileFromContainer(container, credentials, QString serverConfig = serverController->getTextFileFromContainer(
protocols::awg::serverConfigPath, errorCode); container, credentials, protocols::awg::serverConfigPath, errorCode);
QMap<QString, QString> serverConfigMap; QMap<QString, QString> serverConfigMap;
auto serverConfigLines = serverConfig.split("\n"); auto serverConfigLines = serverConfig.split("\n");
@ -402,16 +438,22 @@ ErrorCode InstallController::getAlreadyInstalledContainers(const ServerCredentia
containerConfig[config_key::subnet_address] = serverConfigMap.value("Address").remove("/24"); containerConfig[config_key::subnet_address] = serverConfigMap.value("Address").remove("/24");
containerConfig[config_key::junkPacketCount] = serverConfigMap.value(config_key::junkPacketCount); containerConfig[config_key::junkPacketCount] = serverConfigMap.value(config_key::junkPacketCount);
containerConfig[config_key::junkPacketMinSize] = serverConfigMap.value(config_key::junkPacketMinSize); containerConfig[config_key::junkPacketMinSize] =
containerConfig[config_key::junkPacketMaxSize] = serverConfigMap.value(config_key::junkPacketMaxSize); serverConfigMap.value(config_key::junkPacketMinSize);
containerConfig[config_key::initPacketJunkSize] = serverConfigMap.value(config_key::initPacketJunkSize); containerConfig[config_key::junkPacketMaxSize] =
containerConfig[config_key::responsePacketJunkSize] = serverConfigMap.value(config_key::responsePacketJunkSize); serverConfigMap.value(config_key::junkPacketMaxSize);
containerConfig[config_key::initPacketJunkSize] =
serverConfigMap.value(config_key::initPacketJunkSize);
containerConfig[config_key::responsePacketJunkSize] =
serverConfigMap.value(config_key::responsePacketJunkSize);
containerConfig[config_key::cookieReplyPacketJunkSize] = containerConfig[config_key::cookieReplyPacketJunkSize] =
serverConfigMap.value(config_key::cookieReplyPacketJunkSize); serverConfigMap.value(config_key::cookieReplyPacketJunkSize);
containerConfig[config_key::transportPacketJunkSize] = containerConfig[config_key::transportPacketJunkSize] =
serverConfigMap.value(config_key::transportPacketJunkSize); serverConfigMap.value(config_key::transportPacketJunkSize);
containerConfig[config_key::initPacketMagicHeader] = serverConfigMap.value(config_key::initPacketMagicHeader); containerConfig[config_key::initPacketMagicHeader] =
containerConfig[config_key::responsePacketMagicHeader] = serverConfigMap.value(config_key::responsePacketMagicHeader); serverConfigMap.value(config_key::initPacketMagicHeader);
containerConfig[config_key::responsePacketMagicHeader] =
serverConfigMap.value(config_key::responsePacketMagicHeader);
containerConfig[config_key::underloadPacketMagicHeader] = containerConfig[config_key::underloadPacketMagicHeader] =
serverConfigMap.value(config_key::underloadPacketMagicHeader); serverConfigMap.value(config_key::underloadPacketMagicHeader);
containerConfig[config_key::transportPacketMagicHeader] = containerConfig[config_key::transportPacketMagicHeader] =
@ -424,12 +466,12 @@ ErrorCode InstallController::getAlreadyInstalledContainers(const ServerCredentia
containerConfig[config_key::controlledJunk1] = serverConfigMap.value(config_key::controlledJunk1); containerConfig[config_key::controlledJunk1] = serverConfigMap.value(config_key::controlledJunk1);
containerConfig[config_key::controlledJunk2] = serverConfigMap.value(config_key::controlledJunk2); containerConfig[config_key::controlledJunk2] = serverConfigMap.value(config_key::controlledJunk2);
containerConfig[config_key::controlledJunk3] = serverConfigMap.value(config_key::controlledJunk3); containerConfig[config_key::controlledJunk3] = serverConfigMap.value(config_key::controlledJunk3);
containerConfig[config_key::specialHandshakeTimeout] = serverConfigMap.value(config_key::specialHandshakeTimeout); containerConfig[config_key::specialHandshakeTimeout] =
serverConfigMap.value(config_key::specialHandshakeTimeout);
} else if (protocol == Proto::WireGuard) { } else if (protocol == Proto::WireGuard) {
QString serverConfig = serverController->getTextFileFromContainer(container, credentials, QString serverConfig = serverController->getTextFileFromContainer(
protocols::wireguard::serverConfigPath, errorCode); container, credentials, protocols::wireguard::serverConfigPath, errorCode);
QMap<QString, QString> serverConfigMap; QMap<QString, QString> serverConfigMap;
auto serverConfigLines = serverConfig.split("\n"); auto serverConfigLines = serverConfig.split("\n");
@ -449,7 +491,8 @@ ErrorCode InstallController::getAlreadyInstalledContainers(const ServerCredentia
stdOut.clear(); stdOut.clear();
script = QString("sudo docker inspect --format '{{.Config.Cmd}}' %1").arg(name); script = QString("sudo docker inspect --format '{{.Config.Cmd}}' %1").arg(name);
ErrorCode errorCode = serverController->runScript(credentials, script, cbReadStdOut, cbReadStdErr); ErrorCode errorCode =
serverController->runScript(credentials, script, cbReadStdOut, cbReadStdErr);
if (errorCode != ErrorCode::NoError) { if (errorCode != ErrorCode::NoError) {
return errorCode; return errorCode;
} }
@ -466,8 +509,8 @@ ErrorCode InstallController::getAlreadyInstalledContainers(const ServerCredentia
containerConfig.insert(config_key::userName, userName); containerConfig.insert(config_key::userName, userName);
containerConfig.insert(config_key::password, password); containerConfig.insert(config_key::password, password);
} else if (protocol == Proto::Socks5Proxy) { } else if (protocol == Proto::Socks5Proxy) {
QString proxyConfig = serverController->getTextFileFromContainer(container, credentials, QString proxyConfig = serverController->getTextFileFromContainer(
protocols::socks5Proxy::proxyConfigPath, errorCode); container, credentials, protocols::socks5Proxy::proxyConfigPath, errorCode);
const static QRegularExpression usernameAndPasswordRegExp("users (\\w+):CL:(\\w+)"); const static QRegularExpression usernameAndPasswordRegExp("users (\\w+):CL:(\\w+)");
QRegularExpressionMatch usernameAndPasswordMatch = usernameAndPasswordRegExp.match(proxyConfig); QRegularExpressionMatch usernameAndPasswordMatch = usernameAndPasswordRegExp.match(proxyConfig);
@ -552,7 +595,8 @@ ErrorCode InstallController::getAlreadyInstalledContainers(const ServerCredentia
stdOut.clear(); stdOut.clear();
script = QString("sudo docker exec -i %1 sh -c 'cat /var/lib/tor/hidden_service/hostname'").arg(name); script = QString("sudo docker exec -i %1 sh -c 'cat /var/lib/tor/hidden_service/hostname'").arg(name);
ErrorCode errorCode = serverController->runScript(credentials, script, cbReadStdOut, cbReadStdErr); ErrorCode errorCode =
serverController->runScript(credentials, script, cbReadStdOut, cbReadStdErr);
if (errorCode != ErrorCode::NoError) { if (errorCode != ErrorCode::NoError) {
return errorCode; return errorCode;
} }
@ -591,7 +635,8 @@ void InstallController::updateContainer(QJsonObject config)
if (isUpdateDockerContainerRequired(container, oldContainerConfig, config)) { if (isUpdateDockerContainerRequired(container, oldContainerConfig, config)) {
QSharedPointer<ServerController> serverController(new ServerController(m_settings)); QSharedPointer<ServerController> serverController(new ServerController(m_settings));
connect(serverController.get(), &ServerController::serverIsBusy, this, &InstallController::serverIsBusy); connect(serverController.get(), &ServerController::serverIsBusy, this, &InstallController::serverIsBusy);
connect(this, &InstallController::cancelInstallation, serverController.get(), &ServerController::cancelInstallation); connect(this, &InstallController::cancelInstallation, serverController.get(),
&ServerController::cancelInstallation);
errorCode = serverController->updateContainer(serverCredentials, container, oldContainerConfig, config); errorCode = serverController->updateContainer(serverCredentials, container, oldContainerConfig, config);
clearCachedProfile(serverController); clearCachedProfile(serverController);
@ -601,7 +646,8 @@ void InstallController::updateContainer(QJsonObject config)
m_serversModel->updateContainerConfig(container, config); m_serversModel->updateContainerConfig(container, config);
m_protocolModel->updateModel(config); m_protocolModel->updateModel(config);
auto defaultContainer = qvariant_cast<DockerContainer>(m_serversModel->data(serverIndex, ServersModel::Roles::DefaultContainerRole)); auto defaultContainer = qvariant_cast<DockerContainer>(
m_serversModel->data(serverIndex, ServersModel::Roles::DefaultContainerRole));
if ((serverIndex == m_serversModel->getDefaultServerIndex()) && (container == defaultContainer)) { if ((serverIndex == m_serversModel->getDefaultServerIndex()) && (container == defaultContainer)) {
emit currentContainerUpdated(); emit currentContainerUpdated();
} else { } else {
@ -663,7 +709,8 @@ void InstallController::removeProcessedContainer()
ErrorCode errorCode = m_serversModel->removeContainer(serverController, container); ErrorCode errorCode = m_serversModel->removeContainer(serverController, container);
if (errorCode == ErrorCode::NoError) { if (errorCode == ErrorCode::NoError) {
emit removeProcessedContainerFinished(tr("%1 has been removed from the server '%2'").arg(containerName, serverName)); emit removeProcessedContainerFinished(
tr("%1 has been removed from the server '%2'").arg(containerName, serverName));
return; return;
} }
emit installationErrorOccurred(errorCode); emit installationErrorOccurred(errorCode);
@ -707,7 +754,8 @@ QRegularExpression InstallController::ipAddressRegExp()
return NetworkUtilities::ipAddressRegExp(); return NetworkUtilities::ipAddressRegExp();
} }
void InstallController::setProcessedServerCredentials(const QString &hostName, const QString &userName, const QString &secretData) void InstallController::setProcessedServerCredentials(const QString &hostName, const QString &userName,
const QString &secretData)
{ {
m_processedServerCredentials.hostName = hostName; m_processedServerCredentials.hostName = hostName;
if (m_processedServerCredentials.hostName.contains(":")) { if (m_processedServerCredentials.hostName.contains(":")) {
@ -742,7 +790,8 @@ void InstallController::mountSftpDrive(const QString &port, const QString &passw
cmd = "C:\\Program Files\\SSHFS-Win\\bin\\sshfs.exe"; cmd = "C:\\Program Files\\SSHFS-Win\\bin\\sshfs.exe";
#elif defined AMNEZIA_DESKTOP #elif defined AMNEZIA_DESKTOP
mountPath = QString("%1/sftp:%2:%3").arg(QStandardPaths::writableLocation(QStandardPaths::HomeLocation), hostname, port); mountPath =
QString("%1/sftp:%2:%3").arg(QStandardPaths::writableLocation(QStandardPaths::HomeLocation), hostname, port);
QDir dir(mountPath); QDir dir(mountPath);
if (!dir.exists()) { if (!dir.exists()) {
dir.mkpath(mountPath); dir.mkpath(mountPath);
@ -806,7 +855,8 @@ bool InstallController::checkSshConnection(QSharedPointer<ServerController> serv
ErrorCode errorCode = ErrorCode::NoError; ErrorCode errorCode = ErrorCode::NoError;
m_privateKeyPassphrase = ""; m_privateKeyPassphrase = "";
if (m_processedServerCredentials.secretData.contains("BEGIN") && m_processedServerCredentials.secretData.contains("PRIVATE KEY")) { if (m_processedServerCredentials.secretData.contains("BEGIN")
&& m_processedServerCredentials.secretData.contains("PRIVATE KEY")) {
auto passphraseCallback = [this]() { auto passphraseCallback = [this]() {
emit passphraseRequestStarted(); emit passphraseRequestStarted();
QEventLoop loop; QEventLoop loop;
@ -817,7 +867,8 @@ bool InstallController::checkSshConnection(QSharedPointer<ServerController> serv
}; };
QString decryptedPrivateKey; QString decryptedPrivateKey;
errorCode = serverController->getDecryptedPrivateKey(m_processedServerCredentials, decryptedPrivateKey, passphraseCallback); errorCode = serverController->getDecryptedPrivateKey(m_processedServerCredentials, decryptedPrivateKey,
passphraseCallback);
if (errorCode == ErrorCode::NoError) { if (errorCode == ErrorCode::NoError) {
m_processedServerCredentials.secretData = decryptedPrivateKey; m_processedServerCredentials.secretData = decryptedPrivateKey;
} else { } else {
@ -878,7 +929,8 @@ bool InstallController::isConfigValid()
return false; return false;
} }
DockerContainer container = qvariant_cast<DockerContainer>(m_serversModel->data(serverIndex, ServersModel::Roles::DefaultContainerRole)); DockerContainer container =
qvariant_cast<DockerContainer>(m_serversModel->data(serverIndex, ServersModel::Roles::DefaultContainerRole));
if (container == DockerContainer::None) { if (container == DockerContainer::None) {
emit installationErrorOccurred(ErrorCode::NoInstalledContainersError); emit installationErrorOccurred(ErrorCode::NoInstalledContainersError);
@ -898,8 +950,10 @@ bool InstallController::isConfigValid()
auto isProtocolConfigExists = [](const QJsonObject &containerConfig, const DockerContainer container) { auto isProtocolConfigExists = [](const QJsonObject &containerConfig, const DockerContainer container) {
for (Proto protocol : ContainerProps::protocolsForContainer(container)) { for (Proto protocol : ContainerProps::protocolsForContainer(container)) {
QString protocolConfig = QString protocolConfig = containerConfig.value(ProtocolProps::protoToString(protocol))
containerConfig.value(ProtocolProps::protoToString(protocol)).toObject().value(config_key::last_config).toString(); .toObject()
.value(config_key::last_config)
.toString();
if (protocolConfig.isEmpty()) { if (protocolConfig.isEmpty()) {
return false; return false;
@ -910,14 +964,16 @@ bool InstallController::isConfigValid()
if (!isProtocolConfigExists(containerConfig, container)) { if (!isProtocolConfigExists(containerConfig, container)) {
VpnConfigurationsController vpnConfigurationController(m_settings, serverController); VpnConfigurationsController vpnConfigurationController(m_settings, serverController);
errorCode = vpnConfigurationController.createProtocolConfigForContainer(credentials, container, containerConfig); errorCode =
vpnConfigurationController.createProtocolConfigForContainer(credentials, container, containerConfig);
if (errorCode != ErrorCode::NoError) { if (errorCode != ErrorCode::NoError) {
return errorCode; return errorCode;
} }
m_serversModel->updateContainerConfig(container, containerConfig); m_serversModel->updateContainerConfig(container, containerConfig);
errorCode = m_clientManagementModel->appendClient(container, credentials, containerConfig, errorCode = m_clientManagementModel->appendClient(container, credentials, containerConfig,
QString("Admin [%1]").arg(QSysInfo::prettyProductName()), serverController); QString("Admin [%1]").arg(QSysInfo::prettyProductName()),
serverController);
if (errorCode != ErrorCode::NoError) { if (errorCode != ErrorCode::NoError) {
return errorCode; return errorCode;
} }

10
client/ui/models/protocols/awgConfigModel.cpp
View file

@ -266,9 +266,15 @@ bool AwgConfigModel::isHeadersEqual(const QString &h1, const QString &h2, const
return (h1 == h2) || (h1 == h3) || (h1 == h4) || (h2 == h3) || (h2 == h4) || (h3 == h4); return (h1 == h2) || (h1 == h3) || (h1 == h4) || (h2 == h3) || (h2 == h4) || (h3 == h4);
} }
bool AwgConfigModel::isPacketSizeEqual(const int s1, const int s2) bool AwgConfigModel::isPacketSizeEqual(const int s1, const int s2, const int s3, const int s4)
{ {
return (AwgConstant::messageInitiationSize + s1 == AwgConstant::messageResponseSize + s2); int initSize = AwgConstant::messageInitiationSize + s1;
int responseSize = AwgConstant::messageResponseSize + s2;
int cookieSize = AwgConstant::messageCookieReplySize + s3;
int transportSize = AwgConstant::messageTransportSize + s4;
return (initSize == responseSize || initSize == cookieSize || initSize == transportSize
|| responseSize == cookieSize || responseSize == transportSize || cookieSize == transportSize);
} }
bool AwgConfigModel::isServerSettingsEqual() bool AwgConfigModel::isServerSettingsEqual()

4
client/ui/models/protocols/awgConfigModel.h
View file

@ -10,6 +10,8 @@ namespace AwgConstant
{ {
const int messageInitiationSize = 148; const int messageInitiationSize = 148;
const int messageResponseSize = 92; const int messageResponseSize = 92;
const int messageCookieReplySize = 64;
const int messageTransportSize = 32;
} }
struct AwgConfig struct AwgConfig
@ -98,7 +100,7 @@ public slots:
QJsonObject getConfig(); QJsonObject getConfig();
bool isHeadersEqual(const QString &h1, const QString &h2, const QString &h3, const QString &h4); bool isHeadersEqual(const QString &h1, const QString &h2, const QString &h3, const QString &h4);
bool isPacketSizeEqual(const int s1, const int s2); bool isPacketSizeEqual(const int s1, const int s2, const int s3, const int s4);
bool isServerSettingsEqual(); bool isServerSettingsEqual();

6
client/ui/qml/Pages2/PageProtocolAwgSettings.qml
View file

@ -416,8 +416,10 @@ PageType {
} }
if (AwgConfigModel.isPacketSizeEqual(parseInt(initPacketJunkSizeTextField.textField.text), if (AwgConfigModel.isPacketSizeEqual(parseInt(initPacketJunkSizeTextField.textField.text),
parseInt(responsePacketJunkSizeTextField.textField.text))) { parseInt(responsePacketJunkSizeTextField.textField.text),
PageController.showErrorMessage(qsTr("The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)")) parseInt(cookieReplyPacketJunkSizeTextField.textField.text),
parseInt(transportPacketJunkSizeTextField.textField.text))) {
PageController.showErrorMessage(qsTr("The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92) + S3 + cookie reply size (64) + S4 + transport packet size (32)"))
return return
} }
} }