diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b10d67..eeb6ac4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -255,14 +255,14 @@ set(PROJECT_SOURCES res/neko.qrc res/theme/feiyangqingyun/qss.qrc ${QV2RAY_RC} - ) +) # Qt exe if (${QT_VERSION_MAJOR} GREATER_EQUAL 6) qt_add_executable(nekoray MANUAL_FINALIZATION ${PROJECT_SOURCES} - ) + ) # Define target properties for Android with Qt 6 as: # set_property(TARGET nekoray APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR # ${CMAKE_CURRENT_SOURCE_DIR}/android) @@ -271,13 +271,13 @@ else () if (ANDROID) add_library(nekoray SHARED ${PROJECT_SOURCES} - ) + ) # Define properties for Android with Qt 5 after find_package() calls as: # set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android") else () add_executable(nekoray ${PROJECT_SOURCES} - ) + ) endif () endif () @@ -300,7 +300,7 @@ set_target_properties(nekoray PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER moe.nekoray.macosx MACOSX_BUNDLE TRUE WIN32_EXECUTABLE TRUE - ) +) # Target Source Translations @@ -308,12 +308,15 @@ set(TS_FILES translations/zh_CN.ts translations/fa_IR.ts translations/ru_RU.ts - ) +) +set(LUPDATE_OPTIONS + -locations none -no-obsolete +) if (${QT_VERSION_MAJOR} GREATER_EQUAL 6) - qt_add_lupdate(nekoray TS_FILES ${TS_FILES}) + qt_add_lupdate(nekoray TS_FILES ${TS_FILES} OPTIONS ${LUPDATE_OPTIONS}) qt_add_lrelease(nekoray TS_FILES ${TS_FILES} QM_FILES_OUTPUT_VARIABLE QM_FILES) else () - qt5_create_translation(QM_FILES ${PROJECT_SOURCES} ${TS_FILES} OPTIONS -locations none) + qt5_create_translation(QM_FILES ${PROJECT_SOURCES} ${TS_FILES} OPTIONS ${LUPDATE_OPTIONS}) endif () configure_file(translations/translations.qrc ${CMAKE_BINARY_DIR} COPYONLY) target_sources(nekoray PRIVATE ${CMAKE_BINARY_DIR}/translations.qrc) @@ -325,7 +328,7 @@ target_link_libraries(nekoray PRIVATE Threads::Threads ${NKR_EXTERNAL_TARGETS} ${PLATFORM_LIBRARIES} - ) +) if (QT_VERSION_MAJOR EQUAL 6) qt_finalize_executable(nekoray) diff --git a/fmt/Bean2Link.cpp b/fmt/Bean2Link.cpp index bae0295..5426767 100644 --- a/fmt/Bean2Link.cpp +++ b/fmt/Bean2Link.cpp @@ -198,7 +198,6 @@ namespace NekoGui_fmt { if (streamReceiveWindow > 0) q.addQueryItem("recv_window_conn", Int2String(streamReceiveWindow)); if (!q.isEmpty()) url.setQuery(q); if (!name.isEmpty()) url.setFragment(name); - } else if (proxy_type == proxy_TUIC) { url.setScheme("tuic"); url.setUserName(uuid); diff --git a/fmt/Link2Bean.cpp b/fmt/Link2Bean.cpp index 5dd0039..790e980 100644 --- a/fmt/Link2Bean.cpp +++ b/fmt/Link2Bean.cpp @@ -253,7 +253,6 @@ namespace NekoGui_fmt { connectionReceiveWindow = query.queryItemValue("recv_window").toInt(); streamReceiveWindow = query.queryItemValue("recv_window_conn").toInt(); - } else if (url.scheme() == "tuic") { // by daeuniverse // https://github.com/daeuniverse/dae/discussions/182 diff --git a/translations/fa_IR.ts b/translations/fa_IR.ts index 228cfeb..e006930 100644 --- a/translations/fa_IR.ts +++ b/translations/fa_IR.ts @@ -83,10 +83,6 @@ Concurrent هم زمان - - Test URL - url تست - Use proxy when updating subscription استفاده از پروکسی زمانی که اشتراک را بروزرسانی می کنید @@ -255,6 +251,14 @@ For NekoBox, this rewrites the underlying(localhost) DNS in Tun Mode, normal mod Interval (minute, invalid if less than 30) فاصله (به دقیقا ، اگر کمتر از ۳۰ باشد نادرست است) + + Share VMess Link with v2rayN Format + + + + Old Share Link Format + + DialogEditGroup @@ -498,10 +502,6 @@ For NekoBox, this rewrites the underlying(localhost) DNS in Tun Mode, normal mod These settings can be changed later. به نظر میرسد که شما برای اولین بار است که از این نرم افزار استفاده میکنید ، لطفا یک هسته را انتخاب کنید ، این تنظیمات میتواند بعدا تغییر یابد. - - Exit - خروج - Quit خروج @@ -1357,10 +1357,6 @@ This needs to be run NekoBox with administrator privileges. Open Config Folder پوشه Config باز شود - - Default - پیش فرض - Load routing and apply: %1 @@ -1476,10 +1472,6 @@ End: %2 Failed to stop Tun process فرآیند Tun متوقف نشد - - Input - ورودی - [%1] test error: %2 @@ -1676,10 +1668,6 @@ Direct: %2 Request with proxy but no profile started. - - Enable System Proxy - پروکسی سیستم را فعال کنید - Subscription request fininshed: %1 diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 6114fcd..687d8f2 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -251,6 +251,14 @@ For NekoBox, this rewrites the underlying(localhost) DNS in Tun Mode, normal mod Interval (minute, invalid if less than 30) + + Share VMess Link with v2rayN Format + + + + Old Share Link Format + + DialogEditGroup @@ -979,10 +987,6 @@ https://matsuridayo.github.io/n-configuration/#vpn-tun Plugin Args Аргументы - - Server support is required - Необходима поддержка со стороны сервера - Version of UDP over TCP protocol, server support is required. @@ -1370,10 +1374,6 @@ https://matsuridayo.github.io/n-configuration/#vpn-tun Restart Proxy Перезапустить прокси - - Default - По умолчанию - Load routing and apply: %1 Загрузить маршруты и активировать: %1 @@ -1430,10 +1430,6 @@ https://matsuridayo.github.io/n-configuration/#vpn-tun Not Running Не запущен - - Running: %1 - Работает: %1 - None Нет diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index e1eb90b..9b9a4d0 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -1217,10 +1217,6 @@ This needs to be run NekoBox with administrator privileges. Error 错误 - - Default - 默认 - Confirmation 确认 @@ -1233,10 +1229,6 @@ This needs to be run NekoBox with administrator privileges. Imported %1 profile(s) 导入了 %1 个配置 - - Running: %1 - 正在运行: %1 - None