ImmortalWrt

Fork

• immortalwrt
• packages
• luci

luci-app-ssr-plus: fix generate v2ray ss config

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit daf91637d4622b8012da85845607e7601fcbca8d)

luci-app-ssr-plus: sync with upstream

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 1e47528a5372c87e39eb285c58e6daa18014d306)

luci-app-ssr-plus: fix generate v2ray ss config

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit daf91637d4622b8012da85845607e7601fcbca8d)

luci-app-ssr-plus: sync with upstream

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 1e47528a5372c87e39eb285c58e6daa18014d306)

luci-app-ssr-plus: fix generate v2ray ss config

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

luci-base: network.js: consider uci config for Device.getType()/getParent()

For network devices declared in uci but not yet created by netifd, the
runtime status information will be unavailable, causing methods such as
`getType()` to assume plain ethernet interfaces and `getParent()` to fail
resolving parent devices.

Fall back to infer the information from uci configuration settings in such
cases to give accurate type hints to callers.

In particular, this prevents LuCI from turning wireless target networks
containing a to-be-created bridge device into bridges themselves.

Fixes: https://github.com/openwrt/packages/issues/18768
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8effea58d7281fd4f2b6c31d534195dba27a850b)

luci-base: network.js: consider uci config for Device.getType()/getParent()

For network devices declared in uci but not yet created by netifd, the
runtime status information will be unavailable, causing methods such as
`getType()` to assume plain ethernet interfaces and `getParent()` to fail
resolving parent devices.

Fall back to infer the information from uci configuration settings in such
cases to give accurate type hints to callers.

In particular, this prevents LuCI from turning wireless target networks
containing a to-be-created bridge device into bridges themselves.

Fixes: https://github.com/openwrt/packages/issues/18768
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

luci-app-unblockneteasemusic: compatible with ipset

luci-app-unblockneteasemusic: fix nftset based on firewall4

luci-app-ssr-plus: sync with upstream

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

luci-app-mosquitto: trigger weblate translation

Trigger weblate by adding a .po file for one language.
(Just having the .pot template is not enough.)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

treewide: Backport and sync translations

Backport translations from master.
Sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

treewide: sync translations

Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Translated using Weblate (German)

Currently translated at 100.0% (170 of 170 strings)

Translation: OpenWrt/LuCI/applications/mwan3
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationsmwan3/de/

Translated using Weblate (Portuguese)

Currently translated at 100.0% (74 of 74 strings)

Translated using Weblate (German)

Currently translated at 90.0% (153 of 170 strings)

Translation: OpenWrt/LuCI/applications/mwan3
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationsmwan3/de/

Translated using Weblate (German)

Currently translated at 94.7% (200 of 211 strings)

Translation: OpenWrt/LuCI/applications/dockerman
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationsdockerman/de/

Translated using Weblate (German)

Currently translated at 78.2% (133 of 170 strings)

Translation: OpenWrt/LuCI/applications/mwan3
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationsmwan3/de/

Translated using Weblate (German)

Currently translated at 100.0% (33 of 33 strings)

Translated using Weblate (German)

Currently translated at 100.0% (212 of 212 strings)

Translated using Weblate (German)

Currently translated at 87.7% (1741 of 1985 strings)

Translation: OpenWrt/LuCI/modules/luci-base
Translate-URL: https://hosted.weblate.org/projects/openwrt/luci/de/

Translated using Weblate (Danish)

Currently translated at 17.0% (14 of 82 strings)

Translated using Weblate (Dutch)

Currently translated at 0.5% (1 of 168 strings)

Translation: OpenWrt/LuCI/applications/aria2
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationsaria2/nl/

Translated using Weblate (Dutch)

Currently translated at 0.9% (2 of 212 strings)

Translated using Weblate (Dutch)

Currently translated at 67.1% (131 of 195 strings)

Translation: OpenWrt/LuCI/applications/banip
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationsbanip/nl/

Translated using Weblate (Dutch)

Currently translated at 1.1% (4 of 343 strings)

Translated using Weblate (Dutch)

Currently translated at 43.2% (16 of 37 strings)

Translated using Weblate (Dutch)

Currently translated at 8.3% (166 of 1985 strings)

Translation: OpenWrt/LuCI/modules/luci-base
Translate-URL: https://hosted.weblate.org/projects/openwrt/luci/nl/

Translated using Weblate (Polish)

Currently translated at 100.0% (94 of 94 strings)

Translation: OpenWrt/LuCI/applications/vpn-policy-routing
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationsvpn-policy-routing/pl/

