From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [RFC PATCH 6/8] qos.cgi: Add control to change link-layer encapsulation Date: Thu, 02 Dec 2021 12:37:46 +0000 Message-ID: <20211202123748.2525617-6-michael.tremer@ipfire.org> In-Reply-To: <20211202123748.2525617-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0793136104151506687==" List-Id: --===============0793136104151506687== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Michael Tremer --- doc/language_issues.de | 16 ++++++ doc/language_issues.en | 16 ++++++ doc/language_issues.es | 16 ++++++ doc/language_issues.fr | 16 ++++++ doc/language_issues.it | 16 ++++++ doc/language_issues.nl | 16 ++++++ doc/language_issues.pl | 16 ++++++ doc/language_issues.ru | 16 ++++++ doc/language_issues.tr | 16 ++++++ doc/language_missings | 128 +++++++++++++++++++++++++++++++++++++++++ html/cgi-bin/qos.cgi | 70 ++++++++++++++++++---- langs/en/cgi-bin/en.pl | 16 ++++++ 12 files changed, 348 insertions(+), 10 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index d0275b5ef..668612dd3 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -855,6 +855,21 @@ WARNING: translation string unused: zoneconf val vlan am= ount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val vlan tag range error WARNING: translation string unused: zoneconf val zoneslave amount error +WARNING: untranslated string: cake profile bridged-llcsnap 32 =3D Bridged LL= C SNAP (32 bytes) +WARNING: untranslated string: cake profile bridged-ptm 19 =3D Bridged PTM (1= 9 bytes) +WARNING: untranslated string: cake profile bridged-vcmux 24 =3D Bridged VC-M= UX (24 bytes) +WARNING: untranslated string: cake profile conservative 48 =3D Conservative = (should work on all connections, 48 bytes) +WARNING: untranslated string: cake profile docsis 18 =3D DOCSIS (18 bytes) +WARNING: untranslated string: cake profile ethernet 38 =3D Ethernet (38 byte= s) +WARNING: untranslated string: cake profile ethernet vlan 42 =3D Ethernet wit= h VLAN (42 bytes) +WARNING: untranslated string: cake profile ipoa-llcsnap 16 =3D IP over ATM L= LC SNAP (16 bytes) +WARNING: untranslated string: cake profile ipoa-vcmux 8 =3D IP over ATM VC-M= UX (8 bytes) +WARNING: untranslated string: cake profile pppoa-llc 14 =3D PPPoA LLC (14 by= tes) +WARNING: untranslated string: cake profile pppoa-vcmux 10 =3D PPPoA VC-MUX (= 10 bytes) +WARNING: untranslated string: cake profile pppoe-llcsnap 40 =3D PPPoE LLC SN= AP (40 bytes) +WARNING: untranslated string: cake profile pppoe-ptm 27 =3D PPPoE PTM (27 by= tes) +WARNING: untranslated string: cake profile pppoe-vcmux 32 =3D PPPoE VC-MUX (= 32 bytes) +WARNING: untranslated string: cake profile raw 0 =3D Raw (no overhead compen= sation) WARNING: untranslated string: desired =3D Desired WARNING: untranslated string: disable =3D Disable WARNING: untranslated string: download apple profile =3D Download Apple Conf= iguration Profile @@ -894,6 +909,7 @@ WARNING: untranslated string: guardian service =3D unknow= n string WARNING: untranslated string: ipsec dns server address is invalid =3D Invali= d DNS server IP address(es) WARNING: untranslated string: ipsec invalid ip address or fqdn for rw endpoi= nt =3D Invalid IP address or FQDN for Host-to-Net Endpoint WARNING: untranslated string: ipsec roadwarrior endpoint =3D Host-to-Net End= point +WARNING: untranslated string: link-layer encapsulation =3D Link-Layer Encaps= ulation WARNING: untranslated string: netbios nameserver daemon =3D NetBIOS Nameserv= er Daemon WARNING: untranslated string: no entries =3D No entries at the moment. WARNING: untranslated string: optional =3D Optional diff --git a/doc/language_issues.en b/doc/language_issues.en index e2d131a8e..8fc632a03 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -372,6 +372,21 @@ WARNING: untranslated string: ca name =3D CA name WARNING: untranslated string: cached =3D cached WARNING: untranslated string: cached memory =3D Cached Memory =20 WARNING: untranslated string: cached swap =3D Cached Swap +WARNING: untranslated string: cake profile bridged-llcsnap 32 =3D Bridged LL= C SNAP (32 bytes) +WARNING: untranslated string: cake profile bridged-ptm 19 =3D Bridged PTM (1= 9 bytes) +WARNING: untranslated string: cake profile bridged-vcmux 24 =3D Bridged VC-M= UX (24 bytes) +WARNING: untranslated string: cake profile conservative 48 =3D Conservative = (should work on all connections, 48 bytes) +WARNING: untranslated string: cake profile docsis 18 =3D DOCSIS (18 bytes) +WARNING: untranslated string: cake profile ethernet 38 =3D Ethernet (38 byte= s) +WARNING: untranslated string: cake profile ethernet vlan 42 =3D Ethernet wit= h VLAN (42 bytes) +WARNING: untranslated string: cake profile ipoa-llcsnap 16 =3D IP over ATM L= LC SNAP (16 bytes) +WARNING: untranslated string: cake profile ipoa-vcmux 8 =3D IP over ATM VC-M= UX (8 bytes) +WARNING: untranslated string: cake profile pppoa-llc 14 =3D PPPoA LLC (14 by= tes) +WARNING: untranslated string: cake profile pppoa-vcmux 10 =3D PPPoA VC-MUX (= 10 bytes) +WARNING: untranslated string: cake profile pppoe-llcsnap 40 =3D PPPoE LLC SN= AP (40 bytes) +WARNING: untranslated string: cake profile pppoe-ptm 27 =3D PPPoE PTM (27 by= tes) +WARNING: untranslated string: cake profile pppoe-vcmux 32 =3D PPPoE VC-MUX (= 32 bytes) +WARNING: untranslated string: cake profile raw 0 =3D Raw (no overhead compen= sation) WARNING: untranslated string: calamaris available reports =3D Available repo= rts WARNING: untranslated string: calamaris byte unit =3D Byte unit WARNING: untranslated string: calamaris create report =3D Create report @@ -1170,6 +1185,7 @@ WARNING: untranslated string: least preferred =3D least= preferred WARNING: untranslated string: legacy architecture warning =3D You are runnin= g IPFire on a legacy architecture and it is recommended to upgrade WARNING: untranslated string: legend =3D Legend WARNING: untranslated string: lifetime =3D Lifetime: +WARNING: untranslated string: link-layer encapsulation =3D Link-Layer Encaps= ulation WARNING: untranslated string: linkq =3D Link Quality WARNING: untranslated string: local ip address =3D Local IP Address WARNING: untranslated string: local ntp server specified but not enabled =3D= Local NTP server specified but not enabled diff --git a/doc/language_issues.es b/doc/language_issues.es index 39b9bef48..684c4d6b1 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -836,6 +836,21 @@ WARNING: untranslated string: bit =3D bit WARNING: untranslated string: block =3D Block WARNING: untranslated string: broken =3D Broken WARNING: untranslated string: bytes =3D unknown string +WARNING: untranslated string: cake profile bridged-llcsnap 32 =3D Bridged LL= C SNAP (32 bytes) +WARNING: untranslated string: cake profile bridged-ptm 19 =3D Bridged PTM (1= 9 bytes) +WARNING: untranslated string: cake profile bridged-vcmux 24 =3D Bridged VC-M= UX (24 bytes) +WARNING: untranslated string: cake profile conservative 48 =3D Conservative = (should work on all connections, 48 bytes) +WARNING: untranslated string: cake profile docsis 18 =3D DOCSIS (18 bytes) +WARNING: untranslated string: cake profile ethernet 38 =3D Ethernet (38 byte= s) +WARNING: untranslated string: cake profile ethernet vlan 42 =3D Ethernet wit= h VLAN (42 bytes) +WARNING: untranslated string: cake profile ipoa-llcsnap 16 =3D IP over ATM L= LC SNAP (16 bytes) +WARNING: untranslated string: cake profile ipoa-vcmux 8 =3D IP over ATM VC-M= UX (8 bytes) +WARNING: untranslated string: cake profile pppoa-llc 14 =3D PPPoA LLC (14 by= tes) +WARNING: untranslated string: cake profile pppoa-vcmux 10 =3D PPPoA VC-MUX (= 10 bytes) +WARNING: untranslated string: cake profile pppoe-llcsnap 40 =3D PPPoE LLC SN= AP (40 bytes) +WARNING: untranslated string: cake profile pppoe-ptm 27 =3D PPPoE PTM (27 by= tes) +WARNING: untranslated string: cake profile pppoe-vcmux 32 =3D PPPoE VC-MUX (= 32 bytes) +WARNING: untranslated string: cake profile raw 0 =3D Raw (no overhead compen= sation) WARNING: untranslated string: capabilities =3D Capabilities WARNING: untranslated string: ccd add =3D Add network WARNING: untranslated string: ccd choose net =3D Choose network @@ -1249,6 +1264,7 @@ WARNING: untranslated string: last =3D Last WARNING: untranslated string: least preferred =3D least preferred WARNING: untranslated string: legacy architecture warning =3D You are runnin= g IPFire on a legacy architecture and it is recommended to upgrade WARNING: untranslated string: lifetime =3D Lifetime: +WARNING: untranslated string: link-layer encapsulation =3D Link-Layer Encaps= ulation WARNING: untranslated string: local ip address =3D Local IP Address WARNING: untranslated string: log server protocol =3D protocol: WARNING: untranslated string: mac filter =3D MAC filter diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 6a300858d..e9d589658 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -899,6 +899,21 @@ WARNING: translation string unused: zoneconf val vlan am= ount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val vlan tag range error WARNING: translation string unused: zoneconf val zoneslave amount error +WARNING: untranslated string: cake profile bridged-llcsnap 32 =3D Bridged LL= C SNAP (32 bytes) +WARNING: untranslated string: cake profile bridged-ptm 19 =3D Bridged PTM (1= 9 bytes) +WARNING: untranslated string: cake profile bridged-vcmux 24 =3D Bridged VC-M= UX (24 bytes) +WARNING: untranslated string: cake profile conservative 48 =3D Conservative = (should work on all connections, 48 bytes) +WARNING: untranslated string: cake profile docsis 18 =3D DOCSIS (18 bytes) +WARNING: untranslated string: cake profile ethernet 38 =3D Ethernet (38 byte= s) +WARNING: untranslated string: cake profile ethernet vlan 42 =3D Ethernet wit= h VLAN (42 bytes) +WARNING: untranslated string: cake profile ipoa-llcsnap 16 =3D IP over ATM L= LC SNAP (16 bytes) +WARNING: untranslated string: cake profile ipoa-vcmux 8 =3D IP over ATM VC-M= UX (8 bytes) +WARNING: untranslated string: cake profile pppoa-llc 14 =3D PPPoA LLC (14 by= tes) +WARNING: untranslated string: cake profile pppoa-vcmux 10 =3D PPPoA VC-MUX (= 10 bytes) +WARNING: untranslated string: cake profile pppoe-llcsnap 40 =3D PPPoE LLC SN= AP (40 bytes) +WARNING: untranslated string: cake profile pppoe-ptm 27 =3D PPPoE PTM (27 by= tes) +WARNING: untranslated string: cake profile pppoe-vcmux 32 =3D PPPoE VC-MUX (= 32 bytes) +WARNING: untranslated string: cake profile raw 0 =3D Raw (no overhead compen= sation) WARNING: untranslated string: false max bandwidth =3D Maximum bandwidth is f= alse. WARNING: untranslated string: false min bandwidth =3D Minimum bandwidth is f= alse. WARNING: untranslated string: fwhost cust locationgrp =3D unknown string @@ -933,6 +948,7 @@ WARNING: untranslated string: guardian logtarget_file =3D= unknown string WARNING: untranslated string: guardian logtarget_syslog =3D unknown string WARNING: untranslated string: guardian no entries =3D unknown string WARNING: untranslated string: guardian service =3D unknown string +WARNING: untranslated string: link-layer encapsulation =3D Link-Layer Encaps= ulation WARNING: untranslated string: max bandwidth =3D Maximum bandwidth WARNING: untranslated string: pakfire ago =3D ago. WARNING: untranslated string: route config changed =3D unknown string diff --git a/doc/language_issues.it b/doc/language_issues.it index 993c76b82..02e6e504c 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -921,6 +921,21 @@ WARNING: untranslated string: available =3D available WARNING: untranslated string: block =3D Block WARNING: untranslated string: broken =3D Broken WARNING: untranslated string: bytes =3D unknown string +WARNING: untranslated string: cake profile bridged-llcsnap 32 =3D Bridged LL= C SNAP (32 bytes) +WARNING: untranslated string: cake profile bridged-ptm 19 =3D Bridged PTM (1= 9 bytes) +WARNING: untranslated string: cake profile bridged-vcmux 24 =3D Bridged VC-M= UX (24 bytes) +WARNING: untranslated string: cake profile conservative 48 =3D Conservative = (should work on all connections, 48 bytes) +WARNING: untranslated string: cake profile docsis 18 =3D DOCSIS (18 bytes) +WARNING: untranslated string: cake profile ethernet 38 =3D Ethernet (38 byte= s) +WARNING: untranslated string: cake profile ethernet vlan 42 =3D Ethernet wit= h VLAN (42 bytes) +WARNING: untranslated string: cake profile ipoa-llcsnap 16 =3D IP over ATM L= LC SNAP (16 bytes) +WARNING: untranslated string: cake profile ipoa-vcmux 8 =3D IP over ATM VC-M= UX (8 bytes) +WARNING: untranslated string: cake profile pppoa-llc 14 =3D PPPoA LLC (14 by= tes) +WARNING: untranslated string: cake profile pppoa-vcmux 10 =3D PPPoA VC-MUX (= 10 bytes) +WARNING: untranslated string: cake profile pppoe-llcsnap 40 =3D PPPoE LLC SN= AP (40 bytes) +WARNING: untranslated string: cake profile pppoe-ptm 27 =3D PPPoE PTM (27 by= tes) +WARNING: untranslated string: cake profile pppoe-vcmux 32 =3D PPPoE VC-MUX (= 32 bytes) +WARNING: untranslated string: cake profile raw 0 =3D Raw (no overhead compen= sation) WARNING: untranslated string: check all =3D Check all WARNING: untranslated string: cpu frequency =3D CPU frequency WARNING: untranslated string: crypto error =3D Cryptographic error @@ -1084,6 +1099,7 @@ WARNING: untranslated string: ipsec routing table entri= es =3D IPsec Routing Table WARNING: untranslated string: ipsec settings =3D IPsec Settings WARNING: untranslated string: itlb multihit =3D iTLB MultiHit WARNING: untranslated string: legacy architecture warning =3D You are runnin= g IPFire on a legacy architecture and it is recommended to upgrade +WARNING: untranslated string: link-layer encapsulation =3D Link-Layer Encaps= ulation WARNING: untranslated string: local ip address =3D Local IP Address WARNING: untranslated string: location =3D Location WARNING: untranslated string: locationblock =3D Location Block diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 664a2dd62..7b403f2af 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -917,6 +917,21 @@ WARNING: untranslated string: available =3D available WARNING: untranslated string: block =3D Block WARNING: untranslated string: broken =3D Broken WARNING: untranslated string: bytes =3D unknown string +WARNING: untranslated string: cake profile bridged-llcsnap 32 =3D Bridged LL= C SNAP (32 bytes) +WARNING: untranslated string: cake profile bridged-ptm 19 =3D Bridged PTM (1= 9 bytes) +WARNING: untranslated string: cake profile bridged-vcmux 24 =3D Bridged VC-M= UX (24 bytes) +WARNING: untranslated string: cake profile conservative 48 =3D Conservative = (should work on all connections, 48 bytes) +WARNING: untranslated string: cake profile docsis 18 =3D DOCSIS (18 bytes) +WARNING: untranslated string: cake profile ethernet 38 =3D Ethernet (38 byte= s) +WARNING: untranslated string: cake profile ethernet vlan 42 =3D Ethernet wit= h VLAN (42 bytes) +WARNING: untranslated string: cake profile ipoa-llcsnap 16 =3D IP over ATM L= LC SNAP (16 bytes) +WARNING: untranslated string: cake profile ipoa-vcmux 8 =3D IP over ATM VC-M= UX (8 bytes) +WARNING: untranslated string: cake profile pppoa-llc 14 =3D PPPoA LLC (14 by= tes) +WARNING: untranslated string: cake profile pppoa-vcmux 10 =3D PPPoA VC-MUX (= 10 bytes) +WARNING: untranslated string: cake profile pppoe-llcsnap 40 =3D PPPoE LLC SN= AP (40 bytes) +WARNING: untranslated string: cake profile pppoe-ptm 27 =3D PPPoE PTM (27 by= tes) +WARNING: untranslated string: cake profile pppoe-vcmux 32 =3D PPPoE VC-MUX (= 32 bytes) +WARNING: untranslated string: cake profile raw 0 =3D Raw (no overhead compen= sation) WARNING: untranslated string: capabilities =3D Capabilities WARNING: untranslated string: check all =3D Check all WARNING: untranslated string: cpu frequency =3D CPU frequency @@ -1095,6 +1110,7 @@ WARNING: untranslated string: ipsec routing table entri= es =3D IPsec Routing Table WARNING: untranslated string: ipsec settings =3D IPsec Settings WARNING: untranslated string: itlb multihit =3D iTLB MultiHit WARNING: untranslated string: legacy architecture warning =3D You are runnin= g IPFire on a legacy architecture and it is recommended to upgrade +WARNING: untranslated string: link-layer encapsulation =3D Link-Layer Encaps= ulation WARNING: untranslated string: local ip address =3D Local IP Address WARNING: untranslated string: location =3D Location WARNING: untranslated string: locationblock =3D Location Block diff --git a/doc/language_issues.pl b/doc/language_issues.pl index f10f9ff4a..791ccda61 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -851,6 +851,21 @@ WARNING: untranslated string: bit =3D bit WARNING: untranslated string: block =3D Block WARNING: untranslated string: broken =3D Broken WARNING: untranslated string: bytes =3D unknown string +WARNING: untranslated string: cake profile bridged-llcsnap 32 =3D Bridged LL= C SNAP (32 bytes) +WARNING: untranslated string: cake profile bridged-ptm 19 =3D Bridged PTM (1= 9 bytes) +WARNING: untranslated string: cake profile bridged-vcmux 24 =3D Bridged VC-M= UX (24 bytes) +WARNING: untranslated string: cake profile conservative 48 =3D Conservative = (should work on all connections, 48 bytes) +WARNING: untranslated string: cake profile docsis 18 =3D DOCSIS (18 bytes) +WARNING: untranslated string: cake profile ethernet 38 =3D Ethernet (38 byte= s) +WARNING: untranslated string: cake profile ethernet vlan 42 =3D Ethernet wit= h VLAN (42 bytes) +WARNING: untranslated string: cake profile ipoa-llcsnap 16 =3D IP over ATM L= LC SNAP (16 bytes) +WARNING: untranslated string: cake profile ipoa-vcmux 8 =3D IP over ATM VC-M= UX (8 bytes) +WARNING: untranslated string: cake profile pppoa-llc 14 =3D PPPoA LLC (14 by= tes) +WARNING: untranslated string: cake profile pppoa-vcmux 10 =3D PPPoA VC-MUX (= 10 bytes) +WARNING: untranslated string: cake profile pppoe-llcsnap 40 =3D PPPoE LLC SN= AP (40 bytes) +WARNING: untranslated string: cake profile pppoe-ptm 27 =3D PPPoE PTM (27 by= tes) +WARNING: untranslated string: cake profile pppoe-vcmux 32 =3D PPPoE VC-MUX (= 32 bytes) +WARNING: untranslated string: cake profile raw 0 =3D Raw (no overhead compen= sation) WARNING: untranslated string: capabilities =3D Capabilities WARNING: untranslated string: ccd add =3D Add network WARNING: untranslated string: ccd choose net =3D Choose network @@ -1254,6 +1269,7 @@ WARNING: untranslated string: last =3D Last WARNING: untranslated string: least preferred =3D least preferred WARNING: untranslated string: legacy architecture warning =3D You are runnin= g IPFire on a legacy architecture and it is recommended to upgrade WARNING: untranslated string: lifetime =3D Lifetime: +WARNING: untranslated string: link-layer encapsulation =3D Link-Layer Encaps= ulation WARNING: untranslated string: local ip address =3D Local IP Address WARNING: untranslated string: location =3D Location WARNING: untranslated string: locationblock =3D Location Block diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 2e889e41e..14fcf87b4 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -847,6 +847,21 @@ WARNING: untranslated string: bit =3D bit WARNING: untranslated string: block =3D Block WARNING: untranslated string: broken =3D Broken WARNING: untranslated string: bytes =3D unknown string +WARNING: untranslated string: cake profile bridged-llcsnap 32 =3D Bridged LL= C SNAP (32 bytes) +WARNING: untranslated string: cake profile bridged-ptm 19 =3D Bridged PTM (1= 9 bytes) +WARNING: untranslated string: cake profile bridged-vcmux 24 =3D Bridged VC-M= UX (24 bytes) +WARNING: untranslated string: cake profile conservative 48 =3D Conservative = (should work on all connections, 48 bytes) +WARNING: untranslated string: cake profile docsis 18 =3D DOCSIS (18 bytes) +WARNING: untranslated string: cake profile ethernet 38 =3D Ethernet (38 byte= s) +WARNING: untranslated string: cake profile ethernet vlan 42 =3D Ethernet wit= h VLAN (42 bytes) +WARNING: untranslated string: cake profile ipoa-llcsnap 16 =3D IP over ATM L= LC SNAP (16 bytes) +WARNING: untranslated string: cake profile ipoa-vcmux 8 =3D IP over ATM VC-M= UX (8 bytes) +WARNING: untranslated string: cake profile pppoa-llc 14 =3D PPPoA LLC (14 by= tes) +WARNING: untranslated string: cake profile pppoa-vcmux 10 =3D PPPoA VC-MUX (= 10 bytes) +WARNING: untranslated string: cake profile pppoe-llcsnap 40 =3D PPPoE LLC SN= AP (40 bytes) +WARNING: untranslated string: cake profile pppoe-ptm 27 =3D PPPoE PTM (27 by= tes) +WARNING: untranslated string: cake profile pppoe-vcmux 32 =3D PPPoE VC-MUX (= 32 bytes) +WARNING: untranslated string: cake profile raw 0 =3D Raw (no overhead compen= sation) WARNING: untranslated string: capabilities =3D Capabilities WARNING: untranslated string: ccd add =3D Add network WARNING: untranslated string: ccd choose net =3D Choose network @@ -1252,6 +1267,7 @@ WARNING: untranslated string: last =3D Last WARNING: untranslated string: least preferred =3D least preferred WARNING: untranslated string: legacy architecture warning =3D You are runnin= g IPFire on a legacy architecture and it is recommended to upgrade WARNING: untranslated string: lifetime =3D Lifetime: +WARNING: untranslated string: link-layer encapsulation =3D Link-Layer Encaps= ulation WARNING: untranslated string: local ip address =3D Local IP Address WARNING: untranslated string: location =3D Location WARNING: untranslated string: locationblock =3D Location Block diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 5e216f765..d158c2c7a 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -908,6 +908,21 @@ WARNING: untranslated string: autonomous system =3D Auto= nomous System WARNING: untranslated string: available =3D available WARNING: untranslated string: broken =3D Broken WARNING: untranslated string: bytes =3D unknown string +WARNING: untranslated string: cake profile bridged-llcsnap 32 =3D Bridged LL= C SNAP (32 bytes) +WARNING: untranslated string: cake profile bridged-ptm 19 =3D Bridged PTM (1= 9 bytes) +WARNING: untranslated string: cake profile bridged-vcmux 24 =3D Bridged VC-M= UX (24 bytes) +WARNING: untranslated string: cake profile conservative 48 =3D Conservative = (should work on all connections, 48 bytes) +WARNING: untranslated string: cake profile docsis 18 =3D DOCSIS (18 bytes) +WARNING: untranslated string: cake profile ethernet 38 =3D Ethernet (38 byte= s) +WARNING: untranslated string: cake profile ethernet vlan 42 =3D Ethernet wit= h VLAN (42 bytes) +WARNING: untranslated string: cake profile ipoa-llcsnap 16 =3D IP over ATM L= LC SNAP (16 bytes) +WARNING: untranslated string: cake profile ipoa-vcmux 8 =3D IP over ATM VC-M= UX (8 bytes) +WARNING: untranslated string: cake profile pppoa-llc 14 =3D PPPoA LLC (14 by= tes) +WARNING: untranslated string: cake profile pppoa-vcmux 10 =3D PPPoA VC-MUX (= 10 bytes) +WARNING: untranslated string: cake profile pppoe-llcsnap 40 =3D PPPoE LLC SN= AP (40 bytes) +WARNING: untranslated string: cake profile pppoe-ptm 27 =3D PPPoE PTM (27 by= tes) +WARNING: untranslated string: cake profile pppoe-vcmux 32 =3D PPPoE VC-MUX (= 32 bytes) +WARNING: untranslated string: cake profile raw 0 =3D Raw (no overhead compen= sation) WARNING: untranslated string: cpu frequency =3D CPU frequency WARNING: untranslated string: crypto error =3D Cryptographic error WARNING: untranslated string: crypto warning =3D Cryptographic warning @@ -1021,6 +1036,7 @@ WARNING: untranslated string: ipsec routing table entri= es =3D IPsec Routing Table WARNING: untranslated string: ipsec settings =3D IPsec Settings WARNING: untranslated string: itlb multihit =3D iTLB MultiHit WARNING: untranslated string: legacy architecture warning =3D You are runnin= g IPFire on a legacy architecture and it is recommended to upgrade +WARNING: untranslated string: link-layer encapsulation =3D Link-Layer Encaps= ulation WARNING: untranslated string: local ip address =3D Local IP Address WARNING: untranslated string: meltdown =3D Meltdown WARNING: untranslated string: mitigated =3D Mitigated diff --git a/doc/language_missings b/doc/language_missings index e0755b024..2d2dacd37 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -20,6 +20,21 @@ < backup protect key password < bewan adsl pci st < bewan adsl usb +< cake profile bridged-llcsnap 32 +< cake profile bridged-ptm 19 +< cake profile bridged-vcmux 24 +< cake profile conservative 48 +< cake profile docsis 18 +< cake profile ethernet 38 +< cake profile ethernet vlan 42 +< cake profile ipoa-llcsnap 16 +< cake profile ipoa-vcmux 8 +< cake profile pppoa-llc 14 +< cake profile pppoa-vcmux 10 +< cake profile pppoe-llcsnap 40 +< cake profile pppoe-ptm 27 +< cake profile pppoe-vcmux 32 +< cake profile raw 0 < Captive heading terms < Captive heading voucher < Captive invalid coupon @@ -43,6 +58,7 @@ < ipsec dns server address is invalid < ipsec invalid ip address or fqdn for rw endpoint < ipsec roadwarrior endpoint +< link-layer encapsulation < netbios nameserver daemon < no entries < notes @@ -118,6 +134,21 @@ < bit < block < broken +< cake profile bridged-llcsnap 32 +< cake profile bridged-ptm 19 +< cake profile bridged-vcmux 24 +< cake profile conservative 48 +< cake profile docsis 18 +< cake profile ethernet 38 +< cake profile ethernet vlan 42 +< cake profile ipoa-llcsnap 16 +< cake profile ipoa-vcmux 8 +< cake profile pppoa-llc 14 +< cake profile pppoa-vcmux 10 +< cake profile pppoe-llcsnap 40 +< cake profile pppoe-ptm 27 +< cake profile pppoe-vcmux 32 +< cake profile raw 0 < capabilities < ccd add < ccd choose net @@ -565,6 +596,7 @@ < least preferred < legacy architecture warning < lifetime +< link-layer encapsulation < local ip address < log server protocol < mac filter @@ -937,11 +969,27 @@ < ansi t1.483 < bewan adsl pci st < bewan adsl usb +< cake profile bridged-llcsnap 32 +< cake profile bridged-ptm 19 +< cake profile bridged-vcmux 24 +< cake profile conservative 48 +< cake profile docsis 18 +< cake profile ethernet 38 +< cake profile ethernet vlan 42 +< cake profile ipoa-llcsnap 16 +< cake profile ipoa-vcmux 8 +< cake profile pppoa-llc 14 +< cake profile pppoa-vcmux 10 +< cake profile pppoe-llcsnap 40 +< cake profile pppoe-ptm 27 +< cake profile pppoe-vcmux 32 +< cake profile raw 0 < false max bandwidth < false min bandwidth < g.dtm < g.lite < guaranteed bandwidth +< link-layer encapsulation < max bandwidth < upload fcdsl.o ############################################################################ @@ -976,6 +1024,21 @@ < available < block < broken +< cake profile bridged-llcsnap 32 +< cake profile bridged-ptm 19 +< cake profile bridged-vcmux 24 +< cake profile conservative 48 +< cake profile docsis 18 +< cake profile ethernet 38 +< cake profile ethernet vlan 42 +< cake profile ipoa-llcsnap 16 +< cake profile ipoa-vcmux 8 +< cake profile pppoa-llc 14 +< cake profile pppoa-vcmux 10 +< cake profile pppoe-llcsnap 40 +< cake profile pppoe-ptm 27 +< cake profile pppoe-vcmux 32 +< cake profile raw 0 < Captive < Captive 1day < Captive 1month @@ -1172,6 +1235,7 @@ < ipsec settings < itlb multihit < legacy architecture warning +< link-layer encapsulation < local ip address < location < locationblock @@ -1382,6 +1446,21 @@ < available < block < broken +< cake profile bridged-llcsnap 32 +< cake profile bridged-ptm 19 +< cake profile bridged-vcmux 24 +< cake profile conservative 48 +< cake profile docsis 18 +< cake profile ethernet 38 +< cake profile ethernet vlan 42 +< cake profile ipoa-llcsnap 16 +< cake profile ipoa-vcmux 8 +< cake profile pppoa-llc 14 +< cake profile pppoa-vcmux 10 +< cake profile pppoe-llcsnap 40 +< cake profile pppoe-ptm 27 +< cake profile pppoe-vcmux 32 +< cake profile raw 0 < capabilities < Captive < Captive 1day @@ -1596,6 +1675,7 @@ < ipsec settings < itlb multihit < legacy architecture warning +< link-layer encapsulation < local ip address < location < locationblock @@ -1854,6 +1934,21 @@ < bit < block < broken +< cake profile bridged-llcsnap 32 +< cake profile bridged-ptm 19 +< cake profile bridged-vcmux 24 +< cake profile conservative 48 +< cake profile docsis 18 +< cake profile ethernet 38 +< cake profile ethernet vlan 42 +< cake profile ipoa-llcsnap 16 +< cake profile ipoa-vcmux 8 +< cake profile pppoa-llc 14 +< cake profile pppoa-vcmux 10 +< cake profile pppoe-llcsnap 40 +< cake profile pppoe-ptm 27 +< cake profile pppoe-vcmux 32 +< cake profile raw 0 < capabilities < Captive < Captive 1day @@ -2347,6 +2442,7 @@ < least preferred < legacy architecture warning < lifetime +< link-layer encapsulation < local ip address < location < locationblock @@ -2755,6 +2851,21 @@ < bit < block < broken +< cake profile bridged-llcsnap 32 +< cake profile bridged-ptm 19 +< cake profile bridged-vcmux 24 +< cake profile conservative 48 +< cake profile docsis 18 +< cake profile ethernet 38 +< cake profile ethernet vlan 42 +< cake profile ipoa-llcsnap 16 +< cake profile ipoa-vcmux 8 +< cake profile pppoa-llc 14 +< cake profile pppoa-vcmux 10 +< cake profile pppoe-llcsnap 40 +< cake profile pppoe-ptm 27 +< cake profile pppoe-vcmux 32 +< cake profile raw 0 < capabilities < Captive < Captive 1day @@ -3254,6 +3365,7 @@ < least preferred < legacy architecture warning < lifetime +< link-layer encapsulation < local ip address < location < locationblock @@ -3637,6 +3749,21 @@ < autonomous system < available < broken +< cake profile bridged-llcsnap 32 +< cake profile bridged-ptm 19 +< cake profile bridged-vcmux 24 +< cake profile conservative 48 +< cake profile docsis 18 +< cake profile ethernet 38 +< cake profile ethernet vlan 42 +< cake profile ipoa-llcsnap 16 +< cake profile ipoa-vcmux 8 +< cake profile pppoa-llc 14 +< cake profile pppoa-vcmux 10 +< cake profile pppoe-llcsnap 40 +< cake profile pppoe-ptm 27 +< cake profile pppoe-vcmux 32 +< cake profile raw 0 < Captive delete logo < cpu frequency < crypto error @@ -3724,6 +3851,7 @@ < ipsec settings < itlb multihit < legacy architecture warning +< link-layer encapsulation < local ip address < meltdown < mitigated diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index a26617edd..020d3d872 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -98,7 +98,25 @@ $qossettings{'CLASS'} =3D ''; $qossettings{'CLASSPRFX'} =3D ''; $qossettings{'DEV'} =3D ''; $qossettings{'TOS'} =3D ''; +$qossettings{'CAKE_PROFILE'} =3D 'conservative'; =20 +my %CAKE_PROFILES =3D ( + "ethernet" =3D> $Lang::tr{'cake profile ethernet 38'}, + "ethernet ether-vlan" =3D> $Lang::tr{'cake profile ethernet vlan 42'}, + "raw" =3D> $Lang::tr{'cake profile raw 0'}, + "conservative" =3D> $Lang::tr{'cake profile conservative 48'}, + "docsis" =3D> $Lang::tr{'cake profile docsis 18'}, + "bridged-ptm" =3D> $Lang::tr{'cake profile bridged-ptm 19'}, + "pppoe-ptm" =3D> $Lang::tr{'cake profile pppoe-ptm 27'}, + "pppoe-llcsnap" =3D> $Lang::tr{'cake profile pppoe-llcsnap 40'}, + "pppoe-vcmux" =3D> $Lang::tr{'cake profile pppoe-vcmux 32'}, + "pppoa-llc" =3D> $Lang::tr{'cake profile pppoa-llc 14'}, + "pppoa-vcmux" =3D> $Lang::tr{'cake profile pppoa-vcmux 10'}, + "bridged-llcsnap" =3D> $Lang::tr{'cake profile bridged-llcsnap 32'}, + "bridged-vcmux" =3D> $Lang::tr{'cake profile bridged-vcmux 24'}, + "ipoa-llcsnap" =3D> $Lang::tr{'cake profile ipoa-llcsnap 16'}, + "ipoa-vcmux" =3D> $Lang::tr{'cake profile ipoa-vcmux 8'}, +); =20 &General::readhash("${General::swroot}/qos/settings", \%qossettings); &Header::getcgihash(\%qossettings); @@ -110,6 +128,12 @@ my %mainsettings =3D (); &General::readhash("${General::swroot}/main/settings", \%mainsettings); &General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", = \%color); =20 +$selected{'CAKE_PROFILE'} =3D (); +foreach my $key (keys %CAKE_PROFILES) { + $selected{'CAKE_PROFILE'}{$key} =3D ''; +} +$selected{'CAKE_PROFILE'}{$qossettings{'CAKE_PROFILE'}} =3D 'selected'; + &Header::showhttpheaders(); =20 &Header::openpage('QoS', 1, ''); @@ -759,27 +783,53 @@ sub changebandwidth { - + - - - + + + + + + + + + + + + + + + + +
$Lang::tr{'down and up speed'}$Lang::tr{'down and up speed'}
$Lang::tr{'downlink speed'}: + - -
- -
- -
$Lang::tr{'uplink speed'}: +
 
$Lang::tr{'link-layer encapsulation'= }: +
 
+ + + +
$Lang::tr{'template warning'} diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index a92bb07f8..48bf00a1a 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -529,6 +529,21 @@ 'cached' =3D> 'cached', 'cached memory' =3D> 'Cached Memory ', 'cached swap' =3D> 'Cached Swap', +'cake profile bridged-llcsnap 32' =3D> 'Bridged LLC SNAP (32 bytes)', +'cake profile bridged-ptm 19' =3D> 'Bridged PTM (19 bytes)', +'cake profile bridged-vcmux 24' =3D> 'Bridged VC-MUX (24 bytes)', +'cake profile conservative 48' =3D> 'Conservative (should work on all connec= tions, 48 bytes)', +'cake profile docsis 18' =3D> 'DOCSIS (18 bytes)', +'cake profile ethernet 38' =3D> 'Ethernet (38 bytes)', +'cake profile ethernet vlan 42' =3D> 'Ethernet with VLAN (42 bytes)', +'cake profile ipoa-llcsnap 16' =3D> 'IP over ATM LLC SNAP (16 bytes)', +'cake profile ipoa-vcmux 8' =3D> 'IP over ATM VC-MUX (8 bytes)', +'cake profile pppoa-llc 14' =3D> 'PPPoA LLC (14 bytes)', +'cake profile pppoa-vcmux 10' =3D> 'PPPoA VC-MUX (10 bytes)', +'cake profile pppoe-llcsnap 40' =3D> 'PPPoE LLC SNAP (40 bytes)', +'cake profile pppoe-ptm 27' =3D> 'PPPoE PTM (27 bytes)', +'cake profile pppoe-vcmux 32' =3D> 'PPPoE VC-MUX (32 bytes)', +'cake profile raw 0' =3D> 'Raw (no overhead compensation)', 'calamaris available reports' =3D> 'Available reports', 'calamaris byte unit' =3D> 'Byte unit', 'calamaris create report' =3D> 'Create report', @@ -1596,6 +1611,7 @@ 'length' =3D> 'Length', 'lifetime' =3D> 'Lifetime:', 'line' =3D> 'Line', +'link-layer encapsulation' =3D> 'Link-Layer Encapsulation', 'linkq' =3D> 'Link Quality', 'load printer' =3D> 'Load Printer', 'loaded modules' =3D> 'Loaded modules:', --=20 2.30.2 --===============0793136104151506687==--