This commit is contained in:
arm64v8a
2023-08-15 13:55:01 +09:00
parent e6fc84e97b
commit 835bd55a32
6 changed files with 28 additions and 51 deletions

View File

@@ -255,14 +255,14 @@ set(PROJECT_SOURCES
res/neko.qrc res/neko.qrc
res/theme/feiyangqingyun/qss.qrc res/theme/feiyangqingyun/qss.qrc
${QV2RAY_RC} ${QV2RAY_RC}
) )
# Qt exe # Qt exe
if (${QT_VERSION_MAJOR} GREATER_EQUAL 6) if (${QT_VERSION_MAJOR} GREATER_EQUAL 6)
qt_add_executable(nekoray qt_add_executable(nekoray
MANUAL_FINALIZATION MANUAL_FINALIZATION
${PROJECT_SOURCES} ${PROJECT_SOURCES}
) )
# Define target properties for Android with Qt 6 as: # Define target properties for Android with Qt 6 as:
# set_property(TARGET nekoray APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR # set_property(TARGET nekoray APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
# ${CMAKE_CURRENT_SOURCE_DIR}/android) # ${CMAKE_CURRENT_SOURCE_DIR}/android)
@@ -271,13 +271,13 @@ else ()
if (ANDROID) if (ANDROID)
add_library(nekoray SHARED add_library(nekoray SHARED
${PROJECT_SOURCES} ${PROJECT_SOURCES}
) )
# Define properties for Android with Qt 5 after find_package() calls as: # Define properties for Android with Qt 5 after find_package() calls as:
# set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android") # set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
else () else ()
add_executable(nekoray add_executable(nekoray
${PROJECT_SOURCES} ${PROJECT_SOURCES}
) )
endif () endif ()
endif () endif ()
@@ -300,7 +300,7 @@ set_target_properties(nekoray PROPERTIES
MACOSX_BUNDLE_GUI_IDENTIFIER moe.nekoray.macosx MACOSX_BUNDLE_GUI_IDENTIFIER moe.nekoray.macosx
MACOSX_BUNDLE TRUE MACOSX_BUNDLE TRUE
WIN32_EXECUTABLE TRUE WIN32_EXECUTABLE TRUE
) )
# Target Source Translations # Target Source Translations
@@ -308,12 +308,15 @@ set(TS_FILES
translations/zh_CN.ts translations/zh_CN.ts
translations/fa_IR.ts translations/fa_IR.ts
translations/ru_RU.ts translations/ru_RU.ts
) )
set(LUPDATE_OPTIONS
-locations none -no-obsolete
)
if (${QT_VERSION_MAJOR} GREATER_EQUAL 6) 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) qt_add_lrelease(nekoray TS_FILES ${TS_FILES} QM_FILES_OUTPUT_VARIABLE QM_FILES)
else () 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 () endif ()
configure_file(translations/translations.qrc ${CMAKE_BINARY_DIR} COPYONLY) configure_file(translations/translations.qrc ${CMAKE_BINARY_DIR} COPYONLY)
target_sources(nekoray PRIVATE ${CMAKE_BINARY_DIR}/translations.qrc) target_sources(nekoray PRIVATE ${CMAKE_BINARY_DIR}/translations.qrc)
@@ -325,7 +328,7 @@ target_link_libraries(nekoray PRIVATE
Threads::Threads Threads::Threads
${NKR_EXTERNAL_TARGETS} ${NKR_EXTERNAL_TARGETS}
${PLATFORM_LIBRARIES} ${PLATFORM_LIBRARIES}
) )
if (QT_VERSION_MAJOR EQUAL 6) if (QT_VERSION_MAJOR EQUAL 6)
qt_finalize_executable(nekoray) qt_finalize_executable(nekoray)

View File

