aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--NEWS2
-rw-r--r--docbook/wsug_src/editcap-T.txt4
-rw-r--r--enterprises.tsv48
-rw-r--r--epan/dissectors/usb.c51
-rw-r--r--manuf117
-rw-r--r--ui/qt/wireshark_de.ts71
-rw-r--r--ui/qt/wireshark_en.ts39
-rw-r--r--ui/qt/wireshark_fr.ts69
-rw-r--r--ui/qt/wireshark_it.ts73
-rw-r--r--ui/qt/wireshark_ja_JP.ts69
-rw-r--r--ui/qt/wireshark_pl.ts71
-rw-r--r--ui/qt/wireshark_ru.ts71
-rw-r--r--ui/qt/wireshark_sv.ts71
-rw-r--r--ui/qt/wireshark_uk.ts69
-rw-r--r--ui/qt/wireshark_zh_CN.ts71
16 files changed, 782 insertions, 115 deletions
diff --git a/AUTHORS b/AUTHORS
index 79aba52544..2be24c0307 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4090,6 +4090,7 @@ Craig Jackson <cejackson51[AT]gmail.com>
Cédric Delmas <cedricde[AT]outlook.fr>
D. W. Poon <dwpoon[AT]mail.ubc.ca>
Daan De Meyer <daan.j.demeyer[AT]gmail.com>
+Damir Franusic <damir.franusic[AT]gmail.com>
Dan Robertson <danlrobertson89[AT]gmail.com>
Dana Sy <dana.hayden.sy[AT]gmail.com>
Daniel Hirschberger <daniel.hirschberger+wireshark[AT]rub.de>
diff --git a/NEWS b/NEWS
index aa7171a031..8e70703e04 100644
--- a/NEWS
+++ b/NEWS
@@ -67,7 +67,7 @@ Wireshark 3.1.0 Release Notes
A complete FAQ is available on the Wireshark web site[8].
- Last updated 2019-03-17 08:20:34 UTC
+ Last updated 2019-03-24 08:18:57 UTC
References
diff --git a/docbook/wsug_src/editcap-T.txt b/docbook/wsug_src/editcap-T.txt
index 4257dba943..7d7ab98357 100644
--- a/docbook/wsug_src/editcap-T.txt
+++ b/docbook/wsug_src/editcap-T.txt
@@ -51,7 +51,7 @@ editcap: The available encapsulation types for the "-T" flag are:
gprs-llc - GPRS LLC
gsm_um - GSM Um Interface
hhdlc - HiPath HDLC
- i2c - I2C
+ i2c-linux - I2C with Linux-specific pseudo-header
ieee-802-11 - IEEE 802.11 Wireless LAN
ieee-802-11-avs - IEEE 802.11 plus AVS radio header
ieee-802-11-netmon - IEEE 802.11 plus Network Monitor radio header
@@ -65,7 +65,7 @@ editcap: The available encapsulation types for the "-T" flag are:
ip-over-fc - RFC 2625 IP-over-Fibre Channel
ip-over-ib - IP over InfiniBand
ipfix - RFC 5655/RFC 5101 IPFIX
- ipmb - Intelligent Platform Management Bus
+ ipmb-kontron - Intelligent Platform Management Bus with Kontron pseudo-header
ipmi-trace - IPMI Trace Data Collection
ipnet - Solaris IPNET
irda - IrDA
diff --git a/enterprises.tsv b/enterprises.tsv
index 28392e12de..810109d9ba 100644
--- a/enterprises.tsv
+++ b/enterprises.tsv
@@ -5,7 +5,7 @@
# The format used here is: <NUMERICAL_ID><SPACE><NAME>
# Where SPACE can be any sequence of spaces and tabs.
#
-# (last updated 2019-03-17)
+# (last updated 2019-03-23)
0 Reserved
1 NxNetworks
@@ -3561,7 +3561,7 @@
3559 The Digital Schoolhouse
3560 Sphere Logic Corporation
3561 The Broadband Forum # formerly 'ADSL Forum'
-3562 Selway Moore Limited
+3562 Jim Marsden Development # formerly 'Selway Moore Limited'
3563 National Network Data Services
3564 Ciphernet
3565 Grolier Interactive Europe On Line Groupe
@@ -44409,7 +44409,7 @@
44585 Servato Corp
44586 CommDev, LLC
44587 InMechaSol
-44588 Kryptus Information Security Ltd.
+44588 Kryptus Information Security S/A
44589 becker-ikt.de - Jochen Becker
44590 Kevin Niehage
44591 Morgan Hunt Ltd
@@ -53430,3 +53430,45 @@
53618 Dalholm.net
53619 Altomax LLC
53620 Sensys Gatso Australia
+53621 Manipal Institute of Technology
+53622 DebOps
+53623 MIRAIT Corporation
+53624 SMS Informacionnye tekhnologii Ltd
+53625 Barrett Steel
+53626 Penzeys Spices
+53627 Rinicom Limited
+53628 California Dental Association
+53629 Beijing Zhicheng Co-Creation Information Technology Co., Ltd.
+53630 SunSpec Alliance
+53631 Vertrics microSistemas S.R.L.
+53632 De Data
+53633 voipGATE S.A.
+53634 Adyen N.V.
+53635 Matricis Informatique
+53636 Jonas Wahlberg
+53637 CL Networks Co., LTD.
+53638 Stern-Koblikowski Foundation
+53639 Fonestar Sistemas S.A.
+53640 Big Data Technology
+53641 AJ Bell Ltd
+53642 Sensys Gatso Group AB
+53643 Sayenko Kharenko
+53644 Tieto Czech s.r.o.
+53645 galis.org
+53646 AZG Tech GmbH
+53647 RAIDIX
+53648 Userman
+53649 Fuzhou Teraway Information Technology Co.,Ltd
+53650 Sekurbit Sverige AB
+53651 Backhaus Consulting GmbH
+53652 Staatsbosbeheer
+53653 DLM ELECTRONIQUE
+53654 D9 Technologies LLC
+53655 Propulsor Technology, Inc.
+53656 Pacific Radiology
+53657 CETC34
+53658 St. Raphael Cariats Alten und Behindertenhilfe GmbH
+53659 Safe Sky Industries, Inc.
+53660 EduCoach Consultants Inc
+53661 Here's work
+53662 KUZBASSHIMBANK
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 76af61b452..712c85d5d3 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -3167,6 +3167,7 @@ static const value_string usb_products_vals[] = {
{ 0x03eb7617, "AT76C505AS Wireless Adapter" },
{ 0x03eb7800, "Mini Album" },
{ 0x03eb800c, "Airspy HF+" },
+ { 0x03ebff02, "WootingTwo" },
{ 0x03ebff07, "Tux Droid fish dongle" },
{ 0x03ee0000, "CD-R/RW Drive" },
{ 0x03ee2501, "eHome Infrared Receiver" },
@@ -3184,6 +3185,7 @@ static const value_string usb_products_vals[] = {
{ 0x03f00012, "DeskJet 1125C Printer Port" },
{ 0x03f00024, "KU-0316 Keyboard" },
{ 0x03f0002a, "LaserJet P1102" },
+ { 0x03f00053, "DeskJet 2620 All-in-One Printer" },
{ 0x03f00101, "ScanJet 4100c" },
{ 0x03f00102, "PhotoSmart S20" },
{ 0x03f00104, "DeskJet 880c/970c" },
@@ -3238,6 +3240,7 @@ static const value_string usb_products_vals[] = {
{ 0x03f00512, "DeckJet 450" },
{ 0x03f00517, "LaserJet 1000" },
{ 0x03f0051d, "Bluetooth Interface" },
+ { 0x03f0052a, "LaserJet M1212nf MFP" },
{ 0x03f00601, "ScanJet 6300c" },
{ 0x03f00604, "DeskJet 840c" },
{ 0x03f00605, "ScanJet 2200c" },
@@ -4280,6 +4283,7 @@ static const value_string usb_products_vals[] = {
{ 0x04167723, "SD Card Reader" },
{ 0x04190001, "IrDA Remote Controller / Creative Cordless Mouse" },
{ 0x04190600, "Desktop Wireless 6000" },
+ { 0x04192694, "Laila" },
{ 0x04193001, "Xerox P1202 Laser Printer" },
{ 0x04193003, "Olivetti PG L12L" },
{ 0x04193201, "Docuprint P8ex" },
@@ -4642,7 +4646,6 @@ static const value_string usb_products_vals[] = {
{ 0x04242228, "9-in-2 Card Reader" },
{ 0x0424223a, "8-in-1 Card Reader" },
{ 0x04242503, "USB 2.0 Hub" },
- { 0x04242504, "USB 2.0 Hub" },
{ 0x04242507, "hub" },
{ 0x04242512, "USB 2.0 Hub" },
{ 0x04242513, "2.0 Hub" },
@@ -4654,6 +4657,7 @@ static const value_string usb_products_vals[] = {
{ 0x04242660, "Hub" },
{ 0x04242744, "Hub" },
{ 0x0424274d, "HTC Hub Controller" },
+ { 0x04242807, "Hub" },
{ 0x04243fcc, "RME MADIface" },
{ 0x04244041, "Hub and media card controller" },
{ 0x04244060, "Ultra Fast Media Reader" },
@@ -4661,6 +4665,7 @@ static const value_string usb_products_vals[] = {
{ 0x04245434, "Hub" },
{ 0x04245534, "Hub" },
{ 0x04245744, "Hub" },
+ { 0x04245807, "Hub" },
{ 0x04247500, "LAN7500 Ethernet 10/100/1000 Adapter" },
{ 0x04249500, "LAN9500/LAN9500i" },
{ 0x04249512, "SMC9512/9514 USB Hub" },
@@ -5387,6 +5392,7 @@ static const value_string usb_products_vals[] = {
{ 0x045e0799, "Surface Pro embedded keyboard" },
{ 0x045e07a5, "Wireless Receiver 1461C" },
{ 0x045e07b2, "2.4GHz Transceiver v8.0 used by mouse Wireless Desktop 900" },
+ { 0x045e07b6, "Comfort Curve Keyboard 3000" },
{ 0x045e07b9, "Wired Keyboard 200" },
{ 0x045e07c6, "RTL8153 GigE [Surface Dock Ethernet]" },
{ 0x045e07ca, "Surface Pro 3 Docking Station Audio Device" },
@@ -6173,6 +6179,7 @@ static const value_string usb_products_vals[] = {
{ 0x04800100, "Stor.E Slim USB 3.0" },
{ 0x04800200, "External Disk" },
{ 0x04800820, "Canvio Advance Disk" },
+ { 0x04800821, "Canvio Advance 2TB model DTC920" },
{ 0x0480a006, "External Disk 1.5TB" },
{ 0x0480a007, "External Disk USB 3.0" },
{ 0x0480a009, "Stor.E Basics" },
@@ -6232,6 +6239,7 @@ static const value_string usb_products_vals[] = {
{ 0x04835730, "Audio Speaker" },
{ 0x04835731, "Microphone" },
{ 0x04835740, "Virtual COM Port" },
+ { 0x04835750, "LED badge -- mini LED display -- 11x44" },
{ 0x04837270, "ST Micro Serial Bridge" },
{ 0x04837554, "56k SoftModem" },
{ 0x04838213, "ThermaData Logger Cradle" },
@@ -6268,6 +6276,7 @@ static const value_string usb_products_vals[] = {
{ 0x048d9503, "ITE it9503 feature-limited DVB-T transmission chip [ccHDtv]" },
{ 0x048d9507, "ITE it9507 full featured DVB-T transmission chip [ccHDtv]" },
{ 0x048d9910, "IT9910 chipset based grabber" },
+ { 0x048dff59, "Hdmi-CEC Bridge" },
{ 0x04910003, "Taxan Monitor Control" },
{ 0x04920140, "MP3 player" },
{ 0x04920141, "MP3 Player" },
@@ -6325,6 +6334,7 @@ static const value_string usb_products_vals[] = {
{ 0x04991054, "S90XS Keyboard/Music Synthesizer" },
{ 0x0499160f, "P-105" },
{ 0x04991613, "Clavinova CLP535" },
+ { 0x04991617, "PSR-E353 digital keyboard" },
{ 0x04991704, "Steinberg UR44" },
{ 0x04992000, "DGP-7" },
{ 0x04992001, "DGP-5" },
@@ -7293,6 +7303,7 @@ static const value_string usb_products_vals[] = {
{ 0x04b0042d, "Nikon DSC D600" },
{ 0x04b0042e, "Nikon DSC D800E" },
{ 0x04b0042f, "Nikon DSC D5200" },
+ { 0x04b00430, "D7100" },
{ 0x04b0043f, "D5600" },
{ 0x04b00601, "Nikon V1" },
{ 0x04b00602, "Nikon J1" },
@@ -7857,6 +7868,8 @@ static const value_string usb_products_vals[] = {
{ 0x04d89015, "ICD 4 In-Circuit Debugger" },
{ 0x04d8c001, "PicoLCD 20x4" },
{ 0x04d8e11c, "TL866CS EEPROM Programmer [MiniPRO]" },
+ { 0x04d8edb4, "micro PLC (ATSAMD51G19A) [Black Brix ECU II]" },
+ { 0x04d8edb5, "ATMEGA32U4 [Black Brix ECU]" },
{ 0x04d8f2c4, "Macareux-labs Hygrometry Temperature Sensor" },
{ 0x04d8f2f7, "Yepkit YKUSH" },
{ 0x04d8f3aa, "Macareux-labs Usbce Bootloader mode" },
@@ -8154,6 +8167,7 @@ static const value_string usb_products_vals[] = {
{ 0x04e83426, "SCX-4500 Laser Printer" },
{ 0x04e8342d, "SCX-4x28 Series" },
{ 0x04e8344f, "SCX-3400 Series" },
+ { 0x04e8347e, "C48x Series Color Laser Multifunction Printer" },
{ 0x04e83605, "InkJet Color Printer" },
{ 0x04e83606, "InkJet Color Printer" },
{ 0x04e83609, "InkJet Color Printer" },
@@ -8251,6 +8265,7 @@ static const value_string usb_products_vals[] = {
{ 0x04e86125, "D3 Station External Hard Drive" },
{ 0x04e861b5, "M3 Portable Hard Drive 2TB" },
{ 0x04e861b6, "M3 Portable Hard Drive 1TB" },
+ { 0x04e861b7, "M3 Portable Hard Drive 4TB" },
{ 0x04e861f3, "Portable SSD T3 (MU-PT250B, MU-PT500B)" },
{ 0x04e861f5, "Portable SSD T5" },
{ 0x04e86601, "Mobile Phone" },
@@ -8321,6 +8336,7 @@ static const value_string usb_products_vals[] = {
{ 0x04e87061, "eHome Infrared Receiver" },
{ 0x04e87080, "Anycall SCH-W580" },
{ 0x04e87081, "Human Interface Device" },
+ { 0x04e87301, "Fingerprint Device" },
{ 0x04e88001, "Handheld" },
{ 0x04e8d003, "GT-I9003" },
{ 0x04e8e020, "SERI E02 SCOM 6200 UMTS Phone" },
@@ -8455,6 +8471,7 @@ static const value_string usb_products_vals[] = {
{ 0x04f302f4, "2.4G Cordless Mouse" },
{ 0x04f30381, "Touchscreen" },
{ 0x04f304a0, "Dream Cheeky Stress/Panic Button" },
+ { 0x04f32234, "Touchscreen" },
{ 0x04f90002, "HL-1050 Laser Printer" },
{ 0x04f90005, "Printer" },
{ 0x04f90006, "HL-1240 Laser Printer" },
@@ -8961,6 +8978,9 @@ static const value_string usb_products_vals[] = {
{ 0x04f92041, "PT-2730 P-touch Label Printer" },
{ 0x04f92061, "PT-P700 P-touch Label Printer" },
{ 0x04f92064, "PT-P700 P-touch Label Printer RemovableDisk" },
+ { 0x04f9209b, "QL-800 P-touch Label Printer" },
+ { 0x04f9209c, "QL-810W P-touch Label Printer" },
+ { 0x04f9209d, "QL-820NWB P-touch Label Printer" },
{ 0x04f92100, "Card Reader Writer" },
{ 0x04f92102, "Sewing machine" },
{ 0x04f960a0, "ADS-2000" },
@@ -9304,6 +9324,7 @@ static const value_string usb_products_vals[] = {
{ 0x054c003c, "VAIO-MX LCD Control" },
{ 0x054c0045, "Digital Imaging Video" },
{ 0x054c0046, "Network Walkman" },
+ { 0x054c0049, "UP-D895" },
{ 0x054c004a, "Memory Stick Hi-Fi System" },
{ 0x054c004b, "Memory Stick Reader/Writer" },
{ 0x054c004e, "Sony DSC-U10" },
@@ -9388,6 +9409,7 @@ static const value_string usb_products_vals[] = {
{ 0x054c01d0, "DVD+RW External Drive DRU-700A" },
{ 0x054c01d5, "IC RECORDER" },
{ 0x054c01de, "VRD-VC10 [Video Capture]" },
+ { 0x054c01e7, "UP-D897" },
{ 0x054c01e8, "UP-DR150 Photo Printer" },
{ 0x054c01e9, "Net MD" },
{ 0x054c01ea, "Hi-MD WALKMAN" },
@@ -9679,6 +9701,8 @@ static const value_string usb_products_vals[] = {
{ 0x056a0037, "PL700" },
{ 0x056a0038, "PL510" },
{ 0x056a0039, "DTU-710" },
+ { 0x056a003a, "DTI-520" },
+ { 0x056a003b, "Integrated Hub" },
{ 0x056a003f, "DTZ-2100 [Cintiq 21UX]" },
{ 0x056a0041, "XD-0405-U [Intuos2 (4x5)]" },
{ 0x056a0042, "XD-0608-U [Intuos2 (6x8)]" },
@@ -9701,7 +9725,7 @@ static const value_string usb_products_vals[] = {
{ 0x056a006a, "CTE-460 [Bamboo One Pen (S)]" },
{ 0x056a006b, "CTE-660 [Bamboo One Pen (M)]" },
{ 0x056a0081, "CTE-630BT [Graphire Wireless (6x8)]" },
- { 0x056a0084, "Wireless adapter for Bamboo tablets" },
+ { 0x056a0084, "ACK-40401 [Wireless Accessory Kit]" },
{ 0x056a0090, "TPC90" },
{ 0x056a0093, "TPC93" },
{ 0x056a0097, "TPC97" },
@@ -9747,6 +9771,7 @@ static const value_string usb_products_vals[] = {
{ 0x056a00ec, "TPCEC" },
{ 0x056a00ed, "TPCED" },
{ 0x056a00ef, "TPCEF" },
+ { 0x056a00f0, "DTU-1631" },
{ 0x056a00f4, "DTK-2400 [Cintiq 24HD] tablet" },
{ 0x056a00f6, "DTH-2400 [Cintiq 24HD touch] touchscreen" },
{ 0x056a00f8, "DTH-2400 [Cintiq 24HD touch] tablet" },
@@ -9772,7 +9797,21 @@ static const value_string usb_products_vals[] = {
{ 0x056a0315, "PTH-651 [Intuos pro (M)]" },
{ 0x056a0317, "PTH-851 [Intuos pro (L)]" },
{ 0x056a0318, "CTH-301 [Bamboo]" },
+ { 0x056a0319, "CTH-300 [Bamboo Pad wireless]" },
+ { 0x056a0323, "CTL-680 [Intuos Pen (M)]" },
+ { 0x056a032a, "DTK-2700 [Cintiq 27QHD]" },
+ { 0x056a032b, "DTH-2700 [Cintiq 27QHD touch] tablet" },
+ { 0x056a032c, "DTH-2700 [Cintiq 27QHD touch] touchscreen" },
{ 0x056a032f, "DTU-1031X" },
+ { 0x056a0331, "ACK-411050 [ExpressKey Remote]" },
+ { 0x056a0333, "DTH-1300 [Cintiq 13HD Touch] tablet" },
+ { 0x056a0335, "DTH-1300 [Cintiq 13HD Touch] touchscreen" },
+ { 0x056a0336, "DTU-1141" },
+ { 0x056a033b, "CTL-490 [Intuos Draw (S)]" },
+ { 0x056a033c, "CTH-490 [Intuos Art/Photo/Comic (S)]" },
+ { 0x056a033d, "CTL-690 [Intuos Draw (M)]" },
+ { 0x056a033e, "CTH-690 [Intuos Art (M)]" },
+ { 0x056a0343, "DTK-1651" },
{ 0x056a0347, "Integrated Hub" },
{ 0x056a0348, "Integrated Hub" },
{ 0x056a034a, "DTH-W1320 [MobileStudio Pro 13] touchscreen" },
@@ -9789,6 +9828,7 @@ static const value_string usb_products_vals[] = {
{ 0x056a0356, "DTH-3220 [Cintiq Pro 32] touchscreen" },
{ 0x056a0357, "PTH-660 [Intuos Pro (M)]" },
{ 0x056a0358, "PTH-860 [Intuos Pro (L)]" },
+ { 0x056a0359, "DTU-1141B" },
{ 0x056a035a, "DTH-1152 tablet" },
{ 0x056a0368, "DTH-1152 touchscreen" },
{ 0x056a0374, "CTL-4100 [Intuos (S)]" },
@@ -9835,6 +9875,9 @@ static const value_string usb_products_vals[] = {
{ 0x056e0074, "Optical mouse M-FW1UL" },
{ 0x056e0075, "Laser mouse M-FW2DL" },
{ 0x056e0077, "Laser mouse M-LY2UL" },
+ { 0x056e0079, "Laser mouse M-D21DL" },
+ { 0x056e007b, "Laser mouse M-D20DR" },
+ { 0x056e007c, "Laser Bluetooth mouse M-BT5BL" },
{ 0x056e2003, "JC-U3613M" },
{ 0x056e2004, "JC-U3613M" },
{ 0x056e200c, "LD-USB/TX" },
@@ -11960,6 +12003,7 @@ static const value_string usb_products_vals[] = {
{ 0x06f83020, "Hercules Webcam EC300" },
{ 0x06f8a300, "Dual Analog Leader GamePad" },
{ 0x06f8b000, "Hercules DJ Console" },
+ { 0x06f8b121, "Hercules P32 DJ" },
{ 0x06f8c000, "Hercules Muse Pocket" },
{ 0x06f8d002, "Hercules DJ Console" },
{ 0x06f8e000, "HWGUSB2-54 WLAN" },
@@ -14158,6 +14202,9 @@ static const value_string usb_products_vals[] = {
{ 0x0aad0070, "NRP-Z57" },
{ 0x0aad0083, "NRP-Z85" },
{ 0x0aad0095, "NRP-Z86" },
+ { 0x0aad0117, "HMF / HMP / HMS-X / HMO series Oscilloscopes" },
+ { 0x0aad0118, "HMF / HMP / HMS-X / HMO series Oscilloscopes" },
+ { 0x0aad0119, "HMF / HMP / HMS-X / HMO series Oscilloscopes" },
{ 0x0ab10002, "OBID RFID-Reader" },
{ 0x0ab10004, "OBID classic-pro" },
{ 0x0aba8001, "Tracker 110 Protocol Analyzer" },
diff --git a/manuf b/manuf
index b0ea19adf4..1223d0c75e 100644
--- a/manuf
+++ b/manuf
@@ -45,23 +45,23 @@
# http://standards-oui.ieee.org/cid/cid.csv:
# Content-Length: 7219
-# Last-Modified: Sun, 17 Mar 2019 08:00:40 GMT
+# Last-Modified: Sun, 24 Mar 2019 08:00:24 GMT
# http://standards-oui.ieee.org/iab/iab.csv:
# Content-Length: 381359
-# Last-Modified: Sun, 17 Mar 2019 08:01:42 GMT
+# Last-Modified: Sun, 24 Mar 2019 08:01:24 GMT
# http://standards-oui.ieee.org/oui/oui.csv:
-# Content-Length: 2327694
-# Last-Modified: Sun, 17 Mar 2019 08:04:02 GMT
+# Content-Length: 2334089
+# Last-Modified: Sun, 24 Mar 2019 08:03:44 GMT
# http://standards-oui.ieee.org/oui28/mam.csv:
-# Content-Length: 258936
-# Last-Modified: Sun, 17 Mar 2019 08:02:10 GMT
+# Content-Length: 261431
+# Last-Modified: Sun, 24 Mar 2019 08:01:52 GMT
# http://standards-oui.ieee.org/oui36/oui36.csv:
-# Content-Length: 276509
-# Last-Modified: Sun, 17 Mar 2019 08:03:34 GMT
+# Content-Length: 277044
+# Last-Modified: Sun, 24 Mar 2019 08:03:16 GMT
00:00:00 00:00:00 Officially Xerox, but 0:0:0:0:0:0 is more common
00:00:01 Xerox Xerox Corporation
@@ -3215,7 +3215,7 @@
00:0C:69 National National Radio Astronomy Observatory
00:0C:6A Mbari
00:0C:6B KurzIndu Kurz Industrie-Elektronik GmbH
-00:0C:6C CorsairM Corsair Memory, Inc.
+00:0C:6C Eve Eve Systems GmbH
00:0C:6D Edwards Edwards Ltd.
00:0C:6E AsustekC ASUSTek COMPUTER INC.
00:0C:6F AmtekSys Amtek system co.,LTD.
@@ -15478,6 +15478,7 @@
00:76:86 Cisco Cisco Systems, Inc
00:76:B1 Somfy-Pr Somfy-Protect By Myfox SAS
00:77:8D Cisco Cisco Systems, Inc
+00:77:E4 Nokia
00:78:88 Cisco Cisco Systems, Inc
00:78:9E Sagemcom Sagemcom Broadband SAS
00:78:CD Ignition Ignition Design Labs
@@ -17377,6 +17378,7 @@
04:81:AE Clack Clack Corporation
04:84:8A 7InovaTe 7Inova Technology Limited
04:88:45 BayNetwo Bay Networks # token ring line card
+04:88:5F HuaweiTe Huawei Technologies Co.,Ltd
04:88:8C Eifelwer Eifelwerk Butler Systeme GmbH
04:88:E2 BeatsEle Beats Electronics LLC
04:8A:15 Avaya Avaya Inc
@@ -17701,11 +17703,12 @@
08:40:27 Gridstor Gridstore Inc.
08:40:F3 TendaTec Tenda Technology Co.,Ltd.Dongguan branch
08:46:56 Veo-Labs
-08:47:D0 NokiaSha Nokia Shanghai Bell Co. Ltd.)
+08:47:D0 NokiaSha Nokia Shanghai Bell Co., Ltd.
08:48:2C RaycoreT Raycore Taiwan Co., LTD.
08:4A:CF Guangdon Guangdong Oppo Mobile Telecommunications Corp.,Ltd
08:4E:1C H2ALlc H2A Systems, LLC
08:4E:BF BroadNet Broad Net Mux Corporation
+08:4F:0A HuaweiTe Huawei Technologies Co.,Ltd
08:51:14 QingdaoT Qingdao Topscomm Communication Co., Ltd
08:51:2E OrionDia Orion Diagnostica Oy
08:52:40 EbvElekt EbV Elektronikbau- und Vertriebs GmbH
@@ -17760,7 +17763,7 @@
08:97:58 Shenzhen Shenzhen Strong Rising Electronics Co.,Ltd DongGuan Subsidiary
08:97:98 CompalIn Compal Information (Kunshan) Co., Ltd.
08:9B:4B IkuaiNet iKuai Networks
-08:9C:86 NokiaSha Nokia Shanghai Bell Co. Ltd.)
+08:9C:86 NokiaSha Nokia Shanghai Bell Co., Ltd.
08:9E:01 QuantaCo Quanta Computer Inc.
08:9E:08 Google Google, Inc.
08:9F:97 LeroyAut Leroy Automation
@@ -18009,6 +18012,7 @@
0C:B5:27 HuaweiTe Huawei Technologies Co.,Ltd
0C:B5:DE AlcatelL Alcatel Lucent
0C:B6:D2 D-LinkIn D-Link International
+0C:B7:71 ArrisGro ARRIS Group, Inc.
0C:B9:12 Jm-Data JM-DATA GmbH
0C:B9:37 UbeeInte Ubee Interactive Co., Limited
0C:BC:9F Apple Apple, Inc.
@@ -18497,6 +18501,7 @@
14:9F:B6 Guangdon Guangdong Genius Technology Co., Ltd.
14:9F:E8 LenovoMo Lenovo Mobile Communication Technology Ltd.
14:A0:F8 HuaweiTe Huawei Technologies Co.,Ltd
+14:A2:A0 Cisco Cisco Systems, Inc
14:A3:64 SamsungE Samsung Electronics Co.,Ltd
14:A5:1A HuaweiTe Huawei Technologies Co.,Ltd
14:A6:2C SMDezacS S.M. Dezac S.A.
@@ -18506,6 +18511,7 @@
14:A9:E3 Mst Mst Corporation
14:AB:C5 IntelCor Intel Corporate
14:AB:F0 ArrisGro ARRIS Group, Inc.
+14:AD:CA ChinaMob China Mobile Iot Limited company
14:AE:DB VtechTel VTech Telecommunications Ltd.
14:B1:26 Industri Industrial Software Co
14:B1:C8 Infiniwi InfiniWing, Inc.
@@ -18763,6 +18769,7 @@
18:C8:E7 Shenzhen Shenzhen Hualistone Technology Co.,Ltd
18:CC:23 PhilioTe Philio Technology Corporation
18:CC:88 HitachiJ Hitachi Johnson Controls Air
+18:CF:24 HuaweiTe Huawei Technologies Co.,Ltd
18:CF:5E LiteonTe Liteon Technology Corporation
18:D0:71 Dasan Dasan Co., Ltd.
18:D2:25 Fiberhom Fiberhome Telecommunication Technologies Co.,LTD
@@ -18831,6 +18838,7 @@
1C:1D:86 Cisco Cisco Systems, Inc
1C:1E:E3 HuiZhouG Hui Zhou Gaoshengda Technology Co.,LTD
1C:1F:D4 Lifebeam LifeBEAM Technologies LTD
+1C:20:DB HuaweiTe Huawei Technologies Co.,Ltd
1C:21:D1 IeeeRegi IEEE Registration Authority
1C:21:D1:00:00:00/28 ToyoSyst Toyo System CO.,LTD.
1C:21:D1:10:00:00/28 Ognios Ognios GmbH
@@ -19376,6 +19384,7 @@
24:11:25 Hutek Hutek Co., Ltd.
24:11:48 Entropix Entropix, LLC
24:11:D0 Chongqin Chongqing Ehs Science and Technology Development Co.,Ltd.
+24:16:6D HuaweiTe Huawei Technologies Co.,Ltd
24:18:1D SamsungE Samsung Electro-Mechanics(Thailand)
24:1A:8C Squarehe Squarehead Technology AS
24:1B:13 Shanghai Shanghai Nutshell Electronic Co., Ltd.
@@ -19653,6 +19662,7 @@
28:3F:69 SonyMobi Sony Mobile Communications Inc
28:40:1A C8Medise C8 MediSensors, Inc.
28:41:21 Optisens OptiSense Network, LLC
+28:41:C6 HuaweiTe Huawei Technologies Co.,Ltd
28:44:30 Genesist GenesisTechnical Systems (UK) Ltd
28:47:AA Nokia Nokia Corporation
28:48:46 Gridcent GridCentric Inc.
@@ -20668,6 +20678,7 @@
34:FC:B9 HewlettP Hewlett Packard Enterprise
34:FC:EF LgElectr LG Electronics (Mobile Communications)
38:00:25 IntelCor Intel Corporate
+38:01:18 Ulvac ULVAC,Inc.
38:01:95 SamsungE Samsung Electronics Co.,Ltd
38:01:97 TsstGlob TSST Global,Inc
38:01:9F Shenzhen Shenzhen Fast Technologies Co.,Ltd
@@ -20812,6 +20823,7 @@
38:91:FB XenoxBv Xenox Holding BV
38:94:96 SamsungE Samsung Electronics Co.,Ltd
38:94:E0 Syrotech Syrotech Networks. Ltd.
+38:94:ED Netgear
38:95:92 BeijingT Beijing Tendyron Corporation
38:97:D6 Hangzhou Hangzhou H3C Technologies Co., Limited
38:98:D8 Meritech Meritech Co.,Ltd
@@ -21268,6 +21280,7 @@
40:26:19 Apple Apple, Inc.
40:27:0B Mobileec Mobileeco Co., Ltd
40:28:14 RfiEngin RFI Engineering
+40:2B:50 ArrisGro ARRIS Group, Inc.
40:2B:A1 SonyMobi Sony Mobile Communications Inc
40:2C:F4 Universa Universal Global Scientific Industrial Co., Ltd.
40:2E:28 Mixtelem MiXTelematics
@@ -21321,6 +21334,7 @@
40:56:2D Smartron Smartron India Pvt ltd
40:56:62 Guotengs GuoTengShengHua Electronics LTD.
40:5A:9B Anovo
+40:5B:D8 Chongqin Chongqing Fugui Electronics Co.,Ltd.
40:5C:FD Dell Dell Inc.
40:5D:82 Netgear
40:5E:E1 Shenzhen Shenzhen H&T Intelligent Control Co.,Ltd.
@@ -21992,6 +22006,7 @@
40:FE:0D Maxio
44:00:10 Apple Apple, Inc.
44:00:49 AmazonTe Amazon Technologies Inc.
+44:00:4D HuaweiTe Huawei Technologies Co.,Ltd
44:03:2C IntelCor Intel Corporate
44:03:A7 Cisco Cisco Systems, Inc
44:04:44 Guangdon Guangdong Oppo Mobile Telecommunications Corp.,Ltd
@@ -22661,6 +22676,7 @@
4C:E5:AE TianjinB Tianjin Beebox Intelligent Technology Co.,Ltd.
4C:E6:76 Buffalo Buffalo.Inc
4C:E9:33 Railcomm RailComm, LLC
+4C:E9:E4 NewH3CTe New H3C Technologies Co., Ltd
4C:EB:42 IntelCor Intel Corporate
4C:EC:EF Soraa Soraa, Inc.
4C:ED:DE AskeyCom Askey Computer Corp
@@ -22924,6 +22940,7 @@
50:F5:DA AmazonTe Amazon Technologies Inc.
50:F6:1A KunshanJ Kunshan JADE Technologies co., Ltd.
50:F7:22 Cisco Cisco Systems, Inc
+50:F8:A5 Ewbm eWBM Co., Ltd.
50:FA:84 Tp-LinkT Tp-Link Technologies Co.,Ltd.
50:FA:AB L-TekDOO L-tek d.o.o.
50:FC:30 Treehous Treehouse Labs
@@ -23144,6 +23161,7 @@
54:EC:2F RuckusWi Ruckus Wireless
54:ED:A3 Navdy Navdy, Inc.
54:EE:75 WistronI Wistron InfoComm(Kunshan)Co.,Ltd.
+54:EF:44 LumiUnit Lumi United Technology Co., Ltd
54:EF:92 Shenzhen Shenzhen Elink Technology Co., LTD
54:EF:FE Fullpowe Fullpower Technologies, Inc.
54:F2:01 SamsungE Samsung Electronics Co.,Ltd
@@ -23703,14 +23721,19 @@
60:95:CE IeeeRegi IEEE Registration Authority
60:95:CE:00:00:00/28 SiemaApp Siema Applications
60:95:CE:10:00:00/28 PonoorEx Ponoor Experiments Inc.
+60:95:CE:20:00:00/28 Q-Sentec Q-SENTECH Co.,Ltd.
+60:95:CE:30:00:00/28 RobotSA Robot S.A.
60:95:CE:40:00:00/28 Untangle Untangle, Inc.
60:95:CE:50:00:00/28 Advanwis AdvanWISE Corporation
60:95:CE:60:00:00/28 XiamenSi Xiamen Sigmastar Technology Ltd.
60:95:CE:70:00:00/28 CadmoSol Cadmo Soluciones SAC
60:95:CE:80:00:00/28 TrophySa Trophy SAS
+60:95:CE:90:00:00/28 Jlztlink Jlztlink Industry(ShenZhen)Co.,Ltd.
+60:95:CE:A0:00:00/28 UnManned (Un)Manned
60:95:CE:B0:00:00/28 BeijingS Beijing Sinomedisite Bio-tech Co.,Ltd
60:95:CE:C0:00:00/28 Synamedi Synamedia
60:95:CE:D0:00:00/28 Govcomm
+60:95:CE:E0:00:00/28 Vns VNS Inc.
60:96:20 Private
60:97:DD Microsys MicroSys Electronics GmbH
60:98:13 Shanghai Shanghai Visking Digital Technology Co. LTD
@@ -24279,6 +24302,7 @@
6C:24:83 Microsof Microsoft Mobile Oy
6C:25:B9 BbkEduca Bbk Educational Electronics Corp.,Ltd.
6C:27:79 Microsof Microsoft Mobile Oy
+6C:29:90 WizConne WiZ Connected Lighting Company Limited
6C:29:95 IntelCor Intel Corporate
6C:2A:CB PaxtonAc Paxton Access Ltd
6C:2B:59 Dell Dell Inc.
@@ -24423,7 +24447,7 @@
6C:C7:EC SamsungE Samsung Electro-Mechanics(Thailand)
6C:CA:08 ArrisGro ARRIS Group, Inc.
6C:D0:32 LgElectr LG Electronics
-6C:D1:46 SmartekD Smartek d.o.o.
+6C:D1:46 Framos FRAMOS GmbH
6C:D1:B0 WingSing Wing Sing Electronics Hong Kong Limited
6C:D6:8A LgElectr LG Electronics (Mobile Communications)
6C:DC:6A Promethe Promethean Limited
@@ -24473,6 +24497,7 @@
70:01:B5 Cisco Cisco Systems, Inc
70:02:58 01Db-Met 01Db-Metravib
70:03:7E Technico Technicolor CH USA Inc.
+70:04:33 Californ California Things Inc.
70:05:14 LgElectr LG Electronics (Mobile Communications)
70:06:AC Eastcomp Eastcompeace Technology Co., Ltd
70:0B:01 Sagemcom Sagemcom Broadband SAS
@@ -24828,6 +24853,7 @@
70:B3:D5:0C:70:00/36 PeekTraf Peek Traffic
70:B3:D5:0C:80:00/36 FinRobot Fin Robotics Inc
70:B3:D5:0C:90:00/36 LineageP Lineage Power Pvt Ltd.,
+70:B3:D5:0C:A0:00/36 Vitec
70:B3:D5:0C:D0:00/36 AmlOcean AML Oceanographic
70:B3:D5:0C:E0:00/36 Innomind Innominds Software Inc
70:B3:D5:0C:F0:00/36 Sohonet sohonet ltd
@@ -25745,6 +25771,7 @@
70:B3:D5:5D:C0:00/36 Factoryl FactoryLab B.V.
70:B3:D5:5D:E0:00/36 Hangzhou Hangzhou AwareTec Technology Co., Ltd
70:B3:D5:5E:00:00/36 HexagonM Hexagon Metrology SAS
+70:B3:D5:5E:10:00/36 Arevita
70:B3:D5:5E:20:00/36 Grossenb Grossenbacher Systeme AG
70:B3:D5:5E:30:00/36 ImeconEn Imecon Engineering SrL
70:B3:D5:5E:40:00/36 DspDesig Dsp Design
@@ -25938,6 +25965,7 @@
70:B3:D5:6F:B0:00/36 Shachiha Shachihata Inc.
70:B3:D5:6F:C0:00/36 Mi MI Inc.
70:B3:D5:6F:D0:00/36 CoreAkıl Core Akıllı Ev Sistemleri
+70:B3:D5:6F:E0:00/36 NtoIre-P Nto Ire-Polus
70:B3:D5:6F:F0:00/36 AkeoPlus Akeo Plus
70:B3:D5:70:00:00/36 Universi University Of Groningen
70:B3:D5:70:20:00/36 SensorHi Sensor Highway Ltd
@@ -26233,6 +26261,7 @@
70:B3:D5:88:00:00/36 SkopeiBV Skopei B.V.
70:B3:D5:88:10:00/36 TattileS Tattile Srl
70:B3:D5:88:20:00/36 SimonTec Simon Tech, S.L.
+70:B3:D5:88:40:00/36 LgElectr LG Electronics
70:B3:D5:88:50:00/36 Quirklog QuirkLogic
70:B3:D5:88:80:00/36 Zetechti Zetechtics Ltd
70:B3:D5:88:90:00/36 Innovati Innovative Circuit Technology
@@ -26643,6 +26672,7 @@
70:B3:D5:AB:A0:00/36 ClIntern CL International
70:B3:D5:AB:B0:00/36 DavidHor David Horn Communications Ltd
70:B3:D5:AB:C0:00/36 Bkm-Micr BKM-Micronic Richtfunkanlagen GmbH
+70:B3:D5:AB:D0:00/36 Wtec wtec GmbH
70:B3:D5:AB:E0:00/36 MartNetw Mart Network Solutions Ltd
70:B3:D5:AB:F0:00/36 AgrInter AGR International
70:B3:D5:AC:00:00/36 Ritec
@@ -27027,6 +27057,7 @@
70:B3:D5:CD:30:00/36 Controlr Controlrad
70:B3:D5:CD:50:00/36 ApantacL Apantac LLC
70:B3:D5:CD:60:00/36 Videoray VideoRay LLC
+70:B3:D5:CD:70:00/36 Automati AutomationX GmbH
70:B3:D5:CD:90:00/36 PeterHub Peter Huber Kaeltemaschinenbau GmbH
70:B3:D5:CD:A0:00/36 Vitec
70:B3:D5:CD:C0:00/36 Dat-ConD Dat-Con d.o.o.
@@ -27048,6 +27079,7 @@
70:B3:D5:CF:40:00/36 HarbinCh Harbin Cheng Tian Technology Development Co., Ltd.
70:B3:D5:CF:50:00/36 PetringE Petring Energietechnik GmbH
70:B3:D5:CF:60:00/36 TornadoM Tornado Modular Systems
+70:B3:D5:CF:80:00/36 IdneoTec Idneo Technologies S.A.U.
70:B3:D5:CF:D0:00/36 IloqOy iLOQ Oy
70:B3:D5:CF:E0:00/36 Secturio Secturion Systems
70:B3:D5:CF:F0:00/36 DtechLab DTECH Labs, Inc.
@@ -27605,6 +27637,7 @@
70:BF:92 GnAudio GN Audio A/S
70:C6:AC BoschAut Bosch Automotive Aftermarket
70:C7:6F InnoS Inno S
+70:C7:F2 HuaweiTe Huawei Technologies Co.,Ltd
70:C8:33 WirepasO Wirepas Oy
70:C9:4E LiteonTe Liteon Technology Corporation
70:C9:C6 Cisco Cisco Systems, Inc
@@ -27738,6 +27771,7 @@
74:31:70 Arcadyan Arcadyan Technology Corporation
74:32:56 Nt-WareS NT-ware Systemprg GmbH
74:34:00 Mtg MTG Co., Ltd.
+74:34:AE ThisIsEn this is engineering Inc.
74:36:6D Vodafone Vodafone Italia S.p.A.
74:37:2F Tongfang Tongfang Shenzhen Cloudcomputing Technology Co.,Ltd
74:37:3B Uninet UNINET Co.,Ltd.
@@ -28160,6 +28194,7 @@
78:C2:C0:D0:00:00/28 Korf KORF Inc.
78:C2:C0:E0:00:00/28 Huwomobi Huwomobility
78:C2:C0:F0:00:00/28 Private
+78:C3:13 ChinaMob China Mobile Group Device Co.,Ltd.
78:C3:E9 SamsungE Samsung Electronics Co.,Ltd
78:C4:0E H&DWirel H&D Wireless
78:C4:AB Shenzhen Shenzhen Runsil Technology Co.,Ltd
@@ -28186,6 +28221,7 @@
78:CA:83:E0:00:00/28 Konecran Konecranes
78:CB:33 DhcSoftw DHC Software Co.,Ltd
78:CB:68 DaehapHy Daehap Hyper-Tech
+78:CC:2B SinewyTe Sinewy Technology Co., Ltd
78:CD:8E SmcNetwo SMC Networks Inc
78:D0:04 NeousysT Neousys Technology Inc.
78:D1:29 Vicos
@@ -28545,6 +28581,7 @@
7C:EB:AE Ridgelin Ridgeline Instruments
7C:EB:EA Asct
7C:EC:79 TexasIns Texas Instruments
+7C:EC:9B FuzhouTe Fuzhou Teraway Information Technology Co.,Ltd
7C:ED:8D Microsof Microsoft
7C:EF:18 Creative Creative Product Design Pty. Ltd.
7C:EF:8A InhonInt Inhon International Ltd.
@@ -28673,7 +28710,7 @@
80:79:AE Shandong ShanDong Tecsunrise Co.,Ltd
80:7A:7F AbbGenwa ABB Genway Xiamen Electrical Equipment CO., LTD
80:7A:BF Htc HTC Corporation
-80:7B:1E CorsairC Corsair Components
+80:7B:1E CorsairM Corsair Memory, Inc.
80:7B:85 IeeeRegi IEEE Registration Authority
80:7B:85:00:00:00/28 Shiroshi Shiroshita Industrial Co., Ltd.
80:7B:85:10:00:00/28 Hangzhou Hangzhou Synway Information Engineering Co., Ltd
@@ -29274,7 +29311,7 @@
88:B1:68 DeltaCon Delta Control GmbH
88:B1:E1 MojoNetw Mojo Networks, Inc.
88:B2:91 Apple Apple, Inc.
-88:B3:62 NokiaSha Nokia Shanghai Bell Co. Ltd.)
+88:B3:62 NokiaSha Nokia Shanghai Bell Co., Ltd.
88:B4:36 Private
88:B4:A6 Motorola Motorola Mobility LLC, a Lenovo Company
88:B6:27 GembirdE Gembird Europe BV
@@ -29604,6 +29641,7 @@
8C:F9:C9 MesadaTe MESADA Technology Co.,Ltd.
8C:FA:BA Apple Apple, Inc.
8C:FC:A0 Shenzhen Shenzhen Smart Device Technology Co., LTD.
+8C:FD:18 HuaweiTe Huawei Technologies Co.,Ltd
8C:FD:F0 Qualcomm Qualcomm Inc.
8C:FE:57 Apple Apple, Inc.
8C:FE:74 RuckusWi Ruckus Wireless
@@ -29731,6 +29769,7 @@
90:72:82 Sagemcom Sagemcom Broadband SAS
90:73:5A Motorola Motorola Mobility LLC, a Lenovo Company
90:78:41 IntelCor Intel Corporate
+90:78:B2 XiaomiCo Xiaomi Communications Co Ltd
90:79:10 Integrat Integrated Device Technology (Malaysia) Sdn. Bhd.
90:79:90 Benchmar Benchmark Electronics Romania SRL
90:7A:0A GebrBode Gebr. Bode GmbH & Co KG
@@ -29867,6 +29906,7 @@
94:04:9C HuaweiTe Huawei Technologies Co.,Ltd
94:05:B6 LilingFu Liling FullRiver Electronics & Technology Ltd
94:09:37 Humax HUMAX Co., Ltd.
+94:0B:19 HuaweiTe Huawei Technologies Co.,Ltd
94:0B:2D NetviewT NetView Technologies(Shenzhen) Co., Ltd
94:0B:D5 HimaxTec Himax Technologies, Inc
94:0C:6D Tp-LinkT Tp-Link Technologies Co.,Ltd.
@@ -30130,6 +30170,7 @@
98:34:9D KraussMa Krauss Maffei Technologies GmbH
98:35:71 Sub10 Sub10 Systems Ltd
98:35:B8 Assemble Assembled Products Corporation
+98:35:ED HuaweiTe Huawei Technologies Co.,Ltd
98:37:13 PtNavico PT.Navicom Indonesia
98:39:8E SamsungE Samsung Electronics Co.,Ltd
98:3B:16 AmpakTec AMPAK Technology, Inc.
@@ -30870,6 +30911,7 @@ A0:F9:E0 Vivatel Vivatel Company Limited
A0:FC:6E Telegraf Telegrafia a.s.
A0:FE:61 VivintWi Vivint Wireless Inc.
A0:FE:91 AvatAuto AVAT Automation GmbH
+A4:00:E2 HuaweiTe Huawei Technologies Co.,Ltd
A4:01:30 Abisyste ABIsystems Co., LTD
A4:02:B9 IntelCor Intel Corporate
A4:04:50 NforeTec nFore Technology Inc.
@@ -31062,6 +31104,7 @@ A4:93:4C Cisco Cisco Systems, Inc
A4:94:26 Elgama-E Elgama-Elektronika Ltd.
A4:97:5C VtechTel VTech Telecommunications Ltd.
A4:97:BB HitachiI Hitachi Industrial Equipment Systems Co.,Ltd
+A4:98:13 ArrisGro ARRIS Group, Inc.
A4:99:47 HuaweiTe Huawei Technologies Co.,Ltd
A4:99:81 FujianEl FuJian Elite Power Tech CO.,LTD.
A4:9A:58 SamsungE Samsung Electronics Co.,Ltd
@@ -31247,6 +31290,7 @@ A8:44:81 Nokia Nokia Corporation
A8:45:CD Siselect Siselectron Technology LTD.
A8:45:E9 FirichEn Firich Enterprises CO., LTD.
A8:47:4A HonHaiPr Hon Hai Precision Ind. Co.,Ltd.
+A8:49:4D HuaweiTe Huawei Technologies Co.,Ltd
A8:49:A5 Lisantec Lisantech Co., Ltd.
A8:4E:3F HitronTe Hitron Technologies. Inc
A8:51:5B SamsungE Samsung Electronics Co.,Ltd
@@ -31602,6 +31646,7 @@ AC:D3:64 AbbAbbSa Abb Spa, Abb Sace Div.
AC:D5:64 Chongqin Chongqing Fugui Electronics Co.,Ltd.
AC:D6:57 ShaanxiG Shaanxi GuoLian Digital TV Technology Co.,Ltd.
AC:D9:D6 Tci tci GmbH
+AC:DB:48 ArrisGro ARRIS Group, Inc.
AC:DB:DA Shenzhen Shenzhen Geniatech Inc, Ltd
AC:DC:E5 ProcterG Procter & Gamble Company
AC:DE:48 Private
@@ -32023,11 +32068,13 @@ B4:96:91 IntelCor Intel Corporate
B4:98:42 Zte zte corporation
B4:99:4C TexasIns Texas Instruments
B4:99:BA HewlettP Hewlett Packard
+B4:9A:95 Shenzhen Shenzhen Boomtech Industrial Corporation
B4:9C:DF Apple Apple, Inc.
B4:9D:0B Bq
B4:9D:B4 AxionTec Axion Technologies Inc.
B4:9E:AC ImagikIn Imagik Int'l Corp
B4:9E:E6 Shenzhen Shenzhen Technology Co Ltd
+B4:A3:05 XiamenYa Xiamen Yaxon Network Co., Ltd.
B4:A3:82 Hangzhou Hangzhou Hikvision Digital Technology Co.,Ltd.
B4:A4:B5 ZenEye Zen Eye Co.,Ltd
B4:A4:E3 Cisco Cisco Systems, Inc
@@ -32061,6 +32108,7 @@ B4:BF:F6 SamsungE Samsung Electronics Co.,Ltd
B4:C0:F5 Shenzhen Shenzhen TINNO Mobile Technology Corp.
B4:C1:70 YiChipMi Yi chip Microelectronics (Hangzhou) Co., Ltd
B4:C4:4E VxlEtech VXL eTech Pvt Ltd
+B4:C4:FC XiaomiCo Xiaomi Communications Co Ltd
B4:C6:2E MolexCms Molex CMS
B4:C6:F8 Axilspot Axilspot Communication
B4:C7:99 ExtremeN Extreme Networks, Inc.
@@ -32107,6 +32155,7 @@ B4:F0:AB Apple Apple, Inc.
B4:F1:DA LgElectr LG Electronics (Mobile Communications)
B4:F2:E8 ArrisGro ARRIS Group, Inc.
B4:F3:23 Petatel Petatel Inc.
+B4:F5:8E HuaweiTe Huawei Technologies Co.,Ltd
B4:F6:1C Apple Apple, Inc.
B4:F7:A1 LgElectr LG Electronics (Mobile Communications)
B4:F8:1E Kinova
@@ -32120,6 +32169,7 @@ B8:03:05 IntelCor Intel Corporate
B8:04:15 BayanAud Bayan Audio
B8:05:AB Zte zte corporation
B8:07:16 VivoMobi vivo Mobile Communication Co., Ltd.
+B8:07:56 CiscoMer Cisco Meraki
B8:08:CF IntelCor Intel Corporate
B8:08:D7 HuaweiTe Huawei Technologies Co.,Ltd
B8:09:8A Apple Apple, Inc.
@@ -32217,6 +32267,7 @@ B8:8E:C6 Stateles Stateless Networks
B8:8E:DF Zencheer Zencheer Communication Technology Co., Ltd.
B8:8F:14 Analytic Analytica GmbH
B8:8F:B4 JabilCir Jabil Circuit Italia S.R.L
+B8:91:C9 Handream Handreamnet
B8:92:1D BgT&A Bg T&A
B8:94:36 HuaweiTe Huawei Technologies Co.,Ltd
B8:94:D2 RetailIn Retail Innovation HTT AB
@@ -32503,6 +32554,22 @@ BC:91:B5 InfinixM Infinix mobility limited
BC:92:6B Apple Apple, Inc.
BC:93:25 NingboJo Ningbo Joyson Preh Car Connect Co.,Ltd.
BC:96:80 Shenzhen Shenzhen Gongjin Electronics Co.,Lt
+BC:97:40 IeeeRegi IEEE Registration Authority
+BC:97:40:00:00:00/28 AlphaEss Alpha ESS Co., Ltd.
+BC:97:40:10:00:00/28 Comtac comtac AG
+BC:97:40:20:00:00/28 LattecI/ Lattec I/S
+BC:97:40:30:00:00/28 Precisio Precision Galaxy Pvt. Ltd
+BC:97:40:40:00:00/28 WindMobi Wind Mobility Technology (Beijing) Co., Ltd
+BC:97:40:50:00:00/28 Shanghai Shanghai Laisi Information Technology Co.,Ltd
+BC:97:40:60:00:00/28 Shenzhen Shenzhen Colorwin Optical Technology Co.,Ltd
+BC:97:40:70:00:00/28 AirfiOy Airfi Oy AB
+BC:97:40:80:00:00/28 GaodiRus Gaodi Rus
+BC:97:40:90:00:00/28 DirectCo Direct Communication Solutions
+BC:97:40:A0:00:00/28 AmapInfo Amap Information Technology Co., Ltd
+BC:97:40:B0:00:00/28 Forotel
+BC:97:40:C0:00:00/28 Listec LISTEC GmbH
+BC:97:40:D0:00:00/28 RollockO Rollock Oy
+BC:97:40:E0:00:00/28 B4Comtec B4ComTechnologies LLC
BC:97:E1 Broadcom Broadcom Limited
BC:98:89 Fiberhom Fiberhome Telecommunication Technologies Co.,LTD
BC:98:DF Motorola Motorola Mobility LLC, a Lenovo Company
@@ -32849,6 +32916,7 @@ C4:3A:BE SonyMobi Sony Mobile Communications Inc
C4:3C:3C CybelecS Cybelec Sa
C4:3D:C7 Netgear
C4:40:44 Racktop RackTop Systems Inc.
+C4:41:1E BelkinIn Belkin International Inc.
C4:42:02 SamsungE Samsung Electronics Co.,Ltd
C4:43:8F LgElectr LG Electronics (Mobile Communications)
C4:44:A0 Cisco Cisco Systems, Inc
@@ -32933,8 +33001,10 @@ C4:84:66 Apple Apple, Inc.
C4:85:08 IntelCor Intel Corporate
C4:86:E9 HuaweiTe Huawei Technologies Co.,Ltd
C4:88:E5 SamsungE Samsung Electronics Co.,Ltd
+C4:8A:5A Jfcontro Jfcontrol
C4:8E:8F HonHaiPr Hon Hai Precision Ind. Co.,Ltd.
C4:8F:07 Shenzhen Shenzhen Yihao Hulian Science and Technology Co., Ltd.
+C4:8F:C1 Deeptrac Deeptrack S.L.U.
C4:91:3A Shenzhen Shenzhen Sanland Electronic Co., ltd.
C4:92:4C Keisokuk Keisokuki Center Co.,Ltd.
C4:93:00 8Devices
@@ -33040,6 +33110,7 @@ C8:08:73 RuckusWi Ruckus Wireless
C8:08:E9 LgElectr LG Electronics
C8:0A:A9 QuantaCo Quanta Computer Inc.
C8:0C:C8 HuaweiTe Huawei Technologies Co.,Ltd
+C8:0D:32 Holoplot Holoplot GmbH
C8:0E:14 AvmAudio AVM Audiovisuelles Marketing und Computersysteme GmbH
C8:0E:77 LeShiZhi Le Shi Zhi Xin Electronic Technology (Tianjin) Limited
C8:0E:95 Omnilync OmniLync Inc.
@@ -33108,6 +33179,7 @@ C8:47:8C Beken Beken Corporation
C8:48:F5 MedisonX MEDISON Xray Co., Ltd
C8:4C:75 Cisco Cisco Systems, Inc
C8:4F:86 Sophos Sophos Ltd
+C8:50:CE HuaweiTe Huawei Technologies Co.,Ltd
C8:50:E9 Raisecom Raisecom Technology CO., LTD
C8:51:95 HuaweiTe Huawei Technologies Co.,Ltd
C8:52:61 ArrisGro ARRIS Group, Inc.
@@ -33115,6 +33187,7 @@ C8:54:4B ZyxelCom Zyxel Communications Corporation
C8:56:45 Intermas Intermas France
C8:56:63 SunflexE Sunflex Europe GmbH
C8:5B:76 LcfcHefe LCFC(HeFei) Electronics Technology co., ltd
+C8:5D:38 Humax HUMAX Co., Ltd.
C8:60:00 AsustekC ASUSTek COMPUTER INC.
C8:63:14 IeeeRegi IEEE Registration Authority
C8:63:14:00:00:00/28 WesternR Western Reserve Controls, Inc.
@@ -33195,6 +33268,7 @@ C8:A2:CE OasisMed Oasis Media Systems LLC
C8:A6:20 Nebula Nebula, Inc
C8:A7:0A VerizonB Verizon Business
C8:A7:29 Systroni SYStronics Co., Ltd.
+C8:A7:76 HuaweiTe Huawei Technologies Co.,Ltd
C8:A8:23 SamsungE Samsung Electronics Co.,Ltd
C8:A9:FC GoyooNet Goyoo Networks Inc.
C8:AA:21 ArrisGro ARRIS Group, Inc.
@@ -33236,6 +33310,7 @@ C8:D3:FF HewlettP Hewlett Packard
C8:D4:29 Muehlbau Muehlbauer AG
C8:D5:90 FlightDa Flight Data Systems
C8:D5:FE Shenzhen Shenzhen Zowee Technology Co., Ltd
+C8:D6:9D ArabInte Arab International Optronics
C8:D7:19 Cisco-Li Cisco-Linksys, LLC
C8:D7:79 QingDaoH Qing Dao Haier Telecom Co.,Ltd.
C8:D7:B0 SamsungE Samsung Electronics Co.,Ltd
@@ -33402,6 +33477,7 @@ CC:5D:57 Informat Information System Research Institute,Inc.
CC:5F:BF Topwise3 Topwise 3G Communication Co., Ltd.
CC:60:BB EmpowerR Empower RF Systems
CC:61:E5 Motorola Motorola Mobility LLC, a Lenovo Company
+CC:64:A6 HuaweiTe Huawei Technologies Co.,Ltd
CC:65:AD ArrisGro ARRIS Group, Inc.
CC:66:B2 Nokia
CC:69:B0 GlobalTr Global Traffic Technologies, LLC
@@ -33434,6 +33510,7 @@ CC:89:FD Nokia Nokia Corporation
CC:8C:DA Shenzhen Shenzhen Wei Da Intelligent Technology Go.,Ltd
CC:8C:E3 TexasIns Texas Instruments
CC:8E:71 Cisco Cisco Systems, Inc
+CC:90:70 Cisco Cisco Systems, Inc
CC:90:93 HansongT Hansong Tehnologies
CC:90:E8 Shenzhen Shenzhen YOUHUA Technology Co., Ltd
CC:91:2B TeConnec TE Connectivity Touch Solutions
@@ -33751,8 +33828,14 @@ D0:C4:2F Tamagawa Tamagawa Seiki Co.,Ltd.
D0:C5:D3 Azurewav AzureWave Technology Inc.
D0:C5:D8 Latecoer Latecoere
D0:C5:F3 Apple Apple, Inc.
+D0:C6:5B HuaweiTe Huawei Technologies Co.,Ltd
D0:C7:89 Cisco Cisco Systems, Inc
D0:C7:C0 Tp-LinkT Tp-Link Technologies Co.,Ltd.
+D0:C8:57 IeeeRegi IEEE Registration Authority
+D0:C8:57:20:00:00/28 Forgamer Forgamers Inc.
+D0:C8:57:30:00:00/28 Mobicon
+D0:C8:57:C0:00:00/28 DanteSec Dante Security Inc.
+D0:C8:57:D0:00:00/28 Iflytek Iflytek Co.,Ltd.
D0:CD:E1 Scientec Scientech Electronics
D0:CF:5E EnergyMi Energy Micro AS
D0:D0:4B HuaweiTe Huawei Technologies Co.,Ltd
@@ -34435,6 +34518,7 @@ DC:A3:33 Shenzhen Shenzhen YOUHUA Technology Co., Ltd
DC:A3:AC Rbcloudt RBcloudtech
DC:A4:CA Apple Apple, Inc.
DC:A5:F4 Cisco Cisco Systems, Inc
+DC:A6:32 Raspberr Raspberry Pi Trading Ltd
DC:A6:BD BeijingL Beijing Lanbo Technology Co., Ltd.
DC:A7:D9 Compress Compressor Controls Corp
DC:A8:CF NewSpinG New Spin Golf, LLC.
@@ -34937,6 +35021,7 @@ E4:A7:FD CellcoPa Cellco Partnership
E4:A8:B6 HuaweiTe Huawei Technologies Co.,Ltd
E4:AA:5D Cisco Cisco Systems, Inc
E4:AB:46 UabSelte UAB Selteka
+E4:AB:89 Mitrasta MitraStar Technology Corp.
E4:AD:7D SclEleme SCL Elements
E4:AF:A1 Hes-So
E4:B0:05 BeijingI Beijing IQIYI Science & Technology Co., Ltd.
@@ -35720,6 +35805,7 @@ F4:15:63 F5Networ F5 Networks, Inc.
F4:15:FD Shanghai Shanghai Pateo Electronic Equipment Manufacturing Co., Ltd.
F4:17:B8 AirtiesW AirTies Wireless Networks
F4:1B:A1 Apple Apple, Inc.
+F4:1D:6B HuaweiTe Huawei Technologies Co.,Ltd
F4:1E:26 Simon-Ka Simon-Kaloi Engineering
F4:1E:5E Rtbrick RtBrick Inc.
F4:1F:0B Yamabish YAMABISHI Corporation
@@ -36094,6 +36180,7 @@ F8:A2:D6 LiteonTe Liteon Technology Corporation
F8:A3:4F Zte zte corporation
F8:A4:5F XiaomiCo Xiaomi Communications Co Ltd
F8:A5:C5 Cisco Cisco Systems, Inc
+F8:A7:63 Zhejiang Zhejiang Tmall Technology Co., Ltd.
F8:A9:63 CompalIn Compal Information (Kunshan) Co., Ltd.
F8:A9:D0 LgElectr LG Electronics (Mobile Communications)
F8:A9:DE Puissanc Puissance Plus
@@ -36351,6 +36438,8 @@ FC:B6:D8 Apple Apple, Inc.
FC:B7:F0 IdahoNat Idaho National Laboratory
FC:BB:A1 Shenzhen Shenzhen Minicreate Technology Co.,Ltd
FC:BC:9C Vimar Vimar Spa
+FC:BC:D1 HuaweiTe Huawei Technologies Co.,Ltd
+FC:BD:67 AristaNe Arista Networks
FC:BE:7B VivoMobi vivo Mobile Communication Co., Ltd.
FC:C2:33 Private
FC:C2:3D Atmel Atmel Corporation
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index ce7f2aea8a..440a37fd40 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -1209,9 +1209,9 @@
<translation>Datei:</translation>
</message>
<message>
- <source>Create a new file automatically after…</source>
- <oldsource>Create a new file automatically after...</oldsource>
- <translation>Automatisch eine neue Datei erzeugen nach...</translation>
+ <source>Create a new file automatically…</source>
+ <oldsource>Create a new file automatically after…</oldsource>
+ <translation type="unfinished">Automatisch eine neue Datei erzeugen nach...</translation>
</message>
<message>
<source>megabytes</source>
@@ -1307,17 +1307,18 @@
<translation>In eine bleibende Datei aufzeichnen</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anstatt einer einzelnen Datei werden mehrere Dateien erzeugt.&lt;/p&gt;&lt;p&gt;Der Dateiname enthält eine fortlaufende Nummer und die Startzeit des Mitschnitts.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;p&gt;NOTE: If enabled, at least one of the new-file criteria MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
+ <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anstatt einer einzelnen Datei werden mehrere Dateien erzeugt.&lt;/p&gt;&lt;p&gt;Der Dateiname enthält eine fortlaufende Nummer und die Startzeit des Mitschnitts.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If the selected file size is exceeded, capturing switches to the next file.&lt;/p&gt;&lt;p&gt;PLEASE NOTE: One option MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wenn die angegebene Dateigröße überschritten wurde wird in die nächste Datei gewechselt.&lt;/p&gt;&lt;p&gt;Achtung: Eine Option MUSS ausgewählt sein.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wenn die angegebene Dateigröße überschritten wurde wird in die nächste Datei gewechselt.&lt;/p&gt;&lt;p&gt;Achtung: Eine Option MUSS ausgewählt sein.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>If the selected file size is exceeded, capturing switches to the next file.
PLEASE NOTE: One option MUST be selected.</source>
- <translation>Wenn die angegebene Dateigröße überschritten wurde wird in die nächste Datei gewechselt.
+ <translation type="vanished">Wenn die angegebene Dateigröße überschritten wurde wird in die nächste Datei gewechselt.
Achtung: Eine Option MUSS ausgewählt sein.</translation>
</message>
<message>
@@ -1330,6 +1331,27 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<translation>Zur nächsten Datei wechseln wenn die angegebene Anzahl an Paketen aufgezeichnet wurden.</translation>
</message>
<message>
+ <source>after</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file after the file size exceeds the specified file size.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the time capturing to the current file exceeds the specified time.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>when time is a multiple of</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the (wall clock) time is an even multiple of the specified interval.
+For example, use 1 hour to have a new file created every hour on the hour.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;After capturing has switched to the next file and the given number of files has exceeded, the oldest file will be removed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Nachdem die Aufzeichnung in die nächste Datei gewechselt hat und die angegebene Anzahl an Dateien erreicht wurde, wird die älteste Datei entfernt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
@@ -12790,6 +12812,37 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<source>&lt;html&gt;&lt;head&gt;
&lt;style&gt;
a:link {
+ color: palette(text);
+ text-decoration: none;
+}
+a:hover {
+ color: palette(text);
+ text-decoration: underline;
+}
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+
+&lt;table&gt;&lt;tr&gt;
+&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/docs/wsug_html_chunked/&quot;&gt;User&apos;s Guide&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://wiki.wireshark.org/&quot;&gt;Wiki&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://ask.wireshark.org/&quot;&gt;Questions and Answers&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/lists/&quot;&gt;Mailing Lists&lt;/a&gt;&lt;/th&gt;
+
+&lt;/tr&gt;&lt;/table&gt;
+&lt;/body&gt;&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;&lt;head&gt;
+&lt;style&gt;
+a:link {
color: inherit;
text-decoration: none;
}
@@ -12817,8 +12870,8 @@ a:hover {
&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/lists/&quot;&gt;Mailing Lists&lt;/a&gt;&lt;/th&gt;
&lt;/tr&gt;&lt;/table&gt;
-&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;
+&lt;/body&gt;&lt;/html&gt;</oldsource>
+ <translation type="unfinished">&lt;html&gt;&lt;head&gt;
&lt;style&gt;
a:link {
color: inherit;
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index c3a050c0b5..a87c34bfb6 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -1207,11 +1207,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Create a new file automatically after…</source>
- <oldsource>Create a new file automatically after...</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>megabytes</source>
<oldsource>Megabytes</oldsource>
<translation type="unfinished"></translation>
@@ -1305,25 +1300,41 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <source>gigabytes</source>
+ <oldsource>Gigabytes</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If the selected file size is exceeded, capturing switches to the next file.&lt;/p&gt;&lt;p&gt;PLEASE NOTE: One option MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <source>Switch to the next file after the specified number of packets have been captured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>If the selected file size is exceeded, capturing switches to the next file.
-PLEASE NOTE: One option MUST be selected.</source>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;p&gt;NOTE: If enabled, at least one of the new-file criteria MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>gigabytes</source>
- <oldsource>Gigabytes</oldsource>
+ <source>Create a new file automatically…</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Switch to the next file after the specified number of packets have been captured.</source>
+ <source>after</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file after the file size exceeds the specified file size.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the time capturing to the current file exceeds the specified time.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>when time is a multiple of</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the (wall clock) time is an even multiple of the specified interval.
+For example, use 1 hour to have a new file created every hour on the hour.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -12624,11 +12635,11 @@ PLEASE NOTE: One option MUST be selected.</source>
<source>&lt;html&gt;&lt;head&gt;
&lt;style&gt;
a:link {
- color: inherit;
+ color: palette(text);
text-decoration: none;
}
a:hover {
- color: inherit;
+ color: palette(text);
text-decoration: underline;
}
&lt;/style&gt;
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 7609cb6fa0..2dab6dbeaa 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -1186,9 +1186,9 @@
<translation>Fichier:</translation>
</message>
<message>
- <source>Create a new file automatically after…</source>
- <oldsource>Create a new file automatically after...</oldsource>
- <translation>Créer un nouveau fichier automatiquement après...</translation>
+ <source>Create a new file automatically…</source>
+ <oldsource>Create a new file automatically after…</oldsource>
+ <translation type="unfinished">Créer un nouveau fichier automatiquement après...</translation>
</message>
<message>
<source>megabytes</source>
@@ -1284,17 +1284,18 @@
<translation>Capturer vers un fichier permanent</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Au lieu d&apos;utiliser un fichier de capture unique, plusieurs fichiers seront créés.&lt;/p&gt;&lt;p&gt;Les noms des fichiers générés contiendront un incrément et le temps de départ de la capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;p&gt;NOTE: If enabled, at least one of the new-file criteria MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
+ <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Au lieu d&apos;utiliser un fichier de capture unique, plusieurs fichiers seront créés.&lt;/p&gt;&lt;p&gt;Les noms des fichiers générés contiendront un incrément et le temps de départ de la capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If the selected file size is exceeded, capturing switches to the next file.&lt;/p&gt;&lt;p&gt;PLEASE NOTE: One option MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Si la taille de fichier sélectionnée est dépassée, la capture passe au fichier suivant.&lt;/p&gt;&lt;p&gt;NOTE: Une option DOIT être sélectionnée.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Si la taille de fichier sélectionnée est dépassée, la capture passe au fichier suivant.&lt;/p&gt;&lt;p&gt;NOTE: Une option DOIT être sélectionnée.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>If the selected file size is exceeded, capturing switches to the next file.
PLEASE NOTE: One option MUST be selected.</source>
- <translation>Si la taille de fichier sélectionnée est dépassée, la capture passe au fichier suivant.
+ <translation type="vanished">Si la taille de fichier sélectionnée est dépassée, la capture passe au fichier suivant.
NOTE: Une option DOIT être sélectionnée.</translation>
</message>
<message>
@@ -1307,6 +1308,27 @@ NOTE: Une option DOIT être sélectionnée.</translation>
<translation type="unfinished"></translation>
</message>
<message>
+ <source>after</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file after the file size exceeds the specified file size.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the time capturing to the current file exceeds the specified time.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>when time is a multiple of</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the (wall clock) time is an even multiple of the specified interval.
+For example, use 1 hour to have a new file created every hour on the hour.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;After capturing has switched to the next file and the given number of files has exceeded, the oldest file will be removed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Après basculement de la capture vers le fichier suivant, si le nombre de fichiers donné est dépassé, le fichier le plus ancien sera supprimé.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
@@ -12733,6 +12755,37 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<source>&lt;html&gt;&lt;head&gt;
&lt;style&gt;
a:link {
+ color: palette(text);
+ text-decoration: none;
+}
+a:hover {
+ color: palette(text);
+ text-decoration: underline;
+}
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+
+&lt;table&gt;&lt;tr&gt;
+&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/docs/wsug_html_chunked/&quot;&gt;User&apos;s Guide&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://wiki.wireshark.org/&quot;&gt;Wiki&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://ask.wireshark.org/&quot;&gt;Questions and Answers&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/lists/&quot;&gt;Mailing Lists&lt;/a&gt;&lt;/th&gt;
+
+&lt;/tr&gt;&lt;/table&gt;
+&lt;/body&gt;&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;&lt;head&gt;
+&lt;style&gt;
+a:link {
color: inherit;
text-decoration: none;
}
@@ -12760,7 +12813,7 @@ a:hover {
&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/lists/&quot;&gt;Mailing Lists&lt;/a&gt;&lt;/th&gt;
&lt;/tr&gt;&lt;/table&gt;
-&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/body&gt;&lt;/html&gt;</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index 4075ce94c6..e05f138f71 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -1209,9 +1209,9 @@
<translation>File:</translation>
</message>
<message>
- <source>Create a new file automatically after…</source>
- <oldsource>Create a new file automatically after...</oldsource>
- <translation>Crea un nuovo file automaticamente dopo...</translation>
+ <source>Create a new file automatically…</source>
+ <oldsource>Create a new file automatically after…</oldsource>
+ <translation type="unfinished">Crea un nuovo file automaticamente dopo...</translation>
</message>
<message>
<source>megabytes</source>
@@ -1307,17 +1307,18 @@
<translation>Cattura su un file permanente</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Invece di usare un singolo file di cattura, saranno creati file multipli.&lt;/p&gt;&lt;p&gt;I nomi di file generati conterranno un numero incrementale e l&apos;orario di inizio della cattura.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;p&gt;NOTE: If enabled, at least one of the new-file criteria MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
+ <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Invece di usare un singolo file di cattura, saranno creati file multipli.&lt;/p&gt;&lt;p&gt;I nomi di file generati conterranno un numero incrementale e l&apos;orario di inizio della cattura.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If the selected file size is exceeded, capturing switches to the next file.&lt;/p&gt;&lt;p&gt;PLEASE NOTE: One option MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Se si supera la dimensione del file selezionata, la cattura passa al file successivo.&lt;/p&gt;&lt;p&gt;NOTA: un&apos;opzione DEVE essere selezionata.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Se si supera la dimensione del file selezionata, la cattura passa al file successivo.&lt;/p&gt;&lt;p&gt;NOTA: un&apos;opzione DEVE essere selezionata.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>If the selected file size is exceeded, capturing switches to the next file.
PLEASE NOTE: One option MUST be selected.</source>
- <translation>Se si supera la dimensione del file selezionata, la cattura passa al file successivo.
+ <translation type="vanished">Se si supera la dimensione del file selezionata, la cattura passa al file successivo.
NOTA: un&apos;opzione DEVE essere selezionata.</translation>
</message>
<message>
@@ -1330,6 +1331,27 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<translation>Passa al file successivo dopo aver catturato il numero di pacchetti specificato.</translation>
</message>
<message>
+ <source>after</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file after the file size exceeds the specified file size.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the time capturing to the current file exceeds the specified time.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>when time is a multiple of</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the (wall clock) time is an even multiple of the specified interval.
+For example, use 1 hour to have a new file created every hour on the hour.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;After capturing has switched to the next file and the given number of files has exceeded, the oldest file will be removed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dopo che la cattura è passata al file successivo e il numero di file prescelto è stato superato, il file più vecchio sarà rimosso.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
@@ -8491,7 +8513,7 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
</message>
<message>
<source>(deleted)</source>
- <translation type="unfinished"></translation>
+ <translation>(eliminato)</translation>
</message>
<message>
<source>Created from default settings</source>
@@ -12785,6 +12807,37 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<source>&lt;html&gt;&lt;head&gt;
&lt;style&gt;
a:link {
+ color: palette(text);
+ text-decoration: none;
+}
+a:hover {
+ color: palette(text);
+ text-decoration: underline;
+}
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+
+&lt;table&gt;&lt;tr&gt;
+&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/docs/wsug_html_chunked/&quot;&gt;User&apos;s Guide&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://wiki.wireshark.org/&quot;&gt;Wiki&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://ask.wireshark.org/&quot;&gt;Questions and Answers&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/lists/&quot;&gt;Mailing Lists&lt;/a&gt;&lt;/th&gt;
+
+&lt;/tr&gt;&lt;/table&gt;
+&lt;/body&gt;&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;&lt;head&gt;
+&lt;style&gt;
+a:link {
color: inherit;
text-decoration: none;
}
@@ -12812,8 +12865,8 @@ a:hover {
&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/lists/&quot;&gt;Mailing Lists&lt;/a&gt;&lt;/th&gt;
&lt;/tr&gt;&lt;/table&gt;
-&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;
+&lt;/body&gt;&lt;/html&gt;</oldsource>
+ <translation type="unfinished">&lt;html&gt;&lt;head&gt;
&lt;style&gt;
a:link {
color: inherit;
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index db0838be7c..37cf083be1 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -1180,9 +1180,9 @@
<translation>ファイル:</translation>
</message>
<message>
- <source>Create a new file automatically after…</source>
- <oldsource>Create a new file automatically after...</oldsource>
- <translation>…後に自動的に新ファイルを作成</translation>
+ <source>Create a new file automatically…</source>
+ <oldsource>Create a new file automatically after…</oldsource>
+ <translation type="unfinished">…後に自動的に新ファイルを作成</translation>
</message>
<message>
<source>megabytes</source>
@@ -1278,17 +1278,18 @@
<translation>保存ファイルにキャプチャ</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;1つのキャプチャファイルを用いる代わりに複数のファイルが作成されます。&lt;/p&gt;&lt;p&gt;生成されたファイル名は連番とキャプチャ開始時間を含みます&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;p&gt;NOTE: If enabled, at least one of the new-file criteria MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
+ <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;1つのキャプチャファイルを用いる代わりに複数のファイルが作成されます。&lt;/p&gt;&lt;p&gt;生成されたファイル名は連番とキャプチャ開始時間を含みます&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If the selected file size is exceeded, capturing switches to the next file.&lt;/p&gt;&lt;p&gt;PLEASE NOTE: One option MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;もし選択したファイルサイズを超過した場合 キャプチャは次のファイルに切り替わります。&lt;/p&gt;&lt;p&gt;注意:一つのオプションが選択されなければいけません&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;もし選択したファイルサイズを超過した場合 キャプチャは次のファイルに切り替わります。&lt;/p&gt;&lt;p&gt;注意:一つのオプションが選択されなければいけません&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>If the selected file size is exceeded, capturing switches to the next file.
PLEASE NOTE: One option MUST be selected.</source>
- <translation>もし選択したファイルサイズを超過した場合 キャプチャは次のファイルに切り替わります
+ <translation type="vanished">もし選択したファイルサイズを超過した場合 キャプチャは次のファイルに切り替わります
注意:一つのオプションは必ず選択しなければいけません</translation>
</message>
<message>
@@ -1301,6 +1302,27 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <source>after</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file after the file size exceeds the specified file size.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the time capturing to the current file exceeds the specified time.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>when time is a multiple of</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the (wall clock) time is an even multiple of the specified interval.
+For example, use 1 hour to have a new file created every hour on the hour.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;After capturing has switched to the next file and the given number of files has exceeded, the oldest file will be removed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;キャプチャが次のファイルに切り替えられた後、与えられたファイル数を超過したら、最も古いファイルが消されます&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
@@ -12724,6 +12746,37 @@ PLEASE NOTE: One option MUST be selected.</source>
<source>&lt;html&gt;&lt;head&gt;
&lt;style&gt;
a:link {
+ color: palette(text);
+ text-decoration: none;
+}
+a:hover {
+ color: palette(text);
+ text-decoration: underline;
+}
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+
+&lt;table&gt;&lt;tr&gt;
+&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/docs/wsug_html_chunked/&quot;&gt;User&apos;s Guide&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://wiki.wireshark.org/&quot;&gt;Wiki&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://ask.wireshark.org/&quot;&gt;Questions and Answers&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/lists/&quot;&gt;Mailing Lists&lt;/a&gt;&lt;/th&gt;
+
+&lt;/tr&gt;&lt;/table&gt;
+&lt;/body&gt;&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;&lt;head&gt;
+&lt;style&gt;
+a:link {
color: inherit;
text-decoration: none;
}
@@ -12751,7 +12804,7 @@ a:hover {
&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/lists/&quot;&gt;Mailing Lists&lt;/a&gt;&lt;/th&gt;
&lt;/tr&gt;&lt;/table&gt;
-&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/body&gt;&lt;/html&gt;</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index 5b33793f92..1b8e522b2d 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -1214,9 +1214,9 @@
<translation>Plik:</translation>
</message>
<message>
- <source>Create a new file automatically after…</source>
- <oldsource>Create a new file automatically after...</oldsource>
- <translation>Stwórz nowy plik automatycznie po…</translation>
+ <source>Create a new file automatically…</source>
+ <oldsource>Create a new file automatically after…</oldsource>
+ <translation type="unfinished">Stwórz nowy plik automatycznie po…</translation>
</message>
<message>
<source>megabytes</source>
@@ -1312,17 +1312,18 @@
<translation>Przechwytuj do pliku</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Zamiast używać pojedyńczego pliku przechwytywania, wiele plików będzie tworzonych.&lt;/p&gt;&lt;p&gt;Użyte nazwy plików będą zawierać zwiększający się liczbę i czas rozpoczęcia przechwytywania.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;p&gt;NOTE: If enabled, at least one of the new-file criteria MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
+ <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Zamiast używać pojedyńczego pliku przechwytywania, wiele plików będzie tworzonych.&lt;/p&gt;&lt;p&gt;Użyte nazwy plików będą zawierać zwiększający się liczbę i czas rozpoczęcia przechwytywania.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If the selected file size is exceeded, capturing switches to the next file.&lt;/p&gt;&lt;p&gt;PLEASE NOTE: One option MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Jeśli wybrany rozmiar pliku zostanie przekroczony to przechwytywanie będzie kontynuowane do nowego pliku.&lt;/p&gt;&lt;p&gt;UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Jeśli wybrany rozmiar pliku zostanie przekroczony to przechwytywanie będzie kontynuowane do nowego pliku.&lt;/p&gt;&lt;p&gt;UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>If the selected file size is exceeded, capturing switches to the next file.
PLEASE NOTE: One option MUST be selected.</source>
- <translation>Jeśli wybrany rozmiar pliku zostanie przekroczony to przechwytywanie będzie kontynuuowane do nowego pliku.
+ <translation type="vanished">Jeśli wybrany rozmiar pliku zostanie przekroczony to przechwytywanie będzie kontynuuowane do nowego pliku.
UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
</message>
<message>
@@ -1335,6 +1336,27 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
<translation type="unfinished"></translation>
</message>
<message>
+ <source>after</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file after the file size exceeds the specified file size.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the time capturing to the current file exceeds the specified time.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>when time is a multiple of</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the (wall clock) time is an even multiple of the specified interval.
+For example, use 1 hour to have a new file created every hour on the hour.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;After capturing has switched to the next file and the given number of files has exceeded, the oldest file will be removed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kiedy przechwytywanie jest przekierowywane do nowego pliku i liczba plików zostanie przekroczona to skasuj najstarszy plik zostanie skasowany.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
@@ -12798,6 +12820,37 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
<source>&lt;html&gt;&lt;head&gt;
&lt;style&gt;
a:link {
+ color: palette(text);
+ text-decoration: none;
+}
+a:hover {
+ color: palette(text);
+ text-decoration: underline;
+}
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+
+&lt;table&gt;&lt;tr&gt;
+&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/docs/wsug_html_chunked/&quot;&gt;User&apos;s Guide&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://wiki.wireshark.org/&quot;&gt;Wiki&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://ask.wireshark.org/&quot;&gt;Questions and Answers&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/lists/&quot;&gt;Mailing Lists&lt;/a&gt;&lt;/th&gt;
+
+&lt;/tr&gt;&lt;/table&gt;
+&lt;/body&gt;&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;&lt;head&gt;
+&lt;style&gt;
+a:link {
color: inherit;
text-decoration: none;
}
@@ -12825,8 +12878,8 @@ a:hover {
&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/lists/&quot;&gt;Mailing Lists&lt;/a&gt;&lt;/th&gt;
&lt;/tr&gt;&lt;/table&gt;
-&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;
+&lt;/body&gt;&lt;/html&gt;</oldsource>
+ <translation type="unfinished">&lt;html&gt;&lt;head&gt;
&lt;style&gt;
a:link {
color: inherit;
diff --git a/ui/qt/wireshark_ru.ts b/ui/qt/wireshark_ru.ts
index 67b47ebcb3..932f287765 100644
--- a/ui/qt/wireshark_ru.ts
+++ b/ui/qt/wireshark_ru.ts
@@ -1216,9 +1216,9 @@
<translation>Файл:</translation>
</message>
<message>
- <source>Create a new file automatically after…</source>
- <oldsource>Create a new file automatically after...</oldsource>
- <translation>Автоматически создать новый файл после...</translation>
+ <source>Create a new file automatically…</source>
+ <oldsource>Create a new file automatically after…</oldsource>
+ <translation type="unfinished">Автоматически создать новый файл после...</translation>
</message>
<message>
<source>megabytes</source>
@@ -1314,17 +1314,18 @@
<translation>Захватывать в постоянный файл</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Вместо использования одиночного файла захвата будет создано множество файлов.&lt;/p&gt;&lt;p&gt;Сгенерированные имена файлов будут содержать увеличивающееся на 1 значение и время начала захвата.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;p&gt;NOTE: If enabled, at least one of the new-file criteria MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
+ <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Вместо использования одиночного файла захвата будет создано множество файлов.&lt;/p&gt;&lt;p&gt;Сгенерированные имена файлов будут содержать увеличивающееся на 1 значение и время начала захвата.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If the selected file size is exceeded, capturing switches to the next file.&lt;/p&gt;&lt;p&gt;PLEASE NOTE: One option MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если выбранный размер файла будет превышен, запись захваченных данных продолжится в следующий файл.&lt;/p&gt;&lt;p&gt;ОБРАТИТЕ ВНИМАНИЕ: Одна опция ДОЛЖНА быть выбрана.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если выбранный размер файла будет превышен, запись захваченных данных продолжится в следующий файл.&lt;/p&gt;&lt;p&gt;ОБРАТИТЕ ВНИМАНИЕ: Одна опция ДОЛЖНА быть выбрана.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>If the selected file size is exceeded, capturing switches to the next file.
PLEASE NOTE: One option MUST be selected.</source>
- <translation>Если выбранный размер файла будет превышен, запись захваченных данных продолжится в следующий файл.
+ <translation type="vanished">Если выбранный размер файла будет превышен, запись захваченных данных продолжится в следующий файл.
ОБРАТИТЕ ВНИМАНИЕ: Одна опция ДОЛЖНА быть выбрана.</translation>
</message>
<message>
@@ -1337,6 +1338,27 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>Переключить на следующий файл после достижения указанного числа захваченных пакетов.</translation>
</message>
<message>
+ <source>after</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file after the file size exceeds the specified file size.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the time capturing to the current file exceeds the specified time.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>when time is a multiple of</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the (wall clock) time is an even multiple of the specified interval.
+For example, use 1 hour to have a new file created every hour on the hour.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;After capturing has switched to the next file and the given number of files has exceeded, the oldest file will be removed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;После переключения записи захваченных данных на следующий файл и указанное число файлов будет превышено, самый старый файл будет удалён.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
@@ -12813,6 +12835,37 @@ PLEASE NOTE: One option MUST be selected.</source>
<source>&lt;html&gt;&lt;head&gt;
&lt;style&gt;
a:link {
+ color: palette(text);
+ text-decoration: none;
+}
+a:hover {
+ color: palette(text);
+ text-decoration: underline;
+}
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+
+&lt;table&gt;&lt;tr&gt;
+&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/docs/wsug_html_chunked/&quot;&gt;User&apos;s Guide&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://wiki.wireshark.org/&quot;&gt;Wiki&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://ask.wireshark.org/&quot;&gt;Questions and Answers&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/lists/&quot;&gt;Mailing Lists&lt;/a&gt;&lt;/th&gt;
+
+&lt;/tr&gt;&lt;/table&gt;
+&lt;/body&gt;&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;&lt;head&gt;
+&lt;style&gt;
+a:link {
color: inherit;
text-decoration: none;
}
@@ -12840,8 +12893,8 @@ a:hover {
&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/lists/&quot;&gt;Mailing Lists&lt;/a&gt;&lt;/th&gt;
&lt;/tr&gt;&lt;/table&gt;
-&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;
+&lt;/body&gt;&lt;/html&gt;</oldsource>
+ <translation type="unfinished">&lt;html&gt;&lt;head&gt;
&lt;style&gt;
a:link {
color: inherit;
diff --git a/ui/qt/wireshark_sv.ts b/ui/qt/wireshark_sv.ts
index e5b353b035..eba964c38f 100644
--- a/ui/qt/wireshark_sv.ts
+++ b/ui/qt/wireshark_sv.ts
@@ -1209,9 +1209,9 @@
<translation>Fil:</translation>
</message>
<message>
- <source>Create a new file automatically after…</source>
- <oldsource>Create a new file automatically after...</oldsource>
- <translation>Skapa en ny fil automatiskt efter …</translation>
+ <source>Create a new file automatically…</source>
+ <oldsource>Create a new file automatically after…</oldsource>
+ <translation type="unfinished">Skapa en ny fil automatiskt efter …</translation>
</message>
<message>
<source>megabytes</source>
@@ -1307,17 +1307,18 @@
<translation>Fånga till en permanent fil</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Istället för att använda en enda fångstfil kommer flera filer skapas.&lt;/p&gt;&lt;p&gt;De genererade filnamnen kommer innehålla ett ökande nummer och starttidpunkten för fångsten.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;p&gt;NOTE: If enabled, at least one of the new-file criteria MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
+ <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Istället för att använda en enda fångstfil kommer flera filer skapas.&lt;/p&gt;&lt;p&gt;De genererade filnamnen kommer innehålla ett ökande nummer och starttidpunkten för fångsten.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If the selected file size is exceeded, capturing switches to the next file.&lt;/p&gt;&lt;p&gt;PLEASE NOTE: One option MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om den valda filstorleken överskrids byts fångsten till nästa fil.&lt;/p&gt;&lt;p&gt;OBSERVERA: Någon flagga MÅSTE väljas.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om den valda filstorleken överskrids byts fångsten till nästa fil.&lt;/p&gt;&lt;p&gt;OBSERVERA: Någon flagga MÅSTE väljas.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>If the selected file size is exceeded, capturing switches to the next file.
PLEASE NOTE: One option MUST be selected.</source>
- <translation>Om den valda filstorleken överskrids byts fångsten till nästa fil.
+ <translation type="vanished">Om den valda filstorleken överskrids byts fångsten till nästa fil.
OBSERVERA: Någon flagga MÅSTE väljas.</translation>
</message>
<message>
@@ -1330,6 +1331,27 @@ OBSERVERA: Någon flagga MÅSTE väljas.</translation>
<translation>Byt till nästa fil efter det angivna antalet paket har infångats.</translation>
</message>
<message>
+ <source>after</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file after the file size exceeds the specified file size.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the time capturing to the current file exceeds the specified time.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>when time is a multiple of</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the (wall clock) time is an even multiple of the specified interval.
+For example, use 1 hour to have a new file created every hour on the hour.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;After capturing has switched to the next file and the given number of files has exceeded, the oldest file will be removed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Efter att infångandet har bytt till nästa fil och det angivna antalet filer har överskridits tas den äldsta filen bort.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
@@ -12790,6 +12812,37 @@ OBSERVERA: Någon flagga MÅSTE väljas.</translation>
<source>&lt;html&gt;&lt;head&gt;
&lt;style&gt;
a:link {
+ color: palette(text);
+ text-decoration: none;
+}
+a:hover {
+ color: palette(text);
+ text-decoration: underline;
+}
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+
+&lt;table&gt;&lt;tr&gt;
+&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/docs/wsug_html_chunked/&quot;&gt;User&apos;s Guide&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://wiki.wireshark.org/&quot;&gt;Wiki&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://ask.wireshark.org/&quot;&gt;Questions and Answers&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/lists/&quot;&gt;Mailing Lists&lt;/a&gt;&lt;/th&gt;
+
+&lt;/tr&gt;&lt;/table&gt;
+&lt;/body&gt;&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;&lt;head&gt;
+&lt;style&gt;
+a:link {
color: inherit;
text-decoration: none;
}
@@ -12817,8 +12870,8 @@ a:hover {
&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/lists/&quot;&gt;Mailing Lists&lt;/a&gt;&lt;/th&gt;
&lt;/tr&gt;&lt;/table&gt;
-&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;
+&lt;/body&gt;&lt;/html&gt;</oldsource>
+ <translation type="unfinished">&lt;html&gt;&lt;head&gt;
&lt;style&gt;
a:link {
color: inherit;
diff --git a/ui/qt/wireshark_uk.ts b/ui/qt/wireshark_uk.ts
index 5d68ad4c85..64c00f3f82 100644
--- a/ui/qt/wireshark_uk.ts
+++ b/ui/qt/wireshark_uk.ts
@@ -1190,9 +1190,9 @@
<translation>Файл:</translation>
</message>
<message>
- <source>Create a new file automatically after…</source>
- <oldsource>Create a new file automatically after...</oldsource>
- <translation>Автоматично створити новий файл після...</translation>
+ <source>Create a new file automatically…</source>
+ <oldsource>Create a new file automatically after…</oldsource>
+ <translation type="unfinished">Автоматично створити новий файл після...</translation>
</message>
<message>
<source>megabytes</source>
@@ -1288,17 +1288,18 @@
<translation>Захоплювати до постійного файлу</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Замість того, щоб використовувати єдиний файл для захоплення, буде створено набір файлів.&lt;/p&gt;&lt;p&gt;Згенеровані імена файлів міститимуть зростаюче число та час початку захоплення.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;p&gt;NOTE: If enabled, at least one of the new-file criteria MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
+ <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Замість того, щоб використовувати єдиний файл для захоплення, буде створено набір файлів.&lt;/p&gt;&lt;p&gt;Згенеровані імена файлів міститимуть зростаюче число та час початку захоплення.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If the selected file size is exceeded, capturing switches to the next file.&lt;/p&gt;&lt;p&gt;PLEASE NOTE: One option MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Після перевищення вибраного розміру файлу, захоплення перемикається на наступний файл.&lt;/p&gt;&lt;p&gt;БУДЬ ЛАСКА ЗАУВАЖТЕ: ви ПОВИННІ вибрати одну з опцій.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Після перевищення вибраного розміру файлу, захоплення перемикається на наступний файл.&lt;/p&gt;&lt;p&gt;БУДЬ ЛАСКА ЗАУВАЖТЕ: ви ПОВИННІ вибрати одну з опцій.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>If the selected file size is exceeded, capturing switches to the next file.
PLEASE NOTE: One option MUST be selected.</source>
- <translation>Після перевищення вибраного розміру файлу, захоплення перемикається на наступний файл.
+ <translation type="vanished">Після перевищення вибраного розміру файлу, захоплення перемикається на наступний файл.
БУДЬ ЛАСКА ЗАУВАЖТЕ: ви ПОВИННІ вибрати одну з опцій.</translation>
</message>
<message>
@@ -1311,6 +1312,27 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <source>after</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file after the file size exceeds the specified file size.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the time capturing to the current file exceeds the specified time.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>when time is a multiple of</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the (wall clock) time is an even multiple of the specified interval.
+For example, use 1 hour to have a new file created every hour on the hour.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;After capturing has switched to the next file and the given number of files has exceeded, the oldest file will be removed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Після того, як захоплення перемкнулося на наступний файл, та при перевищенні даної кількості файлів найстаріший файл буде видалено.&lt;/p&gt;&lt;/body&gt;&lt;/html.</translation>
</message>
@@ -12623,6 +12645,37 @@ PLEASE NOTE: One option MUST be selected.</source>
<source>&lt;html&gt;&lt;head&gt;
&lt;style&gt;
a:link {
+ color: palette(text);
+ text-decoration: none;
+}
+a:hover {
+ color: palette(text);
+ text-decoration: underline;
+}
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+
+&lt;table&gt;&lt;tr&gt;
+&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/docs/wsug_html_chunked/&quot;&gt;User&apos;s Guide&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://wiki.wireshark.org/&quot;&gt;Wiki&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://ask.wireshark.org/&quot;&gt;Questions and Answers&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/lists/&quot;&gt;Mailing Lists&lt;/a&gt;&lt;/th&gt;
+
+&lt;/tr&gt;&lt;/table&gt;
+&lt;/body&gt;&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;&lt;head&gt;
+&lt;style&gt;
+a:link {
color: inherit;
text-decoration: none;
}
@@ -12650,7 +12703,7 @@ a:hover {
&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/lists/&quot;&gt;Mailing Lists&lt;/a&gt;&lt;/th&gt;
&lt;/tr&gt;&lt;/table&gt;
-&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/body&gt;&lt;/html&gt;</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index d71d5bb012..045dbb91ef 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -1200,9 +1200,9 @@
<translation>文件:</translation>
</message>
<message>
- <source>Create a new file automatically after…</source>
- <oldsource>Create a new file automatically after...</oldsource>
- <translation>自动创建新文件,经过…</translation>
+ <source>Create a new file automatically…</source>
+ <oldsource>Create a new file automatically after…</oldsource>
+ <translation type="unfinished">自动创建新文件,经过…</translation>
</message>
<message>
<source>megabytes</source>
@@ -1298,18 +1298,19 @@
<translation>捕获到永久文件</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;相对于使用单个捕获文件,多个文件将会被创建。&lt;/p&gt;&lt;p&gt;生成的文件名会包含增加的序号和捕获开始时间。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;p&gt;NOTE: If enabled, at least one of the new-file criteria MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
+ <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;相对于使用单个捕获文件,多个文件将会被创建。&lt;/p&gt;&lt;p&gt;生成的文件名会包含增加的序号和捕获开始时间。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If the selected file size is exceeded, capturing switches to the next file.&lt;/p&gt;&lt;p&gt;PLEASE NOTE: One option MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;如果超过了指定的文件尺寸,切换到下一个文件进行捕获。&lt;/p&gt;&lt;p&gt;请注意:至少有一个功能必须选择。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;如果超过了指定的文件尺寸,切换到下一个文件进行捕获。&lt;/p&gt;&lt;p&gt;请注意:至少有一个功能必须选择。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;
</translation>
</message>
<message>
<source>If the selected file size is exceeded, capturing switches to the next file.
PLEASE NOTE: One option MUST be selected.</source>
- <translation>如果超过了指定的文件尺寸,切换到下一个文件进行捕获。
+ <translation type="vanished">如果超过了指定的文件尺寸,切换到下一个文件进行捕获。
请注意:至少有一个功能必须选择。</translation>
</message>
<message>
@@ -1322,6 +1323,27 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>捕获指定数量的分组后切换到下一个文件。</translation>
</message>
<message>
+ <source>after</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file after the file size exceeds the specified file size.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the time capturing to the current file exceeds the specified time.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>when time is a multiple of</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Switch to the next file when the (wall clock) time is an even multiple of the specified interval.
+For example, use 1 hour to have a new file created every hour on the hour.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;After capturing has switched to the next file and the given number of files has exceeded, the oldest file will be removed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;当捕获切换到下一个文件并且给定的文件数已经达到,最早的文件将会被删除。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
@@ -12759,6 +12781,37 @@ PLEASE NOTE: One option MUST be selected.</source>
<source>&lt;html&gt;&lt;head&gt;
&lt;style&gt;
a:link {
+ color: palette(text);
+ text-decoration: none;
+}
+a:hover {
+ color: palette(text);
+ text-decoration: underline;
+}
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+
+&lt;table&gt;&lt;tr&gt;
+&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/docs/wsug_html_chunked/&quot;&gt;User&apos;s Guide&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://wiki.wireshark.org/&quot;&gt;Wiki&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://ask.wireshark.org/&quot;&gt;Questions and Answers&lt;/a&gt;&lt;/th&gt;
+
+&lt;td style=&quot;padding-left: 8px; padding-right: 8px;&quot;&gt;·&lt;/td&gt;
+
+&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/lists/&quot;&gt;Mailing Lists&lt;/a&gt;&lt;/th&gt;
+
+&lt;/tr&gt;&lt;/table&gt;
+&lt;/body&gt;&lt;/html&gt;</source>
+ <oldsource>&lt;html&gt;&lt;head&gt;
+&lt;style&gt;
+a:link {
color: inherit;
text-decoration: none;
}
@@ -12786,8 +12839,8 @@ a:hover {
&lt;th&gt;&lt;a href=&quot;https://www.wireshark.org/lists/&quot;&gt;Mailing Lists&lt;/a&gt;&lt;/th&gt;
&lt;/tr&gt;&lt;/table&gt;
-&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head&gt;
+&lt;/body&gt;&lt;/html&gt;</oldsource>
+ <translation type="unfinished">&lt;html&gt;&lt;head&gt;
&lt;style&gt;
a:link {
color: inherit;