luci-app-usteer: Removed save/apply button on status pages, and added "friendly" error message if usteer not running
Added refresh of status page

Add the template pot file that is needed to start translating the app.

Co-authored-by: Sergey Ponomarev <stokito@gmail.com>
Co-authored-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
Signed-off-by: Ramon Van Gorkom <Ramon00c00@gmail.com>
(cherry picked from commit 0b2aad03599c4f5c7b513f9274b529e7dd3d7e29)

luci-mod-network: Rework the (multi) mac for static leases

+i18n

Removed Jows widget which hindered management of multi mac entries.

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit d5db17361a556f9c7eda8fa1a0b0c59d57034633)

luci-mod-network: Make MAC check functions generic.

Also remove a reassigned so.validate function (dead code).

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit bcaa445f088ad901da693a29b55e80295cb8f093)

luci-mod-network: DHCP tab IPsets ( add NFTsets properties )

See also:

https://github.com/openwrt/openwrt/commit/d7f378796f985c902ff7906767c275c40a15347f

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit f98ce31fdbdfc61c8ec7443c791a98d9ee93b6f2)

luci-app-sshtunnel: sync .po files

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit c668d992e1a1a1aeb4f3b6e6807784f43bc1b7af)

luci-app-sshtunnel: servers: ProxyCommand option

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 255aef1748309d065795f551b1994f2cd807b668)

luci-app-banip: sync with banIP-0.9.3-1

* expose the new remote logging/cgi options

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 6dff72b1cd20bd878e24f9b2fc05b4ecc858d607)
Signed-off-by: Dirk Brenken <dev@brenken.org>

luci-app-sshtunnel: i18n

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit a1f5b6087f04c5e214a31c7201d12c77e65c58e7)

luci-app-sshtunnel: hide Save and Apply buutons for non form pages

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 61e166aa93b5aefbb362a9c438e7c70f41c57d4a)

luci-app-sshtunnel: servers: make a link to man ssh_config

Use Debian man pages because it has many versions and languages.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 059850ba0cb4afbd0c4434f0ef4825326b7baa2f)

luci-app-sshtunnel: extract a public key from a key if no .pub

For the Dropbear keys without a .pub we need to fall back and execute the -y command to extract a pubkey from a private.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 8755aa3a71bf47ba65706a39c72cd294923d9285)

luci-app-sshtunnel: ssh_keys: list keys without a corresponding .pub

The private keys doesn't have any extension so the only way to clearly say that this file is a key is a presence of the corresponding .pub file.
Most of time key files have a prefix id_ e.g. id_rsa etc.

The dropbearkey generates a key without a corresponding .pub file e.g. id_dropbearkey.

So we need to detect a key files by both .pub file or id_ prefix.
Key files without the id_ prefix won't be listed, sorry.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 949e7cbcb33cc457bfcdd27aaf4da487bab89f30)

luci-app-sshtunnel: generate a new key

Make the Generate a new key as a separate section and move to bottom.
Extend the key name pattern to be an email address so allow symbols @ - +.
Force the id_ prefix for key names.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 3933633dd0de84b1c13af5d8f62b6b2431bf1ca7)

luci-base: comment fixes (sp)

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 5355b7b57604493909db3b472d6623a4b420d771)

treewide: Backport from master and sync translations

Backport translations from master.
Sync.

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

luci-proto-ipv6: Add DHCPv6 norelease menu option (#6775)

Signed-off-by: Richard Patterson <richard@helix.net.nz>
(cherry picked from commit 4ad5f8111bc357d88390d914d82f0517ccbcf769)

luci-app-olsr: fix null pointer exception (#6778)

for some 'virtual' interfaces, there don't seem to be network status information

Signed-off-by: Andreas Bräu <ab@andi95.de>
(cherry picked from commit 87da3275eaf7a388e77ad137e09b3bf6d3cf97f3)

luci-app-statistics: lookup -> look up

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 0a6618823656df7aefc7b958e187afd628248e90)

luci-app-openvpn: Add multihome boolean.

Helps when you have multiple IP(v4|v6)

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit a5ed5976f4cf70a36863e69da8c055f855545f87)