@@ -198,7 +198,6 @@ namespace NekoGui_fmt {
if (streamReceiveWindow > 0) q.addQueryItem("recv_window_conn", Int2String(streamReceiveWindow)); if (streamReceiveWindow > 0) q.addQueryItem("recv_window_conn", Int2String(streamReceiveWindow));
if (!q.isEmpty()) url.setQuery(q); if (!q.isEmpty()) url.setQuery(q);
if (!name.isEmpty()) url.setFragment(name); if (!name.isEmpty()) url.setFragment(name);
} else if (proxy_type == proxy_TUIC) { } else if (proxy_type == proxy_TUIC) {
url.setScheme("tuic"); url.setScheme("tuic");
url.setUserName(uuid); url.setUserName(uuid);

View File

@@ -253,7 +253,6 @@ namespace NekoGui_fmt {
connectionReceiveWindow = query.queryItemValue("recv_window").toInt(); connectionReceiveWindow = query.queryItemValue("recv_window").toInt();
streamReceiveWindow = query.queryItemValue("recv_window_conn").toInt(); streamReceiveWindow = query.queryItemValue("recv_window_conn").toInt();
} else if (url.scheme() == "tuic") { } else if (url.scheme() == "tuic") {
// by daeuniverse // by daeuniverse
// https://github.com/daeuniverse/dae/discussions/182 // https://github.com/daeuniverse/dae/discussions/182

View File

@@ -83,10 +83,6 @@
<source>Concurrent</source> <source>Concurrent</source>
<translation>هم زمان</translation> <translation>هم زمان</translation>
</message> </message>
<message>
<source>Test URL</source>
<translation type="vanished">url تست</translation>
</message>
<message> <message>
<source>Use proxy when updating subscription</source> <source>Use proxy when updating subscription</source>
<translation>استفاده از پروکسی زمانی که اشتراک را بروزرسانی می کنید</translation> <translation>استفاده از پروکسی زمانی که اشتراک را بروزرسانی می کنید</translation>
@@ -255,6 +251,14 @@ For NekoBox, this rewrites the underlying(localhost) DNS in Tun Mode, normal mod
<source>Interval (minute, invalid if less than 30)</source> <source>Interval (minute, invalid if less than 30)</source>
<translation type="unfinished">فاصله (به دقیقا ، اگر کمتر از ۳۰ باشد نادرست است)</translation> <translation type="unfinished">فاصله (به دقیقا ، اگر کمتر از ۳۰ باشد نادرست است)</translation>
</message> </message>
<message>
<source>Share VMess Link with v2rayN Format</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Old Share Link Format</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>DialogEditGroup</name> <name>DialogEditGroup</name>
@@ -498,10 +502,6 @@ For NekoBox, this rewrites the underlying(localhost) DNS in Tun Mode, normal mod
These settings can be changed later.</source> These settings can be changed later.</source>
<translation type="unfinished">به نظر میرسد که شما برای اولین بار است که از این نرم افزار استفاده میکنید ، لطفا یک هسته را انتخاب کنید ، این تنظیمات میتواند بعدا تغییر یابد.</translation> <translation type="unfinished">به نظر میرسد که شما برای اولین بار است که از این نرم افزار استفاده میکنید ، لطفا یک هسته را انتخاب کنید ، این تنظیمات میتواند بعدا تغییر یابد.</translation>
</message> </message>
<message>
<source>Exit</source>
<translation type="obsolete">خروج</translation>
</message>
<message> <message>
<source>Quit</source> <source>Quit</source>
<translation type="unfinished">خروج</translation> <translation type="unfinished">خروج</translation>
@@ -1357,10 +1357,6 @@ This needs to be run NekoBox with administrator privileges.</source>
<source>Open Config Folder</source> <source>Open Config Folder</source>
<translation>پوشه Config باز شود</translation> <translation>پوشه Config باز شود</translation>
</message> </message>
<message>
<source>Default</source>
<translation type="vanished">پیش فرض</translation>
</message>
<message> <message>
<source>Load routing and apply: %1</source> <source>Load routing and apply: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@@ -1476,10 +1472,6 @@ End: %2</source>
<source>Failed to stop Tun process</source> <source>Failed to stop Tun process</source>
<translation>فرآیند Tun متوقف نشد</translation> <translation>فرآیند Tun متوقف نشد</translation>
</message> </message>
<message>
<source>Input</source>
<translation type="vanished">ورودی</translation>
</message>
<message> <message>
<source>[%1] test error: %2</source> <source>[%1] test error: %2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@@ -1676,10 +1668,6 @@ Direct: %2</source>
<source>Request with proxy but no profile started.</source> <source>Request with proxy but no profile started.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Enable System Proxy</source>
<translation type="obsolete">پروکسی سیستم را فعال کنید</translation>
</message>
<message> <message>
<source>Subscription request fininshed: %1</source> <source>Subscription request fininshed: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

View File

@@ -251,6 +251,14 @@ For NekoBox, this rewrites the underlying(localhost) DNS in Tun Mode, normal mod
<source>Interval (minute, invalid if less than 30)</source> <source>Interval (minute, invalid if less than 30)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Share VMess Link with v2rayN Format</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Old Share Link Format</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>DialogEditGroup</name> <name>DialogEditGroup</name>
@@ -979,10 +987,6 @@ https://matsuridayo.github.io/n-configuration/#vpn-tun</translation>
<source>Plugin Args</source> <source>Plugin Args</source>
<translation>Аргументы</translation> <translation>Аргументы</translation>
</message> </message>
<message>
<source>Server support is required</source>
<translation type="vanished">Необходима поддержка со стороны сервера</translation>
</message>
<message> <message>
<source>Version of UDP over TCP protocol, server support is required.</source> <source>Version of UDP over TCP protocol, server support is required.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@@ -1370,10 +1374,6 @@ https://matsuridayo.github.io/n-configuration/#vpn-tun</translation>
<source>Restart Proxy</source> <source>Restart Proxy</source>
<translation>Перезапустить прокси</translation> <translation>Перезапустить прокси</translation>
</message> </message>
<message>
<source>Default</source>
<translation type="vanished">По умолчанию</translation>
</message>
<message> <message>
<source>Load routing and apply: %1</source> <source>Load routing and apply: %1</source>
<translation>Загрузить маршруты и активировать: %1</translation> <translation>Загрузить маршруты и активировать: %1</translation>
@@ -1430,10 +1430,6 @@ https://matsuridayo.github.io/n-configuration/#vpn-tun</translation>
<source>Not Running</source> <source>Not Running</source>
<translation>Не запущен</translation> <translation>Не запущен</translation>
</message> </message>
<message>
<source>Running: %1</source>
<translation type="vanished">Работает: %1</translation>
</message>
<message> <message>
<source>None</source> <source>None</source>
<translation>Нет</translation> <translation>Нет</translation>

View File

@@ -1217,10 +1217,6 @@ This needs to be run NekoBox with administrator privileges.</source>
<source>Error</source> <source>Error</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<source>Default</source>
<translation type="vanished"></translation>
</message>
<message> <message>
<source>Confirmation</source> <source>Confirmation</source>
<translation></translation> <translation></translation>
@@ -1233,10 +1229,6 @@ This needs to be run NekoBox with administrator privileges.</source>
<source>Imported %1 profile(s)</source> <source>Imported %1 profile(s)</source>
<translation> %1 </translation> <translation> %1 </translation>
</message> </message>
<message>
<source>Running: %1</source>
<translation type="vanished">: %1</translation>
</message>
<message> <message>
<source>None</source> <source>None</source>
<translation></translation> <translation></translation>