diff --git a/bcm27xx-eeprom/Makefile b/bcm27xx-eeprom/Makefile index 1dcf6883b..b114ee11a 100644 --- a/bcm27xx-eeprom/Makefile +++ b/bcm27xx-eeprom/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bcm27xx-eeprom -PKG_VERSION:=47976e4409c6999a8e211976c75c60a97c90275c -PKG_RELEASE:=4 +PKG_VERSION:=v2022.04.26-138a1 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/raspberrypi/rpi-eeprom/tar.gz/$(PKG_VERSION)? -PKG_HASH:=skip +PKG_HASH:=7c54839e68f226c5853fb63c8a1539b729d84b2e6bac311a51766c601d10a413 PKG_LICENSE:=BSD-3-Clause Custom PKG_LICENSE_FILES:=LICENSE @@ -21,7 +21,7 @@ TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) define Package/bcm27xx-eeprom SECTION:=utils CATEGORY:=Utilities - DEPENDS:=bcm27xx-userland +blkid +pciutils +python3-light +coreutils +coreutils-od + DEPENDS:=bcm27xx-userland +blkid +coreutils +coreutils-od +pciutils +python3-light TITLE:=BCM27xx EEPROM tools endef @@ -43,6 +43,7 @@ define Package/bcm27xx-eeprom/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/rpi-eeprom-config $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/rpi-eeprom-digest $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/rpi-eeprom-update $(1)/usr/bin $(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader diff --git a/bcm27xx-eeprom/patches/0004-rpi-eeprom-update-chmod-silent-f-is-not-supported.patch b/bcm27xx-eeprom/patches/0004-rpi-eeprom-update-chmod-silent-f-is-not-supported.patch new file mode 100644 index 000000000..5872f12da --- /dev/null +++ b/bcm27xx-eeprom/patches/0004-rpi-eeprom-update-chmod-silent-f-is-not-supported.patch @@ -0,0 +1,33 @@ +From 8376ac74390af0ad736c88615e128b82a75eebc0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= +Date: Fri, 19 Feb 2021 10:54:23 +0100 +Subject: [PATCH] rpi-eeprom-update: chmod silent (-f) is not supported +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Álvaro Fernández Rojas +--- + rpi-eeprom-update | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/rpi-eeprom-update ++++ b/rpi-eeprom-update +@@ -200,7 +200,7 @@ applyRecoveryUpdate() + || die "Failed to copy ${TMP_EEPROM_IMAGE} to ${BOOTFS}" + + # For NFS mounts ensure that the files are readable to the TFTP user +- chmod -f go+r "${BOOTFS}/pieeprom.upd" "${BOOTFS}/pieeprom.sig" \ ++ chmod go+r "${BOOTFS}/pieeprom.upd" "${BOOTFS}/pieeprom.sig" \ + || die "Failed to set permissions on eeprom update files" + fi + +@@ -211,7 +211,7 @@ applyRecoveryUpdate() + || die "Failed to copy ${VL805_UPDATE_IMAGE} to ${BOOTFS}/vl805.bin" + + # For NFS mounts ensure that the files are readable to the TFTP user +- chmod -f go+r "${BOOTFS}/vl805.bin" "${BOOTFS}/vl805.sig" \ ++ chmod go+r "${BOOTFS}/vl805.bin" "${BOOTFS}/vl805.sig" \ + || die "Failed to set permissions on eeprom update files" + fi + diff --git a/bcm27xx-eeprom/patches/0004-rpi-eeprom-update-remove-chmod.patch b/bcm27xx-eeprom/patches/0004-rpi-eeprom-update-remove-chmod.patch deleted file mode 100644 index a79fa89b1..000000000 --- a/bcm27xx-eeprom/patches/0004-rpi-eeprom-update-remove-chmod.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/rpi-eeprom-update 2020-11-05 21:58:02.247836497 +0100 -+++ b/rpi-eeprom-update 2020-11-05 21:58:36.911266307 +0100 -@@ -212,8 +212,8 @@ - || die "Failed to copy ${TMP_EEPROM_IMAGE} to ${BOOTFS}" - - # For NFS mounts ensure that the files are readable to the TFTP user -- chmod -f go+r "${BOOTFS}/pieeprom.upd" "${BOOTFS}/pieeprom.sig" \ -- || die "Failed to set permissions on eeprom update files" -+ #chmod -f go+r "${BOOTFS}/pieeprom.upd" "${BOOTFS}/pieeprom.sig" \ -+ # || die "Failed to set permissions on eeprom update files" - fi - - if [ -n "${VL805_UPDATE_IMAGE}" ]; then -@@ -224,8 +224,8 @@ - || die "Failed to copy ${VL805_UPDATE_IMAGE} to ${BOOTFS}/vl805.bin" - - # For NFS mounts ensure that the files are readable to the TFTP user -- chmod -f go+r "${BOOTFS}/vl805.bin" "${BOOTFS}/vl805.sig" \ -- || die "Failed to set permissions on eeprom update files" -+ #chmod -f go+r "${BOOTFS}/vl805.bin" "${BOOTFS}/vl805.sig" \ -+ # || die "Failed to set permissions on eeprom update files" - fi - - cp -f "${RECOVERY_BIN}" "${BOOTFS}/recovery.bin" \ diff --git a/bcm27xx-eeprom/patches/0005-rpi-eeprom-config-change-default-text-editor.patch b/bcm27xx-eeprom/patches/0005-rpi-eeprom-config-change-default-text-editor.patch new file mode 100644 index 000000000..6feb7602c --- /dev/null +++ b/bcm27xx-eeprom/patches/0005-rpi-eeprom-config-change-default-text-editor.patch @@ -0,0 +1,22 @@ +--- a/rpi-eeprom-config ++++ b/rpi-eeprom-config +@@ -166,8 +166,8 @@ def edit_config(eeprom=None): + """ + Implements something like 'git commit' for editing EEPROM configs. + """ +- # Default to nano if $EDITOR is not defined. +- editor = 'nano' ++ # Default to vi if $EDITOR is not defined. ++ editor = 'vi' + if 'EDITOR' in os.environ: + editor = os.environ['EDITOR'] + +@@ -428,7 +428,7 @@ Operating modes: + + To cancel the pending update run 'sudo rpi-eeprom-update -r' + +- The default text editor is nano and may be overridden by setting the 'EDITOR' ++ The default text editor is vi and may be overridden by setting the 'EDITOR' + environment variable and passing '-E' to 'sudo' to preserve the environment. + + 6. Signing the bootloader config file. diff --git a/luci-app-mptcp/po/zh_Hans/mptcp.po b/luci-app-mptcp/po/zh_Hans/mptcp.po index cfa888b3b..36a27a977 100644 --- a/luci-app-mptcp/po/zh_Hans/mptcp.po +++ b/luci-app-mptcp/po/zh_Hans/mptcp.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"PO-Revision-Date: 2022-08-12 12:08+0000\n" +"PO-Revision-Date: 2022-08-12 19:29+0000\n" "Last-Translator: Weblate Admin \n" "Language-Team: Chinese (Simplified) \n" @@ -85,7 +85,6 @@ msgid "Grant UCI access for luci-app-mptcp" msgstr "授予UCI访问luci-app-mptcp的权限" #: luci-app-mptcp/luasrc/view/mptcp/mptcp_check.htm:73 -#, fuzzy msgid "" "If you get \"TCPOptionMPTCPCapable [...] Sender's Key\" at the end, then " "MPTCP is supported. If there is a \"-TCPOptionMPTCPCapable\", then it's " @@ -167,7 +166,6 @@ msgstr "多路径TCP调度程序" #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:47 #, fuzzy -#| msgid "Multipath TCP" msgid "Multipath TCP version" msgstr "多路径TCP" diff --git a/luci-app-openmptcprouter/po/de/openmptcprouter.po b/luci-app-openmptcprouter/po/de/openmptcprouter.po index fddbdb4c0..73e6b7cf6 100644 --- a/luci-app-openmptcprouter/po/de/openmptcprouter.po +++ b/luci-app-openmptcprouter/po/de/openmptcprouter.po @@ -357,7 +357,6 @@ msgstr "SQM aktiv" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:952 #, fuzzy -#| msgid "Enable SQM" msgid "Enable SQM autorate" msgstr "SQM aktiv" @@ -1418,3 +1417,7 @@ msgstr "" #~ msgid "Redundant" #~ msgstr "redundant" + +#, fuzzy +#~ msgid "Disable HTTP test on Server API in status page" +#~ msgstr "Server-Ping Status-Prüfung aus" diff --git a/luci-app-openmptcprouter/po/fr/openmptcprouter.po b/luci-app-openmptcprouter/po/fr/openmptcprouter.po index b48aaa23c..c55a741bb 100644 --- a/luci-app-openmptcprouter/po/fr/openmptcprouter.po +++ b/luci-app-openmptcprouter/po/fr/openmptcprouter.po @@ -1560,3 +1560,6 @@ msgstr "whois :" #~ msgid "MLVPN can replace Glorytun with connection with same latency" #~ msgstr "" #~ "MLVPN peut remplacer Glorytun pour les connexions avec la même latence" + +#~ msgid "Disable HTTP test on Server API in status page" +#~ msgstr "Désactiver le test HTTP sur l'API du serveur dans la page d'état" diff --git a/luci-app-openmptcprouter/po/it/openmptcprouter.po b/luci-app-openmptcprouter/po/it/openmptcprouter.po index eeffeb590..19c08ec9d 100644 --- a/luci-app-openmptcprouter/po/it/openmptcprouter.po +++ b/luci-app-openmptcprouter/po/it/openmptcprouter.po @@ -11,15 +11,19 @@ msgstr "" "X-Generator: Weblate 4.10.1\n" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:315 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:307 msgid "A Dead Simple VPN is a TCP VPN that can replace Glorytun TCP" msgstr "Una Dead Simple VPN è una VPN TCP che può sostituire Glorytun TCP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:310 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:312 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:302 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:304 msgid "A Dead Simple VPN key" msgstr "Chiave Dead Simple VPN" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:108 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:100 msgid "" "A second server's IP can be set for dual IPv4/IPv6 server if WAN IPv6 are set" msgstr "" @@ -27,23 +31,28 @@ msgstr "" "impostato il server WAN IPv6" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:119 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:111 msgid "API username to retrieve personnalized settings from the server." msgstr "" "Nome utente API per recuperare le impostazioni personalizzate dal server." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:814 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:809 msgid "APN" msgstr "APN" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:742 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:734 msgid "Accept IPv6 RA" msgstr "Accetta IPv6 RA" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:164 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:156 msgid "Add a new server" msgstr "Aggiungi un nuovo server" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:1044 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:989 msgid "Add an interface" msgstr "Aggiungi un'interfaccia" @@ -53,10 +62,12 @@ msgid "Advanced Settings" msgstr "Impostazioni avanzate" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:169 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:161 msgid "Advanced settings" msgstr "Impostazioni avanzate" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:392 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:384 msgid "" "All VPN available here can do aggregation over MPTCP or using own internal " "method." @@ -69,6 +80,7 @@ msgid "All router settings" msgstr "Impostazioni del router" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:284 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:276 msgid "" "An Advanced Encryption Standard (AES) instruction set is integrated in the " "processor." @@ -77,11 +89,14 @@ msgstr "" "processore." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:840 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:835 msgid "Authentication Type" msgstr "Tipo di autenticazione" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:878 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:894 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:873 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:889 msgid "Backup" msgstr "Backup" @@ -91,6 +106,7 @@ msgid "Backup on server" msgstr "Backup su server" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:383 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:371 msgid "Balancing" msgstr "Bilanciamento" @@ -99,24 +115,29 @@ msgid "Beta" msgstr "Beta" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:312 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:310 msgid "Big time difference between the server and the router" msgstr "Grande differenza di fuso orario tra il server e il router" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:572 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:564 msgid "Bridge" msgstr "Ponte" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:620 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:618 msgid "Bridge can't have multipath enabled" msgstr "Il Bridge non può avere il multipath abilitato" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:295 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:287 msgid "By default VPN is used for any traffic that is not TCP." msgstr "" "Per impostazione predefinita, la VPN viene utilizzata per qualsiasi traffico " "che non sia TCP." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:229 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:221 msgid "" "By default proxy is used for any traffic that is TCP (and UDP for V2Ray)." msgstr "" @@ -124,6 +145,7 @@ msgstr "" "traffico che sia TCP (e UDP per V2Ray)." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:845 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:840 msgid "CHAP" msgstr "CHAP" @@ -154,10 +176,12 @@ msgid "Can\\'t ping server" msgstr "Impossibile eseguire il ping del server" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:423 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:415 msgid "China" msgstr "Cina" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:576 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:568 msgid "" "Choose MacVLAN if you want to create a virtual interface based on a physical " "interface." @@ -168,6 +192,9 @@ msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:510 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:596 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:655 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:502 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:588 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:647 msgid "Choose physical interface." msgstr "Scegli l'interfaccia fisica." @@ -176,19 +203,24 @@ msgid "Core temp:" msgstr "Temp. Nucleo:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:418 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:410 msgid "Country" msgstr "Nazione" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:415 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:407 msgid "Country settings" msgstr "Impostazioni nazionali del router" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:462 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:607 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:454 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:599 msgid "DHCP" msgstr "DHCP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:608 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:600 msgid "DHCPv6" msgstr "DHCPv6" @@ -197,36 +229,45 @@ msgid "DNS issue: can\\'t resolve hostname" msgstr "Problema DNS: impossibile risolvere il nome host" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:367 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:355 msgid "Debug" msgstr "Debug" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:231 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:223 msgid "Default Proxy" msgstr "Proxy predefinito" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:345 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:337 msgid "Default VPN" msgstr "VPN predefinita" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:85 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:551 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:77 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:543 msgid "Delete" msgstr "Elimina" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:749 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:774 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:794 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:741 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:768 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:789 msgid "Device" msgstr "Dispositivo" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:259 #, fuzzy -#| msgid "Disable HTTP test on Server API in status page" msgid "Disable HTTP test on Server API" msgstr "Disabilitare il test HTTP sulle API Server nella pagina di stato" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:357 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:362 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:345 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:350 msgid "Disable ModemManager" msgstr "Disabilita ModemManager" @@ -239,10 +280,12 @@ msgid "Disable TCP Fast Open on Linux and Shadowsocks configuration" msgstr "Disabilita TCP Fast Open su Linux e configurazione Shadowsocks" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:307 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:295 msgid "Disable default gateway" msgstr "Disabilita il gateway predefinito" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:312 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:300 msgid "Disable default gateway, no internet if VPS are down" msgstr "" "Disabilita il gateway predefinito, niente Internet se i VPS sono inattivi" @@ -252,26 +295,32 @@ msgid "Disable external check" msgstr "Disabilita controllo esterno" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:244 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:238 msgid "Disable gateway ping" msgstr "Disabilita il ping del gateway" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:249 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:243 msgid "Disable gateway ping check in status page" msgstr "Disabilita il controllo del ping del gateway nella pagina di stato" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:285 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:279 msgid "Disable interfaces auto rename" msgstr "Disabilita auto rinomina interfacce" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:342 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:330 msgid "Disable multipath test using tracebox" msgstr "Disabilita il test multipath usando tracebox" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:347 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:335 msgid "Disable nDPI" msgstr "Disabilita nDPI" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:352 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:340 msgid "Disable nDPI, used for protocols in OMR-ByPass" msgstr "" @@ -283,63 +332,80 @@ msgstr "" "a questo router" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:290 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:284 msgid "Disable renaming interfaces" msgstr "Disabilita rinomina interfaccia" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:327 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:332 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:315 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:320 #, fuzzy msgid "Disable route loop detection" msgstr "Disabilita il ping del server" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:152 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:144 msgid "Disable server" msgstr "Disabilita il server" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:254 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:248 msgid "Disable server http test" msgstr "Disabilita http test server" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:317 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:305 msgid "Disable server ping" msgstr "Disabilita il ping del server" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:322 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:310 msgid "Disable server ping status check" msgstr "Disabilitare il controllo dello stato del ping del server" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:337 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:325 msgid "Disable tracebox test" msgstr "Disabilita il test Tracebox" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:197 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:876 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:892 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:189 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:871 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:887 msgid "Disabled" msgstr "Disabilitato" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:988 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:933 msgid "Download speed (Kb/s)" msgstr "Velocità di download (Kb / s)" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:381 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:369 msgid "Dynamic change" msgstr "Cambiamento dinamico" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:402 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:390 msgid "Enable Bridge Acceleration" msgstr "Abilita Accelerazione modalità Bridge" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:217 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:209 msgid "Enable DNS64" msgstr "Abilita DNS64" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:396 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:384 msgid "Enable Fast Patch offloading for connections" msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:187 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:194 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:186 msgid "Enable IPv6" msgstr "Abilita IPv6" @@ -352,12 +418,12 @@ msgid "Enable SIP ALG" msgstr "Abilita SIP ALG" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:942 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:923 msgid "Enable SQM" msgstr "Abilita MQ" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:952 #, fuzzy -#| msgid "Enable SQM" msgid "Enable SQM autorate" msgstr "Abilita MQ" @@ -370,20 +436,26 @@ msgid "Enable TCP Low Latency" msgstr "Abilita TCP bassa latenza" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:372 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:360 msgid "Enable debug logs" msgstr "Abilita registro di debug" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:198 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:875 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:891 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:190 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:870 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:886 msgid "Enabled" msgstr "Abilitato" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:267 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:259 msgid "Encryption" msgstr "Crittografia" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:288 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:280 msgid "Encryption method is used for Shadowsocks, V2Ray, Glorytun and OpenVPN." msgstr "" "Il metodo di crittografia viene utilizzato per Shadowsocks, V2Ray, Glorytun " @@ -394,6 +466,7 @@ msgid "Filesystem is readonly" msgstr "Il filesystem è di sola lettura" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:427 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:419 msgid "For China, set an accessible DNS and disable DNSSEC." msgstr "Per la Cina, imposta un DNS accessibile e disabilita DNSSEC." @@ -402,33 +475,42 @@ msgid "Force TTL" msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:186 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:178 msgid "Force retrieve all keys from server." msgstr "Forza il recupero di tutte le chiavi dal server." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:181 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:173 msgid "Force retrieve settings" msgstr "Forza il recupero delle impostazioni" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:834 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:829 msgid "GPRS only" msgstr "Solo GPRS" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:563 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:766 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:561 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:764 msgid "Gateway DOWN" msgstr "Tipi di pagamento" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:566 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:564 msgid "Gateway IPv6 DOWN" msgstr "Gateway IPV6 non raggiungibile" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:303 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:295 msgid "Glorytun TCP is used by default for UDP and ICMP" msgstr "" "Glorytun TCP viene utilizzato per impostazione predefinita per UDP e ICMP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:298 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:300 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:290 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:292 msgid "Glorytun key" msgstr "Chiave Glorytun" @@ -472,38 +554,51 @@ msgstr "IPv4 TCP SYN retries2" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:518 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:661 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:510 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:653 msgid "IPv4 address" msgstr "Indirizzi IPv4" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:677 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:669 msgid "IPv4 gateway" msgstr "Gateway IPv4" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:524 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:671 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:516 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:663 msgid "IPv4 netmask" msgstr "Netmask IPv4" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:207 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:199 msgid "IPv6 Prefix" msgstr "Prefisso IPv6" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:691 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:718 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:683 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:710 msgid "IPv6 address" msgstr "Indirizzi IPv6" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:705 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:728 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:697 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:720 msgid "IPv6 gateway" msgstr "Gateway IPv6" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:634 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:806 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:632 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:804 msgid "IPv6 route received" msgstr "Instradamento IPv6 ricevuto" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:192 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:184 msgid "IPv6 settings" msgstr "Impostazioni IPv6" @@ -512,14 +607,17 @@ msgid "IPv6 tunnel DOWN" msgstr "Tunnel IPv6 GIÙ" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:352 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:350 msgid "IPv6:" msgstr "IPv6:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:222 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:214 msgid "If host support NAT64, you can enable DNS64 support." msgstr "Se l'host supporta NAT64, puoi abilitare il supporto DNS64." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:537 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:529 msgid "Interfaces settings" msgstr "Impostazioni delle interfacce" @@ -529,12 +627,19 @@ msgstr "Impostazioni delle interfacce" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:315 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:327 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:339 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:244 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:254 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:295 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:307 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:319 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:331 msgid "Key is retrieved from server API by default." msgstr "" "La chiave viene recuperata dall'API del server per impostazione " "predefinita." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:129 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:121 msgid "" "Key to configure and retrieve others keys from Server and to set server " "settings from OpenMPTCProuter." @@ -543,20 +648,26 @@ msgstr "" "le impostazioni del server da OpenMPTCProuter." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:435 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:427 msgid "LAN interfaces settings" msgstr "Impostazioni delle interfacce LAN" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:832 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:827 msgid "LTE" msgstr "LTE" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:446 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:557 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:438 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:549 msgid "Label" msgstr "Etichetta" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:452 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:562 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:444 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:554 msgid "Label for the interface" msgstr "Etichetta per l'interfaccia" @@ -566,24 +677,30 @@ msgstr "Ultimo backup disponibile sul server:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:124 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:329 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:327 msgid "Latest available version" msgstr "Ultima versione disponibile" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:130 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:335 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:333 msgid "Load:" msgstr "Carico:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:630 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:628 msgid "Looping route detected" msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:327 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:319 msgid "MLVPN can replace Glorytun with connections with same latency" msgstr "MLVPN può sostituire Glorytun con connessioni con la stessa latenza" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:322 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:324 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:314 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:316 msgid "MLVPN password" msgstr "Password MLVPN" @@ -592,19 +709,24 @@ msgid "MPTCP is not enabled on the server" msgstr "MPTCP non è abilitato sul server" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:346 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:344 msgid "MPTCP may not be enabled on the server" msgstr "MPTCP non è abilitato sul server" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:401 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:929 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:393 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:913 msgid "MPTCP over VPN" msgstr "MPTCP su VPN" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:398 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:390 msgid "MPTCP over VPN settings" msgstr "Impostazioni MPTCP su VPN" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:399 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:391 msgid "" "MPTCP over VPN should be used only when Multipath TCP is blocked on a " "connection." @@ -613,35 +735,44 @@ msgstr "" "una connessione." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:571 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:563 msgid "MacVLAN" msgstr "MacVLAN" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:877 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:893 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:872 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:888 msgid "Master" msgstr "Principale" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:377 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:365 msgid "Master interface selection" msgstr "Selezione dell'interfaccia principale" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:421 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:409 msgid "Maximum scaling CPU frequency" msgstr "Frequenza CPU di ridimensionamento massima" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:415 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:403 msgid "Minimum scaling CPU frequency" msgstr "Frequenza CPU con ridimensionamento minimo" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:829 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:824 msgid "Modem default" msgstr "Impostazione predefinita del modem" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:863 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:858 msgid "Modem init timeout" msgstr "Timeout inizializzazione modem" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:609 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:601 msgid "ModemManager" msgstr "ModemManager" @@ -651,6 +782,8 @@ msgstr "È abilitata più di una VPN predefinita" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:872 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:888 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:867 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:883 msgid "Multipath TCP" msgstr "Multipath TCP" @@ -658,42 +791,57 @@ msgstr "Multipath TCP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:609 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:789 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:795 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:601 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:607 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:787 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:793 msgid "Multipath current state is" msgstr "Lo stato corrente di Multipath è" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:598 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:784 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:596 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:782 msgid "Multipath master already defined" msgstr "Multipath principale già definito" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:569 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:769 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:567 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:767 msgid "Multipath seems to be blocked on the connection" msgstr "Multipath sembra essere bloccato sulla connessione" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:610 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:602 msgid "NCM" msgstr "NCM" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:843 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:838 msgid "NONE" msgstr "NESSUNO" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:625 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:623 msgid "Network interface MAC address duplicated" msgstr "Interfaccia di rete con MAC address duplicata" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:615 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:801 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:613 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:799 msgid "Network interface duplicated" msgstr "Interfaccia di rete duplicata" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:581 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:579 msgid "Network interface not in WAN firewall zone" msgstr "Interfaccia di rete non in WAN firewall zone" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:901 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:903 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:899 msgid "Network overview" msgstr "Panoramica della rete" @@ -703,6 +851,8 @@ msgstr "Impostazioni reti" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:556 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:759 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:554 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:757 msgid "No IP defined" msgstr "Nessun IP definito" @@ -711,15 +861,19 @@ msgid "No IPv6 access" msgstr "Nessun accesso IPv6" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:577 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:575 msgid "No Server http response after 1 second" msgstr "Nessuna risposta dal server HTTP dopo 1 secondo" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:573 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:773 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:571 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:771 msgid "No Server ping response after 1 second" msgstr "Nessuna risposta al ping dal server dopo 1 secondo" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:658 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:656 msgid "No WAN with multipath enabled:" msgstr "Nessuna WAN con multipath abilitata:" @@ -728,15 +882,19 @@ msgid "No available backup on server." msgstr "Nessun backup disponibile sul server." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:382 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:370 msgid "No change" msgstr "Nessun cambiamento" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:821 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:819 msgid "No data" msgstr "Nessun dato" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:560 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:763 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:558 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:761 msgid "No gateway defined" msgstr "Nessun gateway definito" @@ -759,10 +917,13 @@ msgstr "Nessun server definito" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:273 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:421 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:265 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:413 msgid "None" msgstr "Nessuno" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:570 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:562 msgid "Normal" msgstr "Normale" @@ -787,14 +948,17 @@ msgid "Obfuscating will be enabled on both side" msgstr "L'offuscamento sarà abilitato su entrambi i lati" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:380 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:368 msgid "On wizard change" msgstr "Al cambio della procedura guidata" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:241 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:233 msgid "Only ShadowSocks is supported with server multiple IPs for now." msgstr "Solo ShadowSocks è supportato con server multi IP per adesso." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:882 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:877 msgid "" "Only one interface must be set as \"Master\", this should be the most stable " "interface." @@ -803,12 +967,14 @@ msgstr "" "impostata l'interfaccia più stabile." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:143 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:135 msgid "Only one server can be master, else all servers are set as backup." msgstr "" "Solo un server può essere master, altrimenti tutti i server sono impostati " "come backup." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:399 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:391 msgid "Only work with Shadowsocks as proxy." msgstr "Funziona solo con Shadowsocks come proxy." @@ -817,6 +983,7 @@ msgid "OpenMPTCProuter" msgstr "OpenMPTCProuter" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:392 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:384 msgid "OpenVPN can't be used in multi VPS configuration." msgstr "OpenVPN non può essere utilizzato nella configurazione multi VPS." @@ -826,57 +993,74 @@ msgstr "Ottimizza per la latenza invece che per la larghezza di banda" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:463 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:613 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:455 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:605 msgid "Other" msgstr "Altro" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:231 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:225 msgid "Other settings" msgstr "Altre impostazioni" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:844 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:839 msgid "PAP" msgstr "PAP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:846 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:841 msgid "PAP/CHAP" msgstr "PAP/CHAP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:857 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:852 msgid "PAP/CHAP password" msgstr "PAP/CHAP password" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:851 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:846 msgid "PAP/CHAP username" msgstr "Nome utente PAP/CHAP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:820 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:815 msgid "PIN code" msgstr "Codice PIN" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:611 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:603 msgid "PPPoE" msgstr "PPPoE" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:475 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:581 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:622 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:467 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:573 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:614 msgid "Physical interface" msgstr "Interfaccia fisica" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:830 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:825 msgid "Prefer LTE" msgstr "Preferisci LTE" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:831 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:826 msgid "Prefer UMTS" msgstr "Preferisci UMTS" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:102 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:94 msgid "Primary server IP" msgstr "IP principale del server" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:457 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:602 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:449 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:594 msgid "Protocol" msgstr "Protocollo" @@ -885,14 +1069,17 @@ msgid "Proxy is DISABLED" msgstr "Il proxy è DISABILITATO" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:228 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:220 msgid "Proxy settings" msgstr "Impostazioni Proxy" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:357 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:355 msgid "Proxy traffic:" msgstr "Traffico proxy:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:612 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:604 msgid "QMI" msgstr "QMI" @@ -901,6 +1088,7 @@ msgid "QoS permit to prioritize any upload traffic." msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:393 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:381 msgid "Qualcomm Shortcut FE driver" msgstr "" @@ -909,6 +1097,7 @@ msgid "Redirects all ports from server to this router" msgstr "Reindirizza tutte le porte dal server a questo router" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:1054 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:999 msgid "Reset" msgstr "Resetta" @@ -917,6 +1106,7 @@ msgid "Restore backup" msgstr "Ripristina backup" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:179 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:171 msgid "Retrieve settings from server" msgstr "Recupera le impostazioni dal server" @@ -932,26 +1122,33 @@ msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:447 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:1053 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:435 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:998 msgid "Save & Apply" msgstr "Salva e applica" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:239 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:233 msgid "Save vnstats statistics on disk" msgstr "Salva le statistiche di vnstats su disco" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:234 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:228 msgid "Save vnstats stats" msgstr "Salva le statistiche di vnstats" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:427 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:415 msgid "Scaling governor" msgstr "Governatore in scala" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:103 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:95 msgid "Secondary server IP" msgstr "IP secondario del server" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:1047 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:992 msgid "Select the device you want to base the interface on." msgstr "Seleziona il dispositivo su cui vuoi basare l'interfaccia." @@ -962,58 +1159,79 @@ msgstr "Invia backup" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:91 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:93 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:100 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:83 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:85 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:92 msgid "Server IP" msgstr "Indirizzo IP del server" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:95 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:105 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:87 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:97 msgid "Server IP will be set for proxy and VPN" msgstr "L'IP del server verrà impostato per proxy e VPN" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:124 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:126 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:116 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:118 msgid "Server key" msgstr "Chiave server" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:43 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:75 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:67 msgid "Server settings" msgstr "Impostazioni server" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:114 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:116 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:106 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:108 msgid "Server username" msgstr "Nome utente del server" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:826 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:821 msgid "Service Type" msgstr "Tipo di servizio" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:409 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:401 msgid "Set VPN to use for MPTCP over VPN." msgstr "Seleziona la VPN da utilizzare per MPTCP su VPN." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:666 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:696 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:723 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:658 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:688 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:715 msgid "Set an IP in the same network as the modem" msgstr "Imposta un IP nella stessa rete del modem" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:416 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:408 msgid "Set configuration for countries with some specificities." msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:682 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:710 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:733 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:674 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:702 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:725 msgid "Set here IP of the modem" msgstr "Imposta qui l'IP del modem" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:138 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:130 msgid "Set server as master" msgstr "Imposta server come master" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:240 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:232 msgid "" "Set the default Proxy used for TCP when ShadowSocks is enabled, for TCP and " "UDP when V2Ray is enabled." @@ -1022,6 +1240,7 @@ msgstr "" "abilitato, per TCP e UDP quando V2Ray è abilitato." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:392 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:384 #, fuzzy msgid "" "Set the default VPN used for ICMP (and UDP if proxy used is shadowsocks), " @@ -1031,6 +1250,7 @@ msgstr "" "abilitato, per tutto il traffico se ShadowSocks è disabilitato." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:998 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:943 msgid "" "Set value between 80-95% of max download speed link. 0 to disable SQM/QoS." msgstr "" @@ -1038,6 +1258,7 @@ msgstr "" "del collegamento" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:1014 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:959 msgid "" "Set value between 80-95% of max upload speed link. 0 to disable SQM/QoS." msgstr "" @@ -1053,15 +1274,19 @@ msgid "ShadowSocks is not running" msgstr "ShadowSocks non è in esecuzione" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:252 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:244 msgid "ShadowSocks is used for TCP." msgstr "ShadowSocks viene utilizzato per TCP." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:247 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:249 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:239 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:241 msgid "ShadowSocks key" msgstr "Chiave ShadowSocks" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:171 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:163 #, fuzzy msgid "Show advanced settings" msgstr "Impostazioni avanzate" @@ -1072,6 +1297,8 @@ msgstr "Mostra tutte le impostazioni" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:461 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:606 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:453 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:598 msgid "Static address" msgstr "Indirizzo statico" @@ -1080,6 +1307,7 @@ msgid "Status" msgstr "Stato proprietà" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:412 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:400 msgid "Systems settings" msgstr "Impostazioni di sistema" @@ -1094,6 +1322,7 @@ msgstr "" "interrotta all'estremità locale." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:286 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:278 msgid "" "There is no Advanced Encryption Standard (AES) instruction set integrated in " "the processor, you should use chacha20." @@ -1120,32 +1349,40 @@ msgstr "" "ritrasmissioni RTO rimangono non riconosciute." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:269 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:263 #, fuzzy msgid "Timeout for VPS checks on status pages" msgstr "Disabilitare il controllo dello stato del ping del gateway" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:279 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:273 msgid "Timeout for retrieving WANs IP on status pages" msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:367 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:365 msgid "Total traffic:" msgstr "Traffico globale:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:567 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:559 msgid "Type" msgstr "Tipo" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:339 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:331 msgid "UBOND can replace Glorytun with connections with same latency" msgstr "UBOND può sostituire Glorytun con connessioni con la stessa latenza" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:334 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:336 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:326 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:328 msgid "UBOND password" msgstr "Password UBOND" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:833 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:828 msgid "UMTS/GPRS" msgstr "UMTS/GPRS" @@ -1163,16 +1400,20 @@ msgid "Update server" msgstr "Aggiorna server" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:1004 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:949 msgid "Upload speed (Kb/s)" msgstr "Velocità di caricamento (Kb / s)" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:141 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:341 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:339 msgid "Uptime:" msgstr "Tempo di funzionamento:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:993 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:1009 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:938 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:954 msgid "Used by Glorytun UDP and SQM/QoS if enabled. 0 to use default value." msgstr "" "Utilizzato da Glorytun UDP e SQM / QoS se abilitato. 0 per usare i valori " @@ -1183,19 +1424,24 @@ msgid "V2Ray is not running" msgstr "V2Ray non è in esecuzione" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:262 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:254 msgid "V2Ray is used for TCP and UDP." msgstr "V2Ray è utilizzato per TCP e UDP." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:259 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:251 msgid "V2Ray user" msgstr "Utente V2Ray" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:257 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:249 msgid "V2Ray user id" msgstr "ID utente V2Ray" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:651 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:652 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:643 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:644 msgid "VLAN" msgstr "VLAN" @@ -1204,10 +1450,12 @@ msgid "VPN is not running" msgstr "VPN non è in esecuzione" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:294 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:286 msgid "VPN settings" msgstr "Impostazioni VPN" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:362 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:360 msgid "VPN traffic:" msgstr "Traffico VPN:" @@ -1216,20 +1464,26 @@ msgid "VPN tunnel DOWN" msgstr "Tunnel VPN non stabilito" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:264 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:258 msgid "VPS checks timeout" msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:322 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:320 msgid "Version" msgstr "Versione" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:274 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:268 msgid "WAN IPs retrieve timeout" msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:586 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:591 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:777 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:584 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:589 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:775 msgid "Wan IP and gateway are identical" msgstr "IP Wan e gateway sono identici" @@ -1243,19 +1497,21 @@ msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:301 #, fuzzy -#| msgid "V2Ray is used for TCP and UDP." msgid "When proxy V2Ray is used, use it for UDP" msgstr "V2Ray è utilizzato per TCP e UDP." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:295 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:289 msgid "When proxy shadowsocks is used, use it for UDP if VPN down" msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:73 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:65 msgid "Wizard" msgstr "Procedura guidata" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:422 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:414 msgid "World" msgstr "" @@ -1265,6 +1521,7 @@ msgid "You" msgstr "Ti" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:934 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:918 msgid "You can enable MPTCP over VPN if your provider filter Multipath TCP." msgstr "Puoi abilitare MPTCP su VPN se il tuo provider filtra Multipath TCP." @@ -1275,28 +1532,33 @@ msgid "" msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:467 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:459 msgid "You can use DHCP if you have multiple real ethernet ports." msgstr "Puoi usare DHCP se hai più porte ethernet reali." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:617 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:609 msgid "" "You can use DHCP if you have multiple real ethernet ports. Select other if " "you want to use another protocol available in Network Interfaces page." msgstr "Puoi usare DHCP se hai una WAN per ogni interfaccia." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:212 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:204 msgid "You can use a public IPv6 prefix only if you set only one server." msgstr "" "È possibile utilizzare un prefisso IPv6 pubblico solo se si imposta un solo " "server." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:538 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:530 msgid "You must disable DHCP on your modems and set IP in different networks." msgstr "" "È necessario disabilitare il DHCP sui modem e impostare l'IP in reti " "diverse." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:202 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:194 msgid "You should disable IPv6 here if server doesn't provide IPv6." msgstr "Dovresti disabilitare IPv6 qui se il server non fornisce IPv6." @@ -1313,6 +1575,7 @@ msgid "address:" msgstr "Indirizzo:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:835 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:830 msgid "auto" msgstr "Auto" @@ -1321,44 +1584,57 @@ msgid "empty key" msgstr "chiave vuota" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:506 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:504 #, fuzzy msgid "interface:" msgstr "Aggiungi un'interfaccia" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:490 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:739 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:488 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:737 msgid "ip address:" msgstr "Indirizzo IP:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:494 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:492 #, fuzzy msgid "ipv6 address:" msgstr "Indirizzo IP:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:518 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:751 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:516 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:749 msgid "latency:" msgstr "latenza:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:522 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:755 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:520 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:753 msgid "mtu:" msgstr "mtu:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:646 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:808 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:644 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:806 msgid "multipath:" msgstr "multipath:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:526 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:524 msgid "operator:" msgstr "operatore:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:277 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:269 msgid "other" msgstr "Altro" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:530 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:528 msgid "phone number:" msgstr "numero di telefono:" @@ -1367,20 +1643,26 @@ msgid "range:" msgstr "intervallo:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:534 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:532 msgid "state:" msgstr "stato:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:649 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:811 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:647 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:809 msgid "traffic control:" msgstr "controllo del traffico:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:498 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:743 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:496 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:741 msgid "wan address:" msgstr "indirizzo wan:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:502 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:500 #, fuzzy msgid "wan ipv6 address:" msgstr "indirizzo wan:" @@ -1388,14 +1670,21 @@ msgstr "indirizzo wan:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:510 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:514 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:747 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:508 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:512 +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:745 msgid "whois:" msgstr "whois:" -#~ msgid "" -#~ "You should disable SQM for LTE or any interfaces with variable speed." -#~ msgstr "" -#~ "È necessario disabilitare SQM per LTE o qualsiasi interfaccia con " -#~ "velocità variabile." +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:928 +msgid "You should disable SQM for LTE or any interfaces with variable speed." +msgstr "" +"È necessario disabilitare SQM per LTE o qualsiasi interfaccia con velocità " +"variabile." + +#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:253 +msgid "Disable HTTP test on Server API in status page" +msgstr "Disabilitare il test HTTP sulle API Server nella pagina di stato" #~ msgid "Common server settings" #~ msgstr "Impostazioni comuni del server" diff --git a/luci-app-openmptcprouter/po/oc/openmptcprouter.po b/luci-app-openmptcprouter/po/oc/openmptcprouter.po index 7e0121569..f2f82cd0d 100644 --- a/luci-app-openmptcprouter/po/oc/openmptcprouter.po +++ b/luci-app-openmptcprouter/po/oc/openmptcprouter.po @@ -269,7 +269,6 @@ msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:347 #, fuzzy -#| msgid "Disabled" msgid "Disable nDPI" msgstr "Desactivat" @@ -364,7 +363,6 @@ msgstr "Active SQM" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:952 #, fuzzy -#| msgid "Enable SQM" msgid "Enable SQM autorate" msgstr "Active SQM" @@ -1432,3 +1430,7 @@ msgstr "" #~ msgid "Redundant" #~ msgstr "Redondant" + +#, fuzzy +#~ msgid "Disable HTTP test on Server API in status page" +#~ msgstr "Desactivar la pròva ping cap al servidor" diff --git a/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po b/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po index 743382b02..f06ba0249 100644 --- a/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po +++ b/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po @@ -211,7 +211,6 @@ msgstr "设备" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:259 #, fuzzy -#| msgid "Disable HTTP test on Server API in status page" msgid "Disable HTTP test on Server API" msgstr "在状态页面中禁用服务器API上的HTTP测试" @@ -343,7 +342,6 @@ msgstr "开启 SQM" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:952 #, fuzzy -#| msgid "Enable SQM" msgid "Enable SQM autorate" msgstr "开启 SQM" @@ -1195,7 +1193,6 @@ msgstr "启用后，将在外部站点上进行检查，以获取每个WAN IP和 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:301 #, fuzzy -#| msgid "When proxy shadowsocks is used, use it for UDP if VPN down" msgid "When proxy V2Ray is used, use it for UDP" msgstr "当使用代理shadowsocks时，如果VPN关闭，将其用于UDP" @@ -1490,3 +1487,6 @@ msgstr "whois查询 :" #~ msgid "MLVPN can replace Glorytun with connection with same latency" #~ msgstr "" #~ "MLVPN peut remplacer Glorytun pour les connexions avec la même latence" + +#~ msgid "Disable HTTP test on Server API in status page" +#~ msgstr "在状态页面中禁用服务器API上的HTTP测试" diff --git a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter index 8fd59ecb4..32af00eb8 100755 --- a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter +++ b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter @@ -1037,7 +1037,8 @@ function interfaces_status() mArray.openmptcprouter["shadowsocks_enabled"] = true local ss_server = "1" ucic:foreach("shadowsocks-libev", "server", function(s) - if uci:get("shadowsocks-libev",s[".name"],"disabled") == "0" then + local ss_server_disabled = uci:get("shadowsocks-libev",s[".name"],"disabled") or "0" + if ss_server_disabled == "0" then ss_server = "0" end end) diff --git a/luci-app-sqm-autorate/root/usr/share/sqm-autorate/CAKE-autorate.sh b/luci-app-sqm-autorate/root/usr/share/sqm-autorate/CAKE-autorate.sh index 4f0504c94..560039b22 100755 --- a/luci-app-sqm-autorate/root/usr/share/sqm-autorate/CAKE-autorate.sh +++ b/luci-app-sqm-autorate/root/usr/share/sqm-autorate/CAKE-autorate.sh @@ -19,7 +19,9 @@ cleanup_and_killall() echo "Killing all background processes and cleaning up /tmp files." trap - INT TERM EXIT kill $monitor_achieved_rates_pid 2> /dev/null + # Initiate termination of ping processes and wait until complete kill $maintain_pingers_pid 2> /dev/null + wait $maintain_pingers_pid [[ -d /tmp/CAKE-autorate-${dl_if} ]] && rm -r /tmp/CAKE-autorate-${dl_if} exit } @@ -45,35 +47,42 @@ get_next_shaper_rate() case $load_condition in + # upload Starlink satelite switching compensation, so drop down to minimum rate for upload through switching period + ul*sss) + shaper_rate_kbps=$min_shaper_rate_kbps + ;; + # download Starlink satelite switching compensation, so drop down to base rate for download through switching period + dl*sss) + shaper_rate_kbps=$base_shaper_rate_kbps + ;; # bufferbloat detected, so decrease the rate providing not inside bufferbloat refractory period - *delayed) + *bb*) if (( $t_next_rate_us > ($t_last_bufferbloat_us+$bufferbloat_refractory_period_us) )); then - adjusted_achieved_rate_kbps=$(( ($achieved_rate_kbps*$achieved_rate_adjust_bufferbloat)/1000 )) - adjusted_shaper_rate_kbps=$(( ($shaper_rate_kbps*$shaper_rate_adjust_bufferbloat)/1000 )) + adjusted_achieved_rate_kbps=$(( ($achieved_rate_kbps*$achieved_rate_adjust_down_bufferbloat)/1000 )) + adjusted_shaper_rate_kbps=$(( ($shaper_rate_kbps*$shaper_rate_adjust_down_bufferbloat)/1000 )) shaper_rate_kbps=$(( $adjusted_achieved_rate_kbps < $adjusted_shaper_rate_kbps ? $adjusted_achieved_rate_kbps : $adjusted_shaper_rate_kbps )) t_last_bufferbloat_us=${EPOCHREALTIME/./} fi ;; - # high load, so increase rate providing not inside bufferbloat refractory period - high) + *high*) if (( $t_next_rate_us > ($t_last_bufferbloat_us+$bufferbloat_refractory_period_us) )); then - shaper_rate_kbps=$(( ($shaper_rate_kbps*$shaper_rate_adjust_load_high)/1000 )) + shaper_rate_kbps=$(( ($shaper_rate_kbps*$shaper_rate_adjust_up_load_high)/1000 )) fi ;; # medium load, so just maintain rate as is, i.e. do nothing - medium) + *med*) : ;; # low or idle load, so determine whether to decay down towards base rate, decay up towards base rate, or set as base rate - low|idle) + *low*|*idle*) if (($t_next_rate_us > ($t_last_decay_us+$decay_refractory_period_us) )); then if (($shaper_rate_kbps > $base_shaper_rate_kbps)); then - decayed_shaper_rate_kbps=$(( ($shaper_rate_kbps*$shaper_rate_adjust_load_low)/1000 )) + decayed_shaper_rate_kbps=$(( ($shaper_rate_kbps*$shaper_rate_adjust_down_load_low)/1000 )) shaper_rate_kbps=$(( $decayed_shaper_rate_kbps > $base_shaper_rate_kbps ? $decayed_shaper_rate_kbps : $base_shaper_rate_kbps)) elif (($shaper_rate_kbps < $base_shaper_rate_kbps)); then - decayed_shaper_rate_kbps=$(( ((2000-$shaper_rate_adjust_load_low)*$shaper_rate_kbps)/1000 )) + decayed_shaper_rate_kbps=$(( ($shaper_rate_kbps*$shaper_rate_adjust_up_load_low)/1000 )) shaper_rate_kbps=$(( $decayed_shaper_rate_kbps < $base_shaper_rate_kbps ? $decayed_shaper_rate_kbps : $base_shaper_rate_kbps)) fi @@ -118,11 +127,11 @@ monitor_achieved_rates() printf '%s' "$dl_achieved_rate_kbps" > /tmp/CAKE-autorate-${dl_if}/dl_achieved_rate_kbps printf '%s' "$ul_achieved_rate_kbps" > /tmp/CAKE-autorate-${dl_if}/ul_achieved_rate_kbps - prev_rx_bytes=$rx_bytes - prev_tx_bytes=$tx_bytes + prev_rx_bytes=$rx_bytes + prev_tx_bytes=$tx_bytes # read in the max_wire_packet_rtt_us - concurrent_read max_wire_packet_rtt_us /tmp/CAKE-autorate-${dl_if}/max_wire_packet_rtt_us + concurrent_read_positive_integer max_wire_packet_rtt_us /tmp/CAKE-autorate-${dl_if}/max_wire_packet_rtt_us compensated_monitor_achieved_rates_interval_us=$(( (($monitor_achieved_rates_interval_us>(10*$max_wire_packet_rtt_us) )) ? $monitor_achieved_rates_interval_us : $((10*$max_wire_packet_rtt_us)) )) @@ -134,8 +143,8 @@ get_loads() { # read in the dl/ul achived rates and determine the loads - concurrent_read dl_achieved_rate_kbps /tmp/CAKE-autorate-${dl_if}/dl_achieved_rate_kbps - concurrent_read ul_achieved_rate_kbps /tmp/CAKE-autorate-${dl_if}/ul_achieved_rate_kbps + concurrent_read_positive_integer dl_achieved_rate_kbps /tmp/CAKE-autorate-${dl_if}/dl_achieved_rate_kbps + concurrent_read_positive_integer ul_achieved_rate_kbps /tmp/CAKE-autorate-${dl_if}/ul_achieved_rate_kbps dl_load_percent=$(((100*10#${dl_achieved_rate_kbps})/$dl_shaper_rate_kbps)) ul_load_percent=$(((100*10#${ul_achieved_rate_kbps})/$ul_shaper_rate_kbps)) @@ -152,14 +161,25 @@ classify_load() if (( $load_percent > $high_load_thr_percent )); then load_condition="high" elif (( $load_percent > $medium_load_thr_percent )); then - load_condition="medium" + load_condition="med" elif (( $achieved_rate_kbps > $connection_active_thr_kbps )); then load_condition="low" else load_condition="idle" fi - (($bufferbloat_detected)) && load_condition=$load_condition"_delayed" + (($bufferbloat_detected)) && load_condition=$load_condition"_bb" + + if ((sss_compensation)); then + for sss_time_us in "${sss_times_us[@]}" + do + ((timestamp_usecs_past_minute=${EPOCHREALTIME/./}%60000000)) + if (( ($timestamp_usecs_past_minute > ($sss_time_us-$sss_compensation_pre_duration_us)) && ($timestamp_usecs_past_minute < ($sss_time_us+$sss_compensation_post_duration_us)) )); then + load_condition=$load_condition"_sss" + break + fi + done + fi } monitor_reflector_responses() @@ -245,7 +265,7 @@ maintain_pingers() for ((pinger=0; pinger<$no_pingers; pinger++)) do reflector_check_time_us=${EPOCHREALTIME/./} - concurrent_read reflector_last_timestamp_us /tmp/CAKE-autorate-${dl_if}/reflector_${pinger}_last_timestamp_us + concurrent_read_positive_integer reflector_last_timestamp_us /tmp/CAKE-autorate-${dl_if}/reflector_${pinger}_last_timestamp_us declare -n reflector_offences="reflector_${pinger}_offences" (( ${reflector_offences[$reflector_offences_idx]} )) && ((sum_reflector_offences[$pinger]--)) @@ -367,7 +387,7 @@ update_max_wire_packet_compensation() printf '%s' "$max_wire_packet_rtt_us" > /tmp/CAKE-autorate-${dl_if}/max_wire_packet_rtt_us } -concurrent_read() +concurrent_read_positive_integer() { # in the context of separate processes writing using > and reading form file # it seems costly calls to the external flock binary can be avoided @@ -376,10 +396,20 @@ concurrent_read() local -n value=$1 local path=$2 - read -r value < $path - while [[ -z $value ]]; do - sleep_us $concurrent_read_interval_us + while true + do read -r value < $path; + if [[ -z "${value##*[!0-9]*}" ]]; then + if (($debug)); then + read -r caller_output< <(caller) + echo "DEBUG concurrent_read_positive_integer() misfire with the following particulars:" + echo "DEBUG caller="$caller_output"; value="$value"; and path="$path + fi + sleep_us $concurrent_read_positive_integer_interval_us + continue + else + break + fi done } @@ -474,10 +504,11 @@ verify_ifs_up # Convert human readable parameters to values that work with integer arithmetic printf -v alpha_baseline_increase %.0f\\n "${alpha_baseline_increase}e3" printf -v alpha_baseline_decrease %.0f\\n "${alpha_baseline_decrease}e3" -printf -v achieved_rate_adjust_bufferbloat %.0f\\n "${achieved_rate_adjust_bufferbloat}e3" -printf -v shaper_rate_adjust_bufferbloat %.0f\\n "${shaper_rate_adjust_bufferbloat}e3" -printf -v shaper_rate_adjust_load_high %.0f\\n "${shaper_rate_adjust_load_high}e3" -printf -v shaper_rate_adjust_load_low %.0f\\n "${shaper_rate_adjust_load_low}e3" +printf -v achieved_rate_adjust_down_bufferbloat %.0f\\n "${achieved_rate_adjust_down_bufferbloat}e3" +printf -v shaper_rate_adjust_down_bufferbloat %.0f\\n "${shaper_rate_adjust_down_bufferbloat}e3" +printf -v shaper_rate_adjust_up_load_high %.0f\\n "${shaper_rate_adjust_up_load_high}e3" +printf -v shaper_rate_adjust_down_load_low %.0f\\n "${shaper_rate_adjust_down_load_low}e3" +printf -v shaper_rate_adjust_up_load_low %.0f\\n "${shaper_rate_adjust_up_load_low}e3" printf -v high_load_thr_percent %.0f\\n "${high_load_thr}e2" printf -v medium_load_thr_percent %.0f\\n "${medium_load_thr}e2" printf -v reflector_ping_interval_us %.0f\\n "${reflector_ping_interval_s}e6" @@ -488,9 +519,16 @@ bufferbloat_refractory_period_us=$(( 1000*$bufferbloat_refractory_period_ms )) decay_refractory_period_us=$(( 1000*$decay_refractory_period_ms )) delay_thr_us=$(( 1000*$delay_thr_ms )) +for (( i=0; i<${#sss_times_s[@]}; i++ )); +do + printf -v sss_times_us[i] %.0f\\n "${sss_times_s[i]}e6" +done +printf -v sss_compensation_pre_duration_us %.0f\\n "${sss_compensation_pre_duration_ms}e3" +printf -v sss_compensation_post_duration_us %.0f\\n "${sss_compensation_post_duration_ms}e3" + ping_response_interval_us=$(($reflector_ping_interval_us/$no_pingers)) -concurrent_read_interval_us=$(($ping_response_interval_us/4)) +concurrent_read_positive_integer_interval_us=$(($ping_response_interval_us/4)) dl_shaper_rate_kbps=$base_dl_shaper_rate_kbps ul_shaper_rate_kbps=$base_ul_shaper_rate_kbps @@ -533,12 +571,20 @@ monitor_achieved_rates_pid=$! prev_timestamp=0 +if (($debug)); then + if (( $bufferbloat_refractory_period_us <= ($bufferbloat_detection_window*$ping_response_interval_us) )); then + echo "DEBUG Warning: bufferbloat refractory period: " $bufferbloat_refractory_period_us " us." + echo "DEBUG Warning: but expected time to overwrite samples in bufferbloat detection window is: " $(($bufferbloat_detection_window*$ping_response_interval_us)) " us." + echo "DEBUG Warning: Consider increasing bufferbloat refractory period or decreasing bufferbloat detection window." + fi +fi + while true do while read -t $global_ping_response_timeout_s -r timestamp reflector seq rtt_baseline_us rtt_us rtt_delta_us do t_start_us=${EPOCHREALTIME/./} - if ((($t_start_us - "${timestamp//[[\[\].]}")>500000)); then + if ((($t_start_us - 10#"${timestamp//[[\[\].]}")>500000)); then (($debug)) && echo "DEBUG processed response from [" $reflector "] that is > 500ms old. Skipping." continue fi @@ -556,6 +602,9 @@ do classify_load $dl_load_percent $dl_achieved_rate_kbps dl_load_condition classify_load $ul_load_percent $ul_achieved_rate_kbps ul_load_condition + dl_load_condition="dl_"$dl_load_condition + ul_load_condition="ul_"$ul_load_condition + get_next_shaper_rate $min_dl_shaper_rate_kbps $base_dl_shaper_rate_kbps $max_dl_shaper_rate_kbps $dl_achieved_rate_kbps $dl_load_condition $t_start_us t_dl_last_bufferbloat_us t_dl_last_decay_us dl_shaper_rate_kbps get_next_shaper_rate $min_ul_shaper_rate_kbps $base_ul_shaper_rate_kbps $max_ul_shaper_rate_kbps $ul_achieved_rate_kbps $ul_load_condition $t_start_us t_ul_last_bufferbloat_us t_ul_last_decay_us ul_shaper_rate_kbps @@ -584,8 +633,9 @@ do ul_shaper_rate_kbps=$min_ul_shaper_rate_kbps set_shaper_rates - # Kill off ping processes + # Initiate termination of ping processes and wait until complete kill $maintain_pingers_pid 2> /dev/null + wait $maintain_pingers_pid # reset idle timer t_sustained_connection_idle_us=0