aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS5
-rw-r--r--NEWS5
-rw-r--r--enterprises.tsv39
-rw-r--r--epan/dissectors/usb.c26
-rw-r--r--manuf56
-rw-r--r--ui/qt/wireshark_de.ts53
-rw-r--r--ui/qt/wireshark_en.ts37
-rw-r--r--ui/qt/wireshark_fr.ts56
-rw-r--r--ui/qt/wireshark_it.ts53
-rw-r--r--ui/qt/wireshark_ja_JP.ts53
-rw-r--r--ui/qt/wireshark_pl.ts53
-rw-r--r--ui/qt/wireshark_ru.ts53
-rw-r--r--ui/qt/wireshark_sv.ts53
-rw-r--r--ui/qt/wireshark_uk.ts56
-rw-r--r--ui/qt/wireshark_zh_CN.ts53
15 files changed, 572 insertions, 79 deletions
diff --git a/AUTHORS b/AUTHORS
index 2b8cb56c68..c33354374e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4069,6 +4069,7 @@ Bertrand Bonnefoy-Claudet <bertrandbc[AT]gmail.com>
Binh Trinh <beango[AT]gmail.com>
Birol Capa <birol.capa[AT]siemens.com>
Björn Ruytenberg <bjorn[AT]bjornweb.nl>
+Bob Hinden <bob.hinden[AT]gmail.com>
Boris Bochkarev <Boris-Bochkaryov[AT]yandex.ru>
Bradford Boyle <bradford.d.boyle[AT]gmail.com>
Brandon Enochs <enochs.brandon[AT]gmail.com>
@@ -4173,6 +4174,7 @@ Dominic Chen <d.c.ddcc[AT]gmail.com>
Doug Brown <doug[AT]downtowndougbrown.com>
Dr. Lars Voelker <lars-github[AT]larsvoelker.de>
Dr. Lars Völker <lars.voelker[AT]bmw.de>
+Dwayne Rich <dwayne_rich[AT]selinc.com>
Dylan Ulis <daulis0[AT]gmail.com>
Dániel Bakai <bakaidl[AT]gmail.com>
Ebben Aries <exa[AT]fb.com>
@@ -4451,6 +4453,7 @@ Michail Koreshkov <drkor[AT]hotbox.ru>
Michal Kubecek <mkubecek[AT]suse.cz>
Michal Pazdera <michal.pazdera[AT]gmail.com>
Michal Prívozník <mprivozn[AT]redhat.com>
+Michal Ruprich <michalruprich[AT]gmail.com>
Michal Slavka <slavka.michal[AT]gmail.com>
Michalis Kapsalakis <kapsalis1989[AT]gmail.com>
Michał Skalski <mskalski13[AT]gmail.com>
@@ -4470,6 +4473,7 @@ Moraney Jalil <moraney.jalil[AT]outlook.com>
Morten Tryfoss <morten[AT]tryfoss.no>
Moshe Kaplan <me[AT]moshekaplan.com>
Nathan Cole <nath[AT]thecoleresidence.co.uk>
+Nathaniel Clark <Nathaniel.Clark[AT]misrule.us>
Nathaniel Clark <nathaniel.l.clark[AT]intel.com>
Neels Hofmeyr <neels[AT]hofmeyr.de>
Neil Ostroff <neil[AT]mangosoup.com>
@@ -4553,6 +4557,7 @@ Prerit Jain <prerit.jain[AT]samsung.com>
Priyanka Mondal <priyanka02010[AT]gmail.com>
Radhashyam Behera <radhashyambehera[AT]gmail.com>
Rado Radoulov <rad0x6f[AT]gmail.com>
+Rainer Keller <Rainer.Keller[AT]qt.io>
Ralf Nasilowski <Ralf.Nasilowski[AT]ise.de>
Ralph Boehme <slow[AT]samba.org>
Ray Gomez <rayvincent.gomez[AT]gmail.com>
diff --git a/NEWS b/NEWS
index 1a73219996..5eb3338039 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,9 @@ Wireshark 3.1.1 Release Notes
• You can once again mark and unmark packets using the middle mouse
button. This feature went missing around 2009 or so.
+ • The Windows packages are now built using Microsoft Visual Studio
+ 2019.
+
The following features are new (or have been significantly updated)
since version 3.0.0:
@@ -134,7 +137,7 @@ Wireshark 3.1.1 Release Notes
A complete FAQ is available on the Wireshark web site[10].
- Last updated 2019-10-20 08:06:48 UTC
+ Last updated 2019-10-27 08:08:19 UTC
References
diff --git a/enterprises.tsv b/enterprises.tsv
index 8490a9aeda..371c749bd5 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-10-20)
+# (last updated 2019-10-26)
0 Reserved
1 NxNetworks
@@ -2883,7 +2883,7 @@
2879 Sonus Networks, Inc.
2880 IPHighway Ltd.
2881 Clarion
-2882 Comtrol Corporation
+2882 Pepperl+Fuchs Comtrol
2883 Coherent Communications Systems Inc
2884 ADS Networks
2885 Chicago-Soft Ltd.
@@ -52485,7 +52485,7 @@
52674 Schneider Electric / APC NetBotz
52675 Peddie Institute Co., Ltd.
52676 Hawaiki Cable Ltd.
-52677 iFuture Service Co.,Ltd.
+52677 iFuture Service Co., Ltd.
52678 Jit Team Sp. z o.o.
52679 Advanced Technology Facility
52680 Australian Paper
@@ -54572,3 +54572,36 @@
54763 Nous Technologies
54764 Arilia
54765 Power supply production (PSP)
+54766 WondaLink Inc.
+54767 Software Service, Inc.
+54768 360 Vision Technology Ltd
+54769 Think Technology
+54770 pargareh system parseh
+54771 ys4fun
+54772 Nuratech Networks LLC
+54773 Papierfabrik Niederauer Mühle GmbH
+54774 Renuka's Castle
+54775 Center for Medical Interoperability
+54776 Dealex
+54777 HP-Hrvatska pošta d.d.
+54778 Hyerpu Tech Co. Ltd
+54779 Schmithuysen TestLab-AG
+54780 Virtual Power Systems
+54781 Griwes Homelab
+54782 BackBox Software LTD
+54783 Delta Networks(Xiamen) Inc.
+54784 ELEKON, s.r.o.
+54785 Schweizerische Mobiliar Versicherungsgesellschaft AG
+54786 X Connections Ltd.
+54787 24CARE
+54788 Collé Sittard Machinehandel B.V.
+54789 MaineHealth
+54790 Taler Systems SA
+54791 dbck
+54792 Osprey Video, Inc
+54793 Innovation Care Partners
+54794 Stamhuis Bouwbedrijf B.V.
+54795 HiveMQ / dc-square GmbH
+54796 Department of Public Instruction - State of Wisconsin
+54797 New England Hernia Center LLC
+54798 Dalian Neusoft University of Information
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index b14aa2bef6..d6632111ee 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -2063,7 +2063,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x10bd, "TMT Technology, Inc." },
{ 0x10bf, "SmartHome" },
{ 0x10c3, "Universal Laser Systems, Inc." },
- { 0x10c4, "Cygnal Integrated Products, Inc." },
+ { 0x10c4, "Silicon Labs" },
{ 0x10c5, "Sanei Electric, Inc." },
{ 0x10c6, "Intec, Inc." },
{ 0x10cb, "Eratech" },
@@ -16707,12 +16707,29 @@ static const value_string usb_products_vals[] = {
{ 0x10c48973, "C8051F38x HDMI Extender [UHBX-8X]" },
{ 0x10c489c6, "SPORTident HID device" },
{ 0x10c489e1, "C8051F38x HDMI Extender [UHBX-SW3-WP]" },
- { 0x10c4ea60, "CP2102/CP2109 UART Bridge Controller [CP210x family]" },
+ { 0x10c489fb, "Qivicon ZigBee Stick" },
+ { 0x10c48a3c, "C8051F38x HDBaseT Receiver [UHBX-R-XT]" },
+ { 0x10c48a6c, "C8051F38x 4K HDMI Audio Extractor [EMX-AMP]" },
+ { 0x10c48acb, "C8051F38x HDBaseT Wall Plate Receiver with IR, RS-232, and PoH [UHBX-R-WP]" },
+ { 0x10c48af8, "C8051F38x 4K HDMI Audio Extractor w/Audio Amplifier, HDBT Input, Line Audio Input RS-232 Ports and IP Control [VSA-X21]" },
+ { 0x10c48b8c, "C8051F38x 4K HDMI Audio Extractor w/Audio Amplifier, HDBT Input, Line Audio Input RS-232 Ports and IP Control [SC-3H]" },
+ { 0x10c48db5, "C8051F38x CATx HDMI Receiver with USB [EX-HDU-R]" },
+ { 0x10c48db6, "C8051F38x CATx HDMI Receiver" },
+ { 0x10c4ea60, "CP210x UART Bridge" },
{ 0x10c4ea61, "CP210x UART Bridge" },
- { 0x10c4ea70, "CP210x UART Bridge" },
- { 0x10c4ea80, "CP210x UART Bridge" },
+ { 0x10c4ea63, "CP210x UART Bridge" },
+ { 0x10c4ea70, "CP2105 Dual UART Bridge" },
+ { 0x10c4ea71, "CP2108 Quad UART Bridge" },
+ { 0x10c4ea80, "CP2110 HID UART Bridge" },
+ { 0x10c4ea90, "CP2112 HID I2C Bridge" },
+ { 0x10c4ea91, "CP2112 HID SMBus/I2C Bridge for CP2614 Evaluation Kit" },
+ { 0x10c4ea93, "CP2112 HID SMBus/I2C Bridge for CP2615 Evaluation Kit" },
+ { 0x10c4eab0, "CP2114 I2S Audio Bridge" },
+ { 0x10c4eac0, "CP2614 MFi Accessory Digital Audio Bridge" },
+ { 0x10c4eac1, "CP2615 I2S Audio Bridge" },
{ 0x10c4eac9, "EFM8UB1 Bootloader" },
{ 0x10c4eaca, "EFM8UB2 Bootloader" },
+ { 0x10c4eacb, "EFM8UB3 Bootloader" },
{ 0x10c5819a, "FM Radio" },
{ 0x10cc1101, "MP3 Player" },
{ 0x10ce0007, "Shinko/Sinfonia CHC-S1245" },
@@ -19490,6 +19507,7 @@ static const value_string usb_products_vals[] = {
{ 0x1e7d2cf6, "Pyra Mouse (wireless)" },
{ 0x1e7d2d50, "Kova+ Mouse" },
{ 0x1e7d2d51, "Kone+ Mouse" },
+ { 0x1e7d2e22, "Kone XTD Mouse" },
{ 0x1e7d30d4, "Arvo Keyboard" },
{ 0x1ea70066, "[Mediatrack Edge Mini Keyboard]" },
{ 0x1ea72007, "SHARK ZONE K30 Illuminated Gaming Keyboard" },
diff --git a/manuf b/manuf
index 40ff6870d0..1a9d358348 100644
--- a/manuf
+++ b/manuf
@@ -44,24 +44,24 @@
# https://code.wireshark.org/review/gitweb?p=wireshark.git;a=blob_plain;f=manuf;hb=HEAD
# http://standards-oui.ieee.org/cid/cid.csv:
-# Content-Length: 7947
-# Last-Modified: Sun, 20 Oct 2019 08:00:27 GMT
+# Content-Length: 7994
+# Last-Modified: Sun, 27 Oct 2019 08:00:37 GMT
# http://standards-oui.ieee.org/iab/iab.csv:
# Content-Length: 381262
-# Last-Modified: Sun, 20 Oct 2019 08:00:39 GMT
+# Last-Modified: Sun, 27 Oct 2019 08:00:49 GMT
# http://standards-oui.ieee.org/oui/oui.csv:
-# Content-Length: 2430901
-# Last-Modified: Sun, 20 Oct 2019 08:01:08 GMT
+# Content-Length: 2432486
+# Last-Modified: Sun, 27 Oct 2019 08:01:20 GMT
# http://standards-oui.ieee.org/oui28/mam.csv:
-# Content-Length: 301281
-# Last-Modified: Sun, 20 Oct 2019 08:00:45 GMT
+# Content-Length: 302521
+# Last-Modified: Sun, 27 Oct 2019 08:00:56 GMT
# http://standards-oui.ieee.org/oui36/oui36.csv:
-# Content-Length: 311690
-# Last-Modified: Sun, 20 Oct 2019 08:01:01 GMT
+# Content-Length: 312590
+# Last-Modified: Sun, 27 Oct 2019 08:01:13 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
@@ -17313,6 +17313,7 @@
04:1B:94 HostMobi Host Mobility AB
04:1B:BA SamsungE Samsung Electronics Co.,Ltd
04:1D:10 DreamWar Dream Ware Inc.
+04:1D:C7 Zte zte corporation
04:1E:64 Apple Apple, Inc.
04:1E:7A Dspworks
04:1E:FA BissellH BISSELL Homecare, Inc.
@@ -17718,6 +17719,7 @@
08:08:C2 SamsungE Samsung Electronics Co.,Ltd
08:08:EA Amsc
08:09:B6 Masimo Masimo Corp
+08:09:C7 ZhuhaiUn Zhuhai Unitech Power Technology Co., Ltd.
08:0A:4E PlanetBi Planet Bingo® — 3rd Rock Gaming®
08:0C:0B SysmikDr SysMik GmbH Dresden
08:0C:C9 MissionT Mission Technology Group, dba Magma
@@ -18911,6 +18913,7 @@
18:BD:AD L-Tech L-Tech Corporation
18:BE:92 DeltaNet Delta Networks, Inc.
18:BF:1C JiangsuH Jiangsu Huitong Group Co.,Ltd.
+18:C0:4D Giga-Byt Giga-Byte Technology Co.,Ltd.
18:C0:86 Broadcom
18:C1:9D Integrat Integrated Device Technology (Malaysia) Sdn. Bhd.
18:C2:BF Buffalo Buffalo.Inc
@@ -21646,6 +21649,17 @@
40:28:14 RfiEngin RFI Engineering
40:2B:50 ArrisGro ARRIS Group, Inc.
40:2B:A1 SonyMobi Sony Mobile Communications Inc
+40:2C:76 IeeeRegi IEEE Registration Authority
+40:2C:76:00:00:00/28 Lista Lista AG
+40:2C:76:40:00:00/28 BeijingS Beijing Smarot Technology Co., Ltd.
+40:2C:76:50:00:00/28 BaumerBo Baumer Bourdon-Haenni
+40:2C:76:70:00:00/28 Zhejiang Zhejiang Guoli Security Technology Co., Ltd.
+40:2C:76:80:00:00/28 SutengIn Suteng Innovation Technology Co., Ltd.
+40:2C:76:90:00:00/28 Annapurn Annapurna labs
+40:2C:76:A0:00:00/28 Nowtechn NowTechnologies Zrt
+40:2C:76:B0:00:00/28 BeijingK Beijing Kuaiyu Electronic Co., Ltd.
+40:2C:76:C0:00:00/28 Gridx gridX GmbH
+40:2C:76:D0:00:00/28 Guangzho Guangzhou Qi'an Technology Co., Ltd.
40:2C:F4 Universa Universal Global Scientific Industrial Co., Ltd.
40:2E:28 Mixtelem MiXTelematics
40:30:04 Apple Apple, Inc.
@@ -21761,6 +21775,7 @@
40:9F:87 JideTech Jide Technology (Hong Kong) Limited
40:9F:C7 Baekchun BAEKCHUN I&C Co., Ltd.
40:A1:08 Motorola Motorola (Wuhan) Mobility Technologies Communication Co., Ltd.
+40:A2:DB AmazonTe Amazon Technologies Inc.
40:A3:6B:00:00:00/28 FinRobot Fin Robotics Inc
40:A3:6B:10:00:00/28 Tw-Teamw TW-TeamWare
40:A3:6B:20:00:00/28 Toproott TOPROOTTechnology Corp. Ltd.
@@ -22794,6 +22809,7 @@
48:A9:D2 WistronN Wistron Neweb Corporation
48:AA:5D StoreEle Store Electronic Systems
48:AD:08 HuaweiTe Huawei Technologies Co.,Ltd
+48:B0:2D Nvidia NVIDIA Corporation
48:B2:53 Marketax Marketaxess Corporation
48:B5:A7 GloryHor Glory Horse Industries Ltd.
48:B6:20 Roli ROLI Ltd.
@@ -22935,6 +22951,7 @@
4C:3F:D3 TexasIns Texas Instruments
4C:42:4C Informat Information Modes software modified addresses (not registered?)
4C:48:DA BeijingA Beijing Autelan Technology Co.,Ltd
+4C:49:4F Zte zte corporation
4C:49:E3 XiaomiCo Xiaomi Communications Co Ltd
4C:4B:68 MobileDe Mobile Device, Inc.
4C:4B:F9 IeeeRegi IEEE Registration Authority
@@ -23141,6 +23158,8 @@
4C:E1:73:C0:00:00/28 RemondeN Remonde Network
4C:E1:73:D0:00:00/28 KtcK-Tel Ktc(K-Tel)
4C:E1:73:E0:00:00/28 PlusOneJ Plus One Japan Limited
+4C:E1:75 Cisco Cisco Systems, Inc
+4C:E1:76 Cisco Cisco Systems, Inc
4C:E1:9E TecnoMob Tecno Mobile Limited
4C:E1:BB ZhuhaiHi Zhuhai HiFocus Technology Co., Ltd.
4C:E2:F1 SclakSrl sclak srl
@@ -23821,6 +23840,7 @@
58:8B:F3 ZyxelCom Zyxel Communications Corporation
58:8D:09 Cisco Cisco Systems, Inc
58:8D:64 XiAnClev Xi'an Clevbee Technology Co.,Ltd
+58:8E:81 SiliconL Silicon Laboratories
58:90:43 Sagemcom Sagemcom Broadband SAS
58:91:CF IntelCor Intel Corporate
58:92:0D KineticA Kinetic Avionics Limited
@@ -25089,6 +25109,7 @@
6C:C2:6B Apple Apple, Inc.
6C:C3:74 TexasIns Texas Instruments
6C:C4:D5 HmdGloba HMD Global Oy
+6C:C6:3B TaicangT Taicang T&W Electronics
6C:C7:EC SamsungE Samsung Electro-Mechanics(Thailand)
6C:CA:08 ArrisGro ARRIS Group, Inc.
6C:D0:32 LgElectr LG Electronics
@@ -25552,6 +25573,7 @@
70:B3:D5:0E:30:00/36 SintauSr SinTau SrL
70:B3:D5:0E:50:00/36 DeltaSol Delta Solutions LLC
70:B3:D5:0E:60:00/36 Nasdaq
+70:B3:D5:0E:70:00/36 PureAirF Pure Air Filtration
70:B3:D5:0E:80:00/36 Grossenb Grossenbacher Systeme AG
70:B3:D5:0E:90:00/36 VntElect VNT electronics s.r.o.
70:B3:D5:0E:A0:00/36 AevBroad AEV Broadcast Srl
@@ -25736,6 +25758,7 @@
70:B3:D5:1C:B0:00/36 Matchx MatchX GmbH
70:B3:D5:1C:C0:00/36 AoogeeCo AooGee Controls Co., LTD.
70:B3:D5:1C:D0:00/36 Eleusi ELEUSI GmbH
+70:B3:D5:1C:E0:00/36 ClearFlo Clear Flow by Antiference
70:B3:D5:1D:00:00/36 Shenzhen Shenzhen INVT Electric Co.,Ltd
70:B3:D5:1D:10:00/36 EurotekS Eurotek Srl
70:B3:D5:1D:20:00/36 Xacti Xacti Corporation
@@ -25930,6 +25953,7 @@
70:B3:D5:2B:20:00/36 SunCreat Sun Creative (ZheJiang) Technology INC.
70:B3:D5:2B:30:00/36 Has HAS co.,ltd.
70:B3:D5:2B:40:00/36 Foerster Foerster-Technik GmbH
+70:B3:D5:2B:50:00/36 Dosepack Dosepack India LLP
70:B3:D5:2B:70:00/36 MatrixOr Matrix Orbital Corporation
70:B3:D5:2B:80:00/36 Widenort WideNorth AS
70:B3:D5:2B:90:00/36 Belectri BELECTRIC GmbH
@@ -26290,6 +26314,7 @@
70:B3:D5:48:00:00/36 Emergenc Emergency Lighting Products Limited
70:B3:D5:48:20:00/36 AeryonLa Aeryon Labs Inc
70:B3:D5:48:60:00/36 Chongqin ChongQing JianTao Technology Co., Ltd.
+70:B3:D5:48:70:00/36 EcsSRL ECS s.r.l.
70:B3:D5:48:80:00/36 Cardinal Cardinal Scale Mfg Co
70:B3:D5:48:90:00/36 ArdSa ard sa
70:B3:D5:48:A0:00/36 GeorgeWi George Wilson Industries Ltd
@@ -26472,6 +26497,7 @@
70:B3:D5:55:F0:00/36 DeepBv Deep BV
70:B3:D5:56:30:00/36 Zhejiang Zhejiang Hao Teng Electronic Technology Co., Ltd.
70:B3:D5:56:40:00/36 Christma christmann informationstechnik + medien GmbH & Co. KG
+70:B3:D5:56:50:00/36 Clecell
70:B3:D5:56:60:00/36 DataInfo Data Informs LLC
70:B3:D5:56:80:00/36 SmallDat Small Data Garden Oy
70:B3:D5:56:90:00/36 NuanceHe Nuance Hearing Ltd.
@@ -27274,6 +27300,7 @@
70:B3:D5:94:E0:00/36 BpLubric BP Lubricants USA, Inc.
70:B3:D5:94:F0:00/36 MartNetw Mart Network Solutions Ltd
70:B3:D5:95:00:00/36 CmtMedic CMT Medical technologies
+70:B3:D5:95:10:00/36 Trident Trident Systems Inc
70:B3:D5:95:20:00/36 Requea
70:B3:D5:95:30:00/36 Spectrum Spectrum Techniques, LLC
70:B3:D5:95:40:00/36 DotSyste Dot System S.r.l.
@@ -27778,6 +27805,7 @@
70:B3:D5:BA:E0:00/36 Warecube Warecube,Inc
70:B3:D5:BA:F0:00/36 SysTecEl SYS TEC electronic GmbH
70:B3:D5:BB:00:00/36 WicellTe Wicell Technology
+70:B3:D5:BB:10:00/36 Lumiplan Lumiplan Duhamel
70:B3:D5:BB:20:00/36 MettlerT Mettler Toledo
70:B3:D5:BB:30:00/36 ApgCashD APG Cash Drawer, LLC
70:B3:D5:BB:40:00/36 Integrit Integritech
@@ -27982,6 +28010,7 @@
70:B3:D5:CA:B0:00/36 Notice NOTICE Co., Ltd.
70:B3:D5:CA:C0:00/36 Crde
70:B3:D5:CA:E0:00/36 Thema
+70:B3:D5:CA:F0:00/36 DaveSrl Dave Srl
70:B3:D5:CB:00:00/36 Ossiaco
70:B3:D5:CB:10:00/36 Radar
70:B3:D5:CB:20:00/36 Seclab
@@ -28080,6 +28109,7 @@
70:B3:D5:D2:D0:00/36 EvoluteP Evolute Systems Private Limited
70:B3:D5:D2:E0:00/36 CoherosO Coheros Oy
70:B3:D5:D2:F0:00/36 LIFESa L.I.F.E. Corporation SA
+70:B3:D5:D3:00:00/36 LeicaMic Leica Microsystems Ltd. Shanghai
70:B3:D5:D3:10:00/36 Solace Solace Systems Inc.
70:B3:D5:D3:20:00/36 EuklisBy Euklis by GSG International
70:B3:D5:D3:30:00/36 Vector Vector.Co.,Ltd.
@@ -28560,6 +28590,7 @@
70:B3:D5:F8:D0:00/36 Flextron Flextronics Canafa Design Services
70:B3:D5:F8:E0:00/36 Isabelle Isabellenhütte Heusler Gmbh &Co KG
70:B3:D5:F8:F0:00/36 Dimastec Dimastec Gestao De Ponto E Acesso Eireli-Me
+70:B3:D5:F9:10:00/36 SolidSta Solid State Disks Ltd
70:B3:D5:F9:20:00/36 Techone
70:B3:D5:F9:30:00/36 HellaGut Hella Gutmann Solutions GmbH
70:B3:D5:F9:40:00/36 MbConnec MB connect line GmbH Fernwartungssysteme
@@ -31652,6 +31683,7 @@
9C:53:CD EngicamS ENGICAM s.r.l.
9C:54:1C Shenzhen Shenzhen My-power Technology Co.,Ltd
9C:54:CA Zhengzho Zhengzhou VCOM Science and Technology Co.,Ltd
+9C:54:DA SkybellT SkyBell Technologies Inc.
9C:55:B4 ISESRL I.S.E. S.r.l.
9C:57:11 FeitianX Feitian Xunda(Beijing) Aeronautical Information Technology Co., Ltd.
9C:57:AD Cisco Cisco Systems, Inc
@@ -34047,6 +34079,7 @@ C0:35:C5 Prosoft Prosoft Systems LTD
C0:36:56 Fiberhom Fiberhome Telecommunication Technologies Co.,LTD
C0:38:96 HonHaiPr Hon Hai Precision Ind. Co.,Ltd.
C0:38:F9 NokiaDan Nokia Danmark A/S
+C0:39:37 GreeElec Gree Electric Appliances, Inc. Of Zhuhai
C0:3B:8F MinicomD Minicom Digital Signage
C0:3D:46 Shanghai Shanghai Sango Network Technology Co.,Ltd
C0:3D:D9 Mitrasta MitraStar Technology Corp.
@@ -34343,6 +34376,7 @@ C4:71:54 Tp-LinkT Tp-Link Technologies Co.,Ltd.
C4:71:FE Cisco Cisco Systems, Inc
C4:72:95 Cisco Cisco Systems, Inc
C4:73:1E SamsungE Samsung Electronics Co.,Ltd
+C4:74:1E Zte zte corporation
C4:74:F8 HotPeppe Hot Pepper, Inc.
C4:77:AB BeijingA Beijing ASU Tech Co.,Ltd
C4:77:AF Advanced Advanced Digital Broadcast SA
@@ -36493,6 +36527,7 @@ E4:77:23 Zte zte corporation
E4:77:6B Aartesys Aartesys Ag
E4:77:D4 MinrrayI Minrray Industry Co.,Ltd
E4:7B:3F BeijingC Beijing Co-Cloud Technology Ltd.
+E4:7C:65 SunstarC Sunstar Communication Technology Co., Ltd
E4:7C:F9 SamsungE Samsung Electronics Co.,Ltd
E4:7D:5A BeijingH Beijing Hanbang Technology Corp.
E4:7D:BD SamsungE Samsung Electronics Co.,Ltd
@@ -36855,7 +36890,7 @@ EA:34:B4 Thinkrf ThinkRF Inc.
EA:60:76 Cloudsim CloudSimple, Inc.
EA:9F:B1 PhilipsI Philips International B.V.
EA:B8:9B ThreadGr Thread Group, Inc.
-EA:BE:A7 Private
+EA:BE:A7 Sonos Sonos, Inc.
EA:DD:88 IeeePes- IEEE PES-PSRC Working Group H3, PC37.237
EA:E0:D9 Berk-Tek Berk-tek LLC
EC:01:33 Trinus Trinus Systems Inc.
@@ -37417,6 +37452,7 @@ F4:45:ED Portable Portable Innovation Technology Ltd.
F4:47:13 LeadingP Leading Public Performance Co., Ltd.
F4:47:2A NanjingR Nanjing Rousing Sci. and Tech. Industrial Co., Ltd
F4:48:48 Amscreen Amscreen Group Ltd
+F4:49:55 MimoTech MIMO TECH Co., Ltd.
F4:49:EF Emstone
F4:4B:2A CiscoSpv Cisco SPVTG
F4:4C:70 Skyworth Skyworth Digital Technology(Shenzhen) Co.,Ltd
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 61071be3c0..2ff4f11610 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -1688,32 +1688,75 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
</message>
</context>
<context>
+ <name>ColumnListModel</name>
+ <message>
+ <source>Displayed</source>
+ <translation type="unfinished">Angezeigt</translation>
+ </message>
+ <message>
+ <source>Title</source>
+ <translation type="unfinished">Titel</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">Typ</translation>
+ </message>
+ <message>
+ <source>Fields</source>
+ <translation type="unfinished">Feldname</translation>
+ </message>
+ <message>
+ <source>Field Occurence</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>New Column</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ColumnPreferencesFrame</name>
<message>
<source>Frame</source>
<translation>Frame</translation>
</message>
<message>
+ <source>Add a new column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Delete selected column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show displayed columns only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Displayed</source>
- <translation>Angezeigt</translation>
+ <translation type="vanished">Angezeigt</translation>
</message>
<message>
<source>Title</source>
- <translation>Titel</translation>
+ <translation type="vanished">Titel</translation>
</message>
<message>
<source>Type</source>
- <translation>Typ</translation>
+ <translation type="vanished">Typ</translation>
</message>
<message>
<source>Fields</source>
<oldsource>Field Name</oldsource>
- <translation>Feldname</translation>
+ <translation type="vanished">Feldname</translation>
</message>
<message>
<source>Field Occurrence</source>
<oldsource>Field occurrence</oldsource>
- <translation>Feldhäufigkeit</translation>
+ <translation type="vanished">Feldhäufigkeit</translation>
+ </message>
+ <message>
+ <source>Reset all changes</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index 5646a22664..4d1610e7c3 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -1685,11 +1685,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
- <name>ColumnPreferencesFrame</name>
- <message>
- <source>Frame</source>
- <translation type="unfinished"></translation>
- </message>
+ <name>ColumnListModel</name>
<message>
<source>Displayed</source>
<translation type="unfinished"></translation>
@@ -1704,12 +1700,37 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Fields</source>
- <oldsource>Field Name</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Field Occurrence</source>
- <oldsource>Field occurrence</oldsource>
+ <source>Field Occurence</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>New Column</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ColumnPreferencesFrame</name>
+ <message>
+ <source>Frame</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Add a new column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Delete selected column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show displayed columns only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Reset all changes</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 2959b40c96..e71905ab23 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -1664,32 +1664,70 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>ColumnListModel</name>
+ <message>
+ <source>Displayed</source>
+ <translation type="unfinished">Affichés</translation>
+ </message>
+ <message>
+ <source>Title</source>
+ <translation type="unfinished">Titre</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">Type</translation>
+ </message>
+ <message>
+ <source>Fields</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Field Occurence</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>New Column</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ColumnPreferencesFrame</name>
<message>
<source>Frame</source>
<translation>Trame</translation>
</message>
<message>
+ <source>Add a new column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Delete selected column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show displayed columns only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Displayed</source>
- <translation>Affichés</translation>
+ <translation type="vanished">Affichés</translation>
</message>
<message>
<source>Title</source>
- <translation>Titre</translation>
+ <translation type="vanished">Titre</translation>
</message>
<message>
<source>Type</source>
- <translation>Type</translation>
- </message>
- <message>
- <source>Fields</source>
- <oldsource>Field Name</oldsource>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Type</translation>
</message>
<message>
<source>Field Occurrence</source>
<oldsource>Field occurrence</oldsource>
- <translation>Occurrence d&apos;un champ</translation>
+ <translation type="vanished">Occurrence d&apos;un champ</translation>
+ </message>
+ <message>
+ <source>Reset all changes</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index bc5dd1c7ef..44558b134c 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -1688,32 +1688,75 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
</message>
</context>
<context>
+ <name>ColumnListModel</name>
+ <message>
+ <source>Displayed</source>
+ <translation type="unfinished">Visualizzati</translation>
+ </message>
+ <message>
+ <source>Title</source>
+ <translation type="unfinished">Titolo</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">Tipo</translation>
+ </message>
+ <message>
+ <source>Fields</source>
+ <translation type="unfinished">Campi</translation>
+ </message>
+ <message>
+ <source>Field Occurence</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>New Column</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ColumnPreferencesFrame</name>
<message>
<source>Frame</source>
<translation>Frame</translation>
</message>
<message>
+ <source>Add a new column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Delete selected column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show displayed columns only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Displayed</source>
- <translation>Visualizzati</translation>
+ <translation type="vanished">Visualizzati</translation>
</message>
<message>
<source>Title</source>
- <translation>Titolo</translation>
+ <translation type="vanished">Titolo</translation>
</message>
<message>
<source>Type</source>
- <translation>Tipo</translation>
+ <translation type="vanished">Tipo</translation>
</message>
<message>
<source>Fields</source>
<oldsource>Field Name</oldsource>
- <translation>Campi</translation>
+ <translation type="vanished">Campi</translation>
</message>
<message>
<source>Field Occurrence</source>
<oldsource>Field occurrence</oldsource>
- <translation>Occorrenze del campo</translation>
+ <translation type="vanished">Occorrenze del campo</translation>
+ </message>
+ <message>
+ <source>Reset all changes</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index 70e7507c56..d4bd5e5d67 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -1680,32 +1680,75 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>ColumnListModel</name>
+ <message>
+ <source>Displayed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Title</source>
+ <translation type="unfinished">題名</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">種別</translation>
+ </message>
+ <message>
+ <source>Fields</source>
+ <translation type="unfinished">フィールド名</translation>
+ </message>
+ <message>
+ <source>Field Occurence</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>New Column</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ColumnPreferencesFrame</name>
<message>
<source>Frame</source>
<translation>フレーム</translation>
</message>
<message>
+ <source>Add a new column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Delete selected column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show displayed columns only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Displayed</source>
- <translation>表示</translation>
+ <translation type="vanished">表示</translation>
</message>
<message>
<source>Title</source>
- <translation>題名</translation>
+ <translation type="vanished">題名</translation>
</message>
<message>
<source>Type</source>
- <translation>種別</translation>
+ <translation type="vanished">種別</translation>
</message>
<message>
<source>Fields</source>
<oldsource>Field Name</oldsource>
- <translation>フィールド名</translation>
+ <translation type="vanished">フィールド名</translation>
</message>
<message>
<source>Field Occurrence</source>
<oldsource>Field occurrence</oldsource>
- <translation>フィールド出現位置</translation>
+ <translation type="vanished">フィールド出現位置</translation>
+ </message>
+ <message>
+ <source>Reset all changes</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index f0d0cc4362..ed25fcbfdf 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -1692,32 +1692,75 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>ColumnListModel</name>
+ <message>
+ <source>Displayed</source>
+ <translation type="unfinished">Wyświetlane</translation>
+ </message>
+ <message>
+ <source>Title</source>
+ <translation type="unfinished">Tytuł</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Fields</source>
+ <translation type="unfinished">Pola</translation>
+ </message>
+ <message>
+ <source>Field Occurence</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>New Column</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ColumnPreferencesFrame</name>
<message>
<source>Frame</source>
<translation>Ramka</translation>
</message>
<message>
+ <source>Add a new column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Delete selected column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show displayed columns only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Displayed</source>
- <translation>Wyświetlane</translation>
+ <translation type="vanished">Wyświetlane</translation>
</message>
<message>
<source>Title</source>
- <translation>Tytuł</translation>
+ <translation type="vanished">Tytuł</translation>
</message>
<message>
<source>Type</source>
- <translation>Typ</translation>
+ <translation type="vanished">Typ</translation>
</message>
<message>
<source>Fields</source>
<oldsource>Field Name</oldsource>
- <translation>Pola</translation>
+ <translation type="vanished">Pola</translation>
</message>
<message>
<source>Field Occurrence</source>
<oldsource>Field occurrence</oldsource>
- <translation>Wystąpienie pola</translation>
+ <translation type="vanished">Wystąpienie pola</translation>
+ </message>
+ <message>
+ <source>Reset all changes</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_ru.ts b/ui/qt/wireshark_ru.ts
index 92bd7b86eb..42810d813b 100644
--- a/ui/qt/wireshark_ru.ts
+++ b/ui/qt/wireshark_ru.ts
@@ -1695,32 +1695,75 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>ColumnListModel</name>
+ <message>
+ <source>Displayed</source>
+ <translation type="unfinished">Показано</translation>
+ </message>
+ <message>
+ <source>Title</source>
+ <translation type="unfinished">Заголовок</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">Тип</translation>
+ </message>
+ <message>
+ <source>Fields</source>
+ <translation type="unfinished">Поля</translation>
+ </message>
+ <message>
+ <source>Field Occurence</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>New Column</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ColumnPreferencesFrame</name>
<message>
<source>Frame</source>
<translation>Кадр</translation>
</message>
<message>
+ <source>Add a new column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Delete selected column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show displayed columns only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Displayed</source>
- <translation>Показано</translation>
+ <translation type="vanished">Показано</translation>
</message>
<message>
<source>Title</source>
- <translation>Заголовок</translation>
+ <translation type="vanished">Заголовок</translation>
</message>
<message>
<source>Type</source>
- <translation>Тип</translation>
+ <translation type="vanished">Тип</translation>
</message>
<message>
<source>Fields</source>
<oldsource>Field Name</oldsource>
- <translation>Поля</translation>
+ <translation type="vanished">Поля</translation>
</message>
<message>
<source>Field Occurrence</source>
<oldsource>Field occurrence</oldsource>
- <translation>Вхождение Поля</translation>
+ <translation type="vanished">Вхождение Поля</translation>
+ </message>
+ <message>
+ <source>Reset all changes</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_sv.ts b/ui/qt/wireshark_sv.ts
index e94f258e8f..3d0e4decf4 100644
--- a/ui/qt/wireshark_sv.ts
+++ b/ui/qt/wireshark_sv.ts
@@ -1688,32 +1688,75 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
</message>
</context>
<context>
+ <name>ColumnListModel</name>
+ <message>
+ <source>Displayed</source>
+ <translation type="unfinished">Visat</translation>
+ </message>
+ <message>
+ <source>Title</source>
+ <translation type="unfinished">Titel</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">Typ</translation>
+ </message>
+ <message>
+ <source>Fields</source>
+ <translation type="unfinished">Fält</translation>
+ </message>
+ <message>
+ <source>Field Occurence</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>New Column</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ColumnPreferencesFrame</name>
<message>
<source>Frame</source>
<translation>Ram</translation>
</message>
<message>
+ <source>Add a new column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Delete selected column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show displayed columns only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Displayed</source>
- <translation>Visat</translation>
+ <translation type="vanished">Visat</translation>
</message>
<message>
<source>Title</source>
- <translation>Titel</translation>
+ <translation type="vanished">Titel</translation>
</message>
<message>
<source>Type</source>
- <translation>Typ</translation>
+ <translation type="vanished">Typ</translation>
</message>
<message>
<source>Fields</source>
<oldsource>Field Name</oldsource>
- <translation>Fält</translation>
+ <translation type="vanished">Fält</translation>
</message>
<message>
<source>Field Occurrence</source>
<oldsource>Field occurrence</oldsource>
- <translation>Fältförekomst</translation>
+ <translation type="vanished">Fältförekomst</translation>
+ </message>
+ <message>
+ <source>Reset all changes</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_uk.ts b/ui/qt/wireshark_uk.ts
index 886faa47ee..3e476f5af2 100644
--- a/ui/qt/wireshark_uk.ts
+++ b/ui/qt/wireshark_uk.ts
@@ -1668,32 +1668,70 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>ColumnListModel</name>
+ <message>
+ <source>Displayed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Title</source>
+ <translation type="unfinished">Заголовок</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">Тип</translation>
+ </message>
+ <message>
+ <source>Fields</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Field Occurence</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>New Column</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ColumnPreferencesFrame</name>
<message>
<source>Frame</source>
<translation>Кадр</translation>
</message>
<message>
+ <source>Add a new column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Delete selected column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show displayed columns only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Displayed</source>
- <translation>Відображено</translation>
+ <translation type="vanished">Відображено</translation>
</message>
<message>
<source>Title</source>
- <translation>Заголовок</translation>
+ <translation type="vanished">Заголовок</translation>
</message>
<message>
<source>Type</source>
- <translation>Тип</translation>
- </message>
- <message>
- <source>Fields</source>
- <oldsource>Field Name</oldsource>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Тип</translation>
</message>
<message>
<source>Field Occurrence</source>
<oldsource>Field occurrence</oldsource>
- <translation>Входження Поля</translation>
+ <translation type="vanished">Входження Поля</translation>
+ </message>
+ <message>
+ <source>Reset all changes</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index a113505c65..829d135ca3 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -1678,32 +1678,75 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>ColumnListModel</name>
+ <message>
+ <source>Displayed</source>
+ <translation type="unfinished">已显示</translation>
+ </message>
+ <message>
+ <source>Title</source>
+ <translation type="unfinished">标题</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">类型</translation>
+ </message>
+ <message>
+ <source>Fields</source>
+ <translation type="unfinished">字段</translation>
+ </message>
+ <message>
+ <source>Field Occurence</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>New Column</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ColumnPreferencesFrame</name>
<message>
<source>Frame</source>
<translation>帧</translation>
</message>
<message>
+ <source>Add a new column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Delete selected column</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show displayed columns only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Displayed</source>
- <translation>已显示</translation>
+ <translation type="vanished">已显示</translation>
</message>
<message>
<source>Title</source>
- <translation>标题</translation>
+ <translation type="vanished">标题</translation>
</message>
<message>
<source>Type</source>
- <translation>类型</translation>
+ <translation type="vanished">类型</translation>
</message>
<message>
<source>Fields</source>
<oldsource>Field Name</oldsource>
- <translation>字段</translation>
+ <translation type="vanished">字段</translation>
</message>
<message>
<source>Field Occurrence</source>
<oldsource>Field occurrence</oldsource>
- <translation>字段发生</translation>
+ <translation type="vanished">字段发生</translation>
+ </message>
+ <message>
+ <source>Reset all changes</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>