luci-mod-network: reword some help-strings

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit e7650bb86aaacb6ef654c9e10f25cc7c9f799556)

luci-mod-network: reword some help-strings

also unburden translators from some static strings.

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit f79a1325970d74c1cc994747b70335aebb7deaaf)

luci-mod-network: reword some help-strings

also unburden translators from some static strings.

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 0a67f0b880a01a687b4c53935656ccb755adafe6)

Revert "Merge pull request #6700 from lvoegl/pr/20231021-luci-app-strongswan"

This reverts commit 6fb71d48a051467c5cc54453cd74df992e9c9e65.

(Not yet ready)

treewide: Backport and sync i18n translations

Backport from master and sync i18n translations.

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

Merge pull request #6755 from EvanTheB/modemaster

Signed-off-by: Evan Benn <evan.benn@morsemicro.com>
luci-base: Display 'Access Point' in the wireless page instead of 'Master'
(cherry picked from commit c3fc80c92a2ed30214ed039c6189e2c06023117a)

Merge pull request #6723 from knarrff/channel_analysis__base-channel

Signed-off-by: Frank Löffler <frank.loeffler@uni-jena.de>
luci-mod-status: highlight primary 20 MHz channel
(cherry picked from commit 8b651996ff25cff94cf37608d775f0cbf7fd177a)

Merge pull request #6724 from erikrk/channel-analysis-permissions

Signed-off-by: Erik Karlsson <erik.karlsson@genexis.eu>
luci-mod-status: fix ACL for channel analysis
(cherry picked from commit 8be149c4adddc05354b009e1d0597b2ae6fd7532)

Merge pull request #6700 from lvoegl/pr/20231021-luci-app-strongswan

Signed-off-by: Lukas Voegl <lvoegl@tdt.de>
luci-app-strongswan-swanctl: initial commit
(cherry picked from commit 828716ad73be81079ffdaa1592f637efa1747f31)

Merge pull request #6770 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: bugfix: remove instance selection

luci-app-adblock-fast: bugfix: remove instance selection for some smartdns options

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 97201f8379b5c3237420bf0363263a74a01c6e69)

Merge pull request #6768 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: update to 1.1.1-1

luci-app-adblock-fast: update to 1.1.1-1

* Final (hopefully) attempt to avoid errors if dhcp/smartdns configs are
  missing
* New user experience for picking dnsmasq/smartdns instances to enable the
  adblocking on
* use function from init script to set up output paths
* update paths to run-time files in ACL

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 8d8ca1c6aace056dbcf4216ca797902c0099c2fb)

luci-app-ddns: rename retry_count -> retry_max_count

syncs with openwrt/packages@e3292e4

Also fixes some i18n strings

Closes issue #6752

(cherry picked from commit d349181aaef50e7a545d784176e55f5dc70fabff)

Merge pull request #6763 from stangri/openwrt-23.05-luci-app-https-dns-proxy

[23.05] luci-app-https-dns-proxy: update to 2023-10-25-5

luci-app-https-dns-proxy: update to 2023-10-25-5

* no longer "require uci" in js files
* use L.resolveDefault when loading configs
* improve DNSMASQ config update selection user experience
* switch from uci.get to L.uci.get
* small code improvement of RPCD script

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 799280877fbe7a43dab9c3af1dd509519e2f542b)

Merge pull request #6760 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: improve dnsmasq/smartdns instances selection

luci-app-adblock-fast: improve dnsmasq/smartdns instances selection

* create UI elements with an option to pick multiple instances for
  dnsmasq and smartdns

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 061a5dc40487fbe63e4ce2314b3c95e0293c1a4e)

Merge pull request #6757 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: bugfix: L.uci.load

luci-app-adblock-fast: bugfix: L.uci.load

* fix app not working on systems without smartdns
* fix smartdns instances selection dependencies

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 0473939fff65384badf6d15f30a0e236f2110b3c)

luci-mod-network: exclude alias to self from device picker

Do not present alias to self as valid choice in the interface device picker.

Fixes: #6754
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 864bf25244a073bf85272524cd90df0a41629577)

luci-mod-network: properly reflect config state in sysfs tristates

When a boolean sysfs option is forcibly set to `0` or `1` in uci, then make
sure to properly reflect that choice state when rendering the widget.

Right now the dropdown incorrectly reverted to "automatic" after saving but
not applying the changes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 4b6b00927b4a1076ed8bf23f3a0327a335ebece5)

luci-mod-network: Rework the (multi) mac for static leases text

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 6bdc5771095627889d43a1cbdc4fc45e3b0e5537)

luci-mod-network: Remove spurious linefeed

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit ab95f8a61835376e670a04d8995212959540d0ad)

luci-mod-network: Rework address helptext for DHCP

Ease translators lives.

This introduces the function customi18n for positional string variables.

Word and grammatical ordering of some languages breaks guarantees for
positional string arguments.

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit e05ee9389735683bf277d962d2bb9ba1908bdf13)

luci-mod-network: Rework match_tag helptext for static leases

Evidently, not all translators get it right.

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 175a94325017964cc6e7e803c753399362c8b85f)

luci-mod-status: add ACL entry for storage index

Add missing ACL entry for storage index page.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
luci-mod-status: expand storage index page with mount points

Expand storage index page with mount points. For custom mounts point we
use the device name and we reference the mount point between ().

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
luci-mod-status: ensure each storage getMountPoints result is unique

Signed-off-by: Paul Donald <newtwen@gmail.com>
Closes #2767

(cherry picked from commit f1db42e67041d7c290fb2221ba5e787aa5e6b8bb)

Merge pull request #6749 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: sync with principal package

luci-app-adblock-fast: sync with principal package

* add support for smartdns ipset/nftset-based blocking

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 4c3cdcb68e8fec3969d2dec73714e1f11c1c749c)

Merge pull request #6743 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: update to 1.1.0-1

luci-app-vnstat2: fix configuration page when database is empty (#6746)

The output of the command "vnstat --dbiflist 1" is empty when there are
no interfaces in the database. Add a check to avoid a "result.stdout is
undefined" error in that case.

Ref: https://forum.openwrt.org/t/error-in-luci-vnstat2-configuration-menu/179700
Fixes: 3ac4f567dfdf ("luci-app-vnstat2: use more efficient way to get database interfaces")
Signed-off-by: Jan Hoffmann <jan@3e8.eu>
(cherry picked from commit c0c37903f2276224c246c2a5ba0fb2732ba0e18a)

[23.05] backport "luci-app-attendedsysupgrade: add x86 efi/bios case" (#6623)

* luci-app-attendedsysupgrade: add x86 efi/bios case

x86 is the only target that allows you to install either EFI or BIOS
images, thereby add an extra check for that.

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit d7e905e83a11d59ea217cd37189040bd6c9d403e)

* luci-app-attendedsysupgrade: fix search for x86 target

The conditional is wrong. IndexOf returns a number and not true/false,
so it does not work.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit 021c4394871e062964e1601775f4c951d0e2b878)

---------

Co-authored-by: Paul Spooren <mail@aparcar.org>
Co-authored-by: Miguel Angel Mulero Martinez <migmul@gmail.com>

luci-app-adblock-fast: update to 1.1.0-1

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 8db9af146acc0e4d5a0aa026636943d3f28468f2)

luci-app-tinyproxy: support socks5 upstream (#6303)

Signed-off-by: Zhang Rui <rui.crater@gmail.com>
(cherry picked from commit fd2d2ac734429a81c9289e33635f28367a97fafe)

luci-app-tinyproxy: error check socks5 upstream (#6303)

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit b3d1d056f471f82ffc931a5cffef125ce36b6d41)

Merge pull request #6574 from innovara/patch-1

Fix ATM HEC label on stats.js

(cherry picked from commit 1e84a03932455e79880e10abc88b92343db8d811)

Adding a DNS option to the wireguard peer config generator.
Some clients like iOS require this explicitly, and so this change
adds the appropriate config with some sensible defaults.

Closes #6351

Signed-off-by: Nicholaos Mouzourakis <nevumx@gmail.com>
Signed-off-by: Paul Donald <newtwen@gmail.com>
Tested-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 990696d73f982de015df7c7d552daef1a03f50c5)
(cherry picked from commit 5b26887c52097dc9364c9b4f4dfb2d6ba2f08818)

Merge pull request #6352 from nevumx/add-wireguard-peer-addresses-config

luci-proto-wireguard: adding an Addresses option to the wireguard peer config generator
(cherry picked from commit 9d746c75f4023bf3c4bcfe77eaa394fbf0188d95)

luci-proto-sstp: add support for custom port (#6634)

Add support for connecting to a custom SSTP port.
See also: https://github.com/openwrt/packages/pull/22405

Signed-off-by: Vladislav Grigoryev <vg.aetera@gmail.com>
(cherry picked from commit 85ad07c59ee3ab82ac5b55732201d17e6cc3ab9c)

luci-app-example: Update with more documentation, more examples (#6503)

* luci-app-example: Update with more documentation, examples
* Update translations file
* Move more YAML support to .md file, improve README
* luci-app-example: Update with more documentation, examples
* luci-app-example: Fix missed call to load_sample_yaml
* Format with tabs by using jsbeautify

(cherry picked from commit 28f805b2e5f95e04515bd7d045a103cc3a366c2c)

luci-proto-wireguard: Remove confirmation dialogue to generate keys (#6697)

Quality of life improvements. Reduce click amounts.
LuCI batches all changes for user-review anyway.

Tested on 23.05.0

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit a5786b5f2f68596b2ea8441fc8ad8ad7cf2ce2a9)

luci-lib-nixio: Fix add_luci_conffiles adding duplicate files (#6568)

* luci-lib-nixio: Fix add_luci_conffiles adding duplicate files

add_luci_conffiles does not check whether the file already exists
when adding the file, which may result in redundant backups in the
sysupgrade backup.

Signed-off-by: Xiang W <wxjstz@126.com>
(cherry picked from commit c2f679962ddf7f6545adacfcf3068370825c43a9)

luci-app-tor: Manage tor-hs onion services (#6476)

* luci-app-tor: Manage Onion services (tor-hs)

The tor-hs packages provides Tor Onion (Hidden) Services.
This is a good option to bypass NAT and have stable access to a router.

Later once the main Tor package gains a support of a Proxy/Bridge configuration.
We can add this to the same luci app as a different view.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 3283cb2ebdb3dbd8ae744125ecd577a0025d14ad)

New app: luci-app-sshtunnel for SSH tunnels (#6424)

* luci-app-sshtunnel: SSH tunnels

The app helps to configure SSH tunnels.
You can also generate an SSH key and see known hosts.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 7d14746ae88a83163a7e34daae70b264285bbe56)

luci-app-statistics: regenerate graphs on window resize

Currently graphs are redrawn only based on the refresh interval
(never or every 5/30/60 seconds).
Since the image size is calculated based on the window size,
redraw graphs (once) also after resizing the window.
This also captures window resize due to orientation change
(e.g., for mobile).
Since multiple resize events are fired when dragging the window
border, there is a 250ms delay for debouncing.

Signed-off-by: Rani Hod <rani.hod@gmail.com>
Tested-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 8fcd52f5130acd1a0738ff47f9bba2c9cc42e662)

Merge pull request #6642 from vgaetera/dnsmasq-network-select

luci-mod-network: use network selector for dnsmasq instances
(cherry picked from commit aa1e049f3600f68cf2f52d8a1eb092155bfe8d8a)

Merge pull request #6651 from jjm2473/upstream/dockerman-hide-submit-on-overview

luci-app-dockerman: hide config buttons in overview page
(cherry picked from commit 568b44edb3bf545e424e7c1a3f162e753b190113)

Merge pull request #6525 from hingbong/issue-6524

luci-app-unbound: dns assist in zone-detail add 'unprotected-loop' option #6524
(cherry picked from commit e3466bd83be36bc1d62257fac3e1635fe18133ba)

Merge pull request #6734 from felagund/patch-1

 luci-mod-network: Update wireless.js to clarify Distance Optimization

(cherry picked from commit 647019cc160c394800db32ce82895245adc302ee)

Merge pull request #6711 from systemcrash/dns_nitpick

luci-mod-network: nitpick of CNAME, MX, SRV syntax formatting
(cherry picked from commit d179d789e5f0542fd17eb2fd591909754c200d86)

Merge pull request #6712 from systemcrash/discard_text

luci-mod-network: Extend helptext for RFC1918 rebind_protection
(cherry picked from commit d75626efcdf322a2c16559c11d5a53bab6dbd8a3)

Merge pull request #6706 from vgaetera/fw-redirect-any

luci-app-firewall: allow redirects using ip family any
(cherry picked from commit 3633bea613d47a04053f0ed4d117629d8d7b7fbe)

Merge pull request #6579 from systemcrash/fix_dnsmasq_instance_fields

luci-mod-network: Fix 'instances' fields for dnsmasq dhcp config entries
(cherry picked from commit d353bc50cd45bd0863170a0fa2f4e474405f8354)

Merge pull request #6400 from vintas/patch-2

docs: fix Client side JS API docs link
(cherry picked from commit 6ddbb30ac360393a69bfc4c0566b32bd23d9bcd0)

Merge pull request #6386 from egc112/egc112-openvpn-advanced-lua

openvpn-advanced.lua request to add OpenVPN data-ciphers

(cherry picked from commit 1c5ebc2a0c635130bd4f86f65dce29a686eb24c4)

Merge pull request #6296 from jjm2473/patch-2

luci-theme-bootstrap: set scroll-margin-top for all elements
(cherry picked from commit 16470a0ab89c7bcde66e9ce7334d8e4d0a4265d0)

Merge pull request #6295 from jjm2473/patch-1

luci-mod-status: fix iptables jump on argon theme
(cherry picked from commit 706668243b8617d5c5529ac76e54f84dc57203e3)

Merge pull request #6216 from ne20002/luci-app-crowdsec-firewall-bouncer

luci-app-crowdsec-firewall-bouncer: new app
(cherry picked from commit dd3f5c65470c62ae977de047e975138195bf45e6)

luci-app-crowdsec-firewall-bouncer: add newline correction

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit e4dc88d875bbb63c90b71888d106b767e907140c)

Merge pull request #5631 from coudu/luci-app-nut-fixes

luci-app-nut: nut-monitor fixes
(cherry picked from commit 51a7e0b8e8db3709feccfa83176ae77372b2b1e7)

Merge pull request #5520 from acooler15/luci-lib-docker

luci-lib-docker: fix chunked decode
(cherry picked from commit 4ade6bd04c6fb29203ade9cb44ecd37ab465a2d6)

luci-proto-modemmanager: Added logging level option and debugmode

Merge github.com:valexi7/luci PR #4328

Signed-off-by: Paul Donald <newtwen@gmail.com>
Signed-off-by: valexi7 <44439515+valexi7@users.noreply.github.com>
(cherry picked from commit 1731fe12b512e10b9c061114d348cd4872422c7a)

Merge pull request #6689 from yggdrasil-openwrt/yggdrasil-2023-11-11

luci-proto-yggdrasil: yggdrasil now supported by netifd
(cherry picked from commit ab3f8254753d18935b1f6d8d015709613b3990a1)

Merge pull request #6690 from yggdrasil-openwrt/rip-luci-app-yggdrasil

luci-app-yggdrasil: remove package in favor of luci-proto-yggdrasil
(cherry picked from commit 8b57cf00120d853318ad2f4f25a196a805f9714d)

Luci-app-usteer: First version of luci-app-usteer

Signed-off-by: Ramon Van Gorkom <github@flightfoil.com>
[most trailing whitespace errors removed]
(cherry picked from commit a6753d44e7bcff305f789e182031fb5f089a8836)

luci-proto-external: migrate from support to cni-protocol to external-protocol

As previously introduced cni protocol support (for netifd) has evolved more
to a multipurpose protocol useful for cni/netavark/some vpn/etc connections
I have decided to rename it from cni-protocol to external-protocol.

That's why also it's luci companion, luci-proto-cni, should be renamed
to luci-proto-external and migrated to support external-protocol.

This patch also adds support for new option in external-protocol, delay.

This closes promise made in #22702 on openwrt packages repository.

Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
(cherry picked from commit 0dd348c87f590861c252194b1720921d8779b4a1)

Merge pull request #6626 from oskarirauta/luci-cni-protocol

luci-proto-cni: protocol update
(cherry picked from commit 88d1893b9c21ce716d9bec4c40f6c9720becf220)

Merge pull request #6719 from Moondarker/advanced-reboot-ver-bump

luci-app-advanced-reboot: bump version number due to changes in code
(cherry picked from commit 6f709303708e70cffff4ec6fd621df97325594bc)

Merge pull request #6715 from systemcrash/32to64hostid

Merge pull request #6709 from Moondarker/mr90x-advanced-reboot

luci-app-advanced-reboot: add support for Mercusys MR90X v1

Merge pull request #6707 from ElbertMai/fix_vxlan6_ui

Merge pull request #6698 from vgaetera/route-defaults-fix

luci-mod-network: fix route defaults

treewide: Backport translations from master and sync

Backport translations from master.
Sync translations.

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

luci-app-travelmate: typo fix

* fixed an encryption description typo in the wireless stations overview

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 3e1d9786cc9382b759805aa27af549b11d8eebea)

luci-mod-network: wireless.js: allow bridges for radius vlan tagged ifaces

Fixes: #6696
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 26e4b69abf0ce97197dea07b9e7c7f944b4c9e7c)

luci-app-vnstat2: use more efficient way to get database interfaces

The currently used command "vnstat --json f 1" can be very slow when the
database contains many entries. This can result in an XHR timeout error
on the configuration page.

Use the "--dbiflist" option instead, which was added in vnStat 2.7.

Fixes: #6702
Signed-off-by: Jan Hoffmann <jan@3e8.eu>
(cherry picked from commit 3ac4f567dfdfd6ee989ceffb025241e605790b6d)

luci-mod-status: nftables.js: fix translation of iif expression

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

luci-app-dawn: error message when service not running

Display a nicer error message when the DAWN service is not running

Signed-off-by: Daniel Vijge <danielvijge@gmail.com>
(cherry picked from commit 69eeebe23d60736c1d4436162444f7b9c53de3ed)

Merge pull request #6693 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: sync version with principal package

luci-app-adblock-fast: sync version with principal package

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 69eff2535ed25e55f2c62450790f4abd64710e42)

luci-app-statistics: harden sysupgrade_backup

Remove sysupgrade_backup from help.  Also have it check parameters.

Signed-off-by: John Kohl <jtk.git@bostonpog.org>
(cherry picked from commit 55e0f28b1ec2f86068d1dad9915641e3fb22afbf)

luci-app-statistics: cleanups of bad spacing

Signed-off-by: John Kohl <jtk.git@bostonpog.org>
(cherry picked from commit 465bfe24fa89703d073e6830a36a5e8eedc8e4b0)

luci-app-statistics: Add backup/restore for RRD statistics

Add a backup/restore capability for rrd data storage in
luci_statistics.  The data storage is typically in /tmp and does not
survive reboot or sysupgrade.  This adds an option for the
administrator to configure the RRD plugin, so that the RRD data are
are preserved with a backup copy in the overlay file system.

This works for shutdown/reboot, sysupgrade (backup config files,
restore config files, and true sysupgrade).

Also fix a bug where starting luci_statistics for the first time would
not get a restart a running collectd: during install of the package
when it is not included in the base flashed image, collectd might be
started when it got installed/configured before this package gets
installed/configured.  So we need to check if it's running, and
restart it to use the luci_statistics configuration.

Signed-off-by: John Kohl <jtk.git@bostonpog.org>
(cherry picked from commit ad98af3a2be6c87b1f36cec05c8c3529831b7787)