Translated using Weblate (Polish)

Currently translated at 100.0% (108 of 108 strings)

Translation: OpenWrt/LuCI/applications/simple-adblock
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationssimple-adblock/pl/

Translated using Weblate (Spanish)

Currently translated at 100.0% (196 of 196 strings)

Translation: OpenWrt/LuCI/applications/ddns
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationsddns/es/

Translated using Weblate (Polish)

Currently translated at 100.0% (49 of 49 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (212 of 212 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (1986 of 1986 strings)

Translation: OpenWrt/LuCI/modules/luci-base
Translate-URL: https://hosted.weblate.org/projects/openwrt/luci/pl/

Translated using Weblate (Spanish)

Currently translated at 96.5% (1918 of 1986 strings)

Translation: OpenWrt/LuCI/modules/luci-base
Translate-URL: https://hosted.weblate.org/projects/openwrt/luci/es/

Added translation using Weblate (Dutch)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (32 of 32 strings)

Translated using Weblate (German)

Currently translated at 100.0% (61 of 61 strings)

Translation: OpenWrt/LuCI/applications/attendedsysupgrade
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationsattendedsysupgrade/de/

Translated using Weblate (German)

Currently translated at 99.2% (132 of 133 strings)

Co-authored-by: Franco Castillo <castillofrancodamian@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Martin Bezemer <m.bezemer+openwrt@gmail.com>
Co-authored-by: Matthaiks <kitynska@gmail.com>
Co-authored-by: MkQtS <onewordwrong@aliyun.com>
Co-authored-by: Steffen Möller <steffen_moeller@gmx.de>
Co-authored-by: drax red <drax@outlook.dk>
Co-authored-by: ssantos <ssantos@web.de>
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Signed-off-by: Martin Bezemer <m.bezemer+openwrt@gmail.com>
Signed-off-by: Matthaiks <kitynska@gmail.com>
Signed-off-by: Steffen Möller <steffen_moeller@gmx.de>
Signed-off-by: ssantos <ssantos@web.de>
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationsahcp/de/
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationsfirewall/de/
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationsfirewall/es/
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationsfirewall/nl/
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationsnut/de/
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationssamba4/nl/
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationssplash/da/
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationsstatistics/nl/
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationstinyproxy/pt/
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationsupnp/pl/
Translate-URL: https://hosted.weblate.org/projects/openwrt/luciapplicationswatchcat/zh_Hans/
Translation: OpenWrt/LuCI/applications/ahcp
Translation: OpenWrt/LuCI/applications/firewall
Translation: OpenWrt/LuCI/applications/nut
Translation: OpenWrt/LuCI/applications/samba4
Translation: OpenWrt/LuCI/applications/splash
Translation: OpenWrt/LuCI/applications/statistics
Translation: OpenWrt/LuCI/applications/tinyproxy
Translation: OpenWrt/LuCI/applications/upnp
Translation: OpenWrt/LuCI/applications/watchcat

luci-app-vssr: bump to 1.25

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 7c1b32546bc137184e863ebbae8e659eaf1f2003)

luci-app-vssr: bump to 1.25

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 7c1b32546bc137184e863ebbae8e659eaf1f2003)

luci-app-vssr: bump to 1.25

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

luci-app-passwall: sync with upstream

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit f61e034f5e4f9327748c3c020f569340817533ce)

luci-app-passwall: sync with upstream

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit f61e034f5e4f9327748c3c020f569340817533ce)

luci-app-passwall: sync with upstream

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

luci-theme-argon: sync with upstream

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 8b8a05213fd2ea7950733653bd3d75cb1c0b65f1)

luci-theme-argon: use uclient-fetch for smaller size

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 1baf4beaad91c1e13c01a9bd49e61bd36b6b8cec)

luci-theme-argon: sync with upstream

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit bffde9409f2fcb15785a93a7585e8d4d7c5494c4)

luci-theme-argon: sync with upstream

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

Merge Mainline

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

luci-app-ssr-plus: sync fixes

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 3caf0a505b51a7b71798310f90c5a8c52b7c50eb)

luci-app-ssr-plus: sync fixes

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 3caf0a505b51a7b71798310f90c5a8c52b7c50eb)

luci-app-ssr-plus: sync fixes

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

luci-app-v2ray-server: switch to sagernet core

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 2e22ce92b3356fda5f32f87cf44ee02e4aa4f79e)

luci-app-v2ray-server: switch to sagernet core

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 2e22ce92b3356fda5f32f87cf44ee02e4aa4f79e)