Merge branch 'next' into temp-c164-development

This commit is contained in:
Peter Müller
2022-01-18 21:12:56 +00:00
25 changed files with 492 additions and 51 deletions

View File

@@ -529,6 +529,21 @@
'cached' => 'cached',
'cached memory' => 'Cached Memory ',
'cached swap' => 'Cached Swap',
'cake profile bridged-llcsnap 32' => 'Bridged LLC SNAP (32 bytes)',
'cake profile bridged-ptm 19' => 'Bridged PTM (19 bytes)',
'cake profile bridged-vcmux 24' => 'Bridged VC-MUX (24 bytes)',
'cake profile conservative 48' => 'Conservative (should work on all connections, 48 bytes)',
'cake profile docsis 18' => 'DOCSIS (18 bytes)',
'cake profile ethernet 38' => 'Ethernet (38 bytes)',
'cake profile ethernet vlan 42' => 'Ethernet with VLAN (42 bytes)',
'cake profile ipoa-llcsnap 16' => 'IP over ATM LLC SNAP (16 bytes)',
'cake profile ipoa-vcmux 8' => 'IP over ATM VC-MUX (8 bytes)',
'cake profile pppoa-llc 14' => 'PPPoA LLC (14 bytes)',
'cake profile pppoa-vcmux 10' => 'PPPoA VC-MUX (10 bytes)',
'cake profile pppoe-llcsnap 40' => 'PPPoE LLC SNAP (40 bytes)',
'cake profile pppoe-ptm 27' => 'PPPoE PTM (27 bytes)',
'cake profile pppoe-vcmux 32' => 'PPPoE VC-MUX (32 bytes)',
'cake profile raw 0' => 'Raw (no overhead compensation)',
'calamaris available reports' => 'Available reports',
'calamaris byte unit' => 'Byte unit',
'calamaris create report' => 'Create report',
@@ -1612,6 +1627,7 @@
'length' => 'Length',
'lifetime' => 'Lifetime:',
'line' => 'Line',
'link-layer encapsulation' => 'Link-Layer Encapsulation',
'linkq' => 'Link Quality',
'load printer' => 'Load Printer',
'loaded modules' => 'Loaded modules:',