aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS2
-rw-r--r--enterprises.tsv42
-rw-r--r--epan/dissectors/usb.c9
-rw-r--r--manuf70
-rw-r--r--services2
-rw-r--r--ui/qt/wireshark_de.ts33
-rw-r--r--ui/qt/wireshark_en.ts8
-rw-r--r--ui/qt/wireshark_fr.ts18
-rw-r--r--ui/qt/wireshark_it.ts33
-rw-r--r--ui/qt/wireshark_ja_JP.ts18
-rw-r--r--ui/qt/wireshark_pl.ts18
-rw-r--r--ui/qt/wireshark_zh_CN.ts18
12 files changed, 203 insertions, 68 deletions
diff --git a/AUTHORS b/AUTHORS
index 4b21001c51..0f35a37d29 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4244,6 +4244,7 @@ Jeremy Martin <boardermartin[AT]gmail.com>
Jeroen Roovers <jer[AT]gentoo.org>
Jeroen Sack <jeroen[AT]jeroensack.nl>
Jesse Gross <jesse[AT]kernel.org>
+Jim Borden <jim.borden[AT]couchbase.com>
Jim Schaettle <jimschaettle[AT]gmail.com>
Jim Walker <jim[AT]couchbase.com>
Jim Young <jyoung[AT]gsu.edu>
@@ -4555,6 +4556,7 @@ Vadim Fedorenko <vadimjunk[AT]gmail.com>
Vadim Yanitskiy <axilirator[AT]gmail.com>
ValdikSS <iam[AT]valdikss.org.ru>
Valentin Vidic <Valentin.Vidic[AT]CARNet.hr>
+Vasil Velichkov <vasko[AT]vvelichkov2.dev.opencode.com>
Vasil Velichkov <vvvelichkov[AT]gmail.com>
Victor Barratault <victor.barratault[AT]gmail.com>
Victor Dodon <dodonvictor[AT]gmail.com>
diff --git a/enterprises.tsv b/enterprises.tsv
index ada6b67ef7..0f531df2f5 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 2018-11-10)
+# (last updated 2018-11-18)
0 Reserved
1 NxNetworks
@@ -511,7 +511,7 @@
501 European Agency of Digital Trust # formerly 'Programa SPRITEL'
502 Adacom
503 Metrodata Ltd
-504 Ellemtel Telecommunication Systems Laboratories
+504 Ericsson AB - 4G5G # formerly 'Ellemtel Telecommunication Systems Laboratories'
505 Arizona Public Service
506 NETWIZ, Ltd.,
507 Science and Engineering Research Council (SERC)
@@ -52714,7 +52714,7 @@
52901 Linxdatacenter
52902 VI Company Services B.V.
52903 Turrillas Inc.
-52904 Defiance Technolog Inc.
+52904 Defiance Technology Inc.
52905 JT Global
52906 Acumen Consulting
52907 APROPLAN s.a
@@ -52769,3 +52769,39 @@
52956 Fronius International GmbH
52957 ACTIVEMALL SRL
52958 NumaTech Ltd.
+52959 Drakontas LLC
+52960 AssistRx
+52961 Cohen & Company
+52962 AVA Abfallverwertung Augsburg KU
+52963 BRNET
+52964 OOO "Synergy Team"
+52965 Berale of Teldan Group
+52966 Itzos
+52967 Mascaro Construction Company
+52968 Reimer IT Solutions
+52969 TRUSTPRO QTSP LTD
+52970 Eleven Software
+52971 Art-k-tec Systems LLC
+52972 Matthias Staudacher
+52973 August Storck KG
+52974 Alamo Psychiatric Care, P.A.
+52975 Salish Integrative Medicine, Inc.
+52976 Pittol
+52977 ZMNH EDV
+52978 Träfrakt Götaland AB
+52979 Fujian Straits Information Technology Co., Ltd.
+52980 Nissin Systems Co.,Ltd.
+52981 CPON TECHNOLOGIES HONGKONG CO LIMITED
+52982 PNP SECURE INC.
+52983 West London NHS Trust
+52984 Albany Surgical, PC
+52985 Omni Air International
+52986 Mörks skogsmaskiner AB
+52987 TierPoint
+52988 中天宽带技术有限公司 (Zhongtian Broadband Technology Co., Ltd.)
+52989 Medical Training Institute Center INC
+52990 Heilongjiang Electric Power Dispatching Industry Co., Ltd.
+52991 DataOrbis
+52992 Lahtis Entreprenad AB
+52993 ChocolateCoding
+52994 drei01 Technology Business Services GmbH
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 7179e1e5d2..42e561cfff 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -2913,6 +2913,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x2a03, "dog hunter AG" },
{ 0x2a37, "RTD Embedded Technologies, Inc." },
{ 0x2a45, "Meizu Corp." },
+ { 0x2ac7, "Ultrahaptics Ltd." },
{ 0x2b24, "KeepKey LLC" },
{ 0x2c02, "Planex Communications" },
{ 0x2c1a, "Dolphin Peripherals" },
@@ -19672,6 +19673,14 @@ static const value_string usb_products_vals[] = {
{ 0x2a45200b, "MX Phone (PTP)" },
{ 0x2a45200c, "MX Phone (PTP & ADB)" },
{ 0x2a452012, "MX Phone (MTP & ACM)" },
+ { 0x2ac70101, "Evaluation Kit [Dragonfly]" },
+ { 0x2ac70102, "UHDK5" },
+ { 0x2ac70104, "Touchbase" },
+ { 0x2ac70110, "STRATOS Explore" },
+ { 0x2ac70111, "STRATOS Explore DFU" },
+ { 0x2ac70112, "STRATOS Inspire" },
+ { 0x2ac70113, "STRATOS Inspire DFU" },
+ { 0x2ac7ffff, "DFU" },
{ 0x2b240001, "Bitcoin hardware wallet" },
{ 0x2c0214ea, "GW-US11H WLAN" },
{ 0x2c1a0000, "Wireless Optical Mouse" },
diff --git a/manuf b/manuf
index f309621588..280d30d6dc 100644
--- a/manuf
+++ b/manuf
@@ -45,23 +45,23 @@
# http://standards-oui.ieee.org/cid/cid.csv:
# Content-Length: 6425
-# Last-Modified: Sun, 11 Nov 2018 07:00:32 GMT
+# Last-Modified: Sun, 18 Nov 2018 07:00:36 GMT
# http://standards-oui.ieee.org/iab/iab.csv:
# Content-Length: 381412
-# Last-Modified: Sun, 11 Nov 2018 07:01:39 GMT
+# Last-Modified: Sun, 18 Nov 2018 07:01:45 GMT
# http://standards-oui.ieee.org/oui/oui.csv:
-# Content-Length: 2281070
-# Last-Modified: Sun, 11 Nov 2018 07:03:59 GMT
+# Content-Length: 2284118
+# Last-Modified: Sun, 18 Nov 2018 07:04:06 GMT
# http://standards-oui.ieee.org/oui28/mam.csv:
-# Content-Length: 239233
-# Last-Modified: Sun, 11 Nov 2018 07:02:07 GMT
+# Content-Length: 240967
+# Last-Modified: Sun, 18 Nov 2018 07:02:13 GMT
# http://standards-oui.ieee.org/oui36/oui36.csv:
-# Content-Length: 259326
-# Last-Modified: Sun, 11 Nov 2018 07:03:31 GMT
+# Content-Length: 260171
+# Last-Modified: Sun, 18 Nov 2018 07:03:37 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
@@ -10260,6 +10260,7 @@
00:2C:C8 Cisco Cisco Systems, Inc
00:2D:76 Titech TITECH GmbH
00:2E:C7 HuaweiTe Huawei Technologies Co.,Ltd
+00:2F:5C Cisco Cisco Systems, Inc
00:2F:D9 Fiberhom Fiberhome Telecommunication Technologies Co.,LTD
00:30:00 AllwellT Allwell Technology Corp.
00:30:01 Smp
@@ -16642,6 +16643,7 @@
00:C8:8B Cisco Cisco Systems, Inc
00:CA:E5 Cisco Cisco Systems, Inc
00:CB:00 Private
+00:CB:51 Sagemcom Sagemcom Broadband SAS
00:CB:B4 Shenzhen Shenzhen Ateko Photoelectricity Co.,Ltd
00:CB:BD Cambridg Cambridge Broadband Networks Ltd.
00:CC:3F Universa Universal Electronics, Inc.
@@ -17445,6 +17447,7 @@
04:D4:37 Znv
04:D6:AA SamsungE Samsung Electro-Mechanics(Thailand)
04:D7:83 Y&HE&C Y&H E&C Co.,LTD.
+04:D7:A5 NewH3CTe New H3C Technologies Co., Ltd
04:DA:D2 Cisco Cisco Systems, Inc
04:DB:56 Apple Apple, Inc.
04:DB:8A SuntechI Suntech International Ltd.
@@ -18024,6 +18027,7 @@
0C:DC:CC InalaTec Inala Technologies
0C:DD:EF Nokia Nokia Corporation
0C:DF:A4 SamsungE Samsung Electronics Co.,Ltd
+0C:E0:41 Idruide
0C:E0:DC SamsungE Samsung Electronics Co.,Ltd
0C:E0:E4 Plantron Plantronics, Inc.
0C:E5:D3 DhElectr DH electronics GmbH
@@ -20605,6 +20609,7 @@
38:3A:21:D0:00:00/28 Colooc Colooc AB
38:3A:21:E0:00:00/28 SdnwareT SDNware technology co.,LTD
38:3B:C8 2Wire 2Wire Inc
+38:3C:9C FujianNe Fujian Newland Payment Technology Co.,Ltd.
38:3F:10 DblTechn DBL Technology Ltd.
38:42:33 Wildeboe Wildeboer Bauteile GmbH
38:42:A6 Ingenieu Ingenieurbuero Stahlkopf
@@ -20795,6 +20800,7 @@
38:F7:08 National National Resource Management, Inc.
38:F7:3D AmazonTe Amazon Technologies Inc.
38:F7:B2 SeojunEl Seojun Electric
+38:F8:5E Humax HUMAX Co., Ltd.
38:F8:89 HuaweiTe Huawei Technologies Co.,Ltd
38:F8:B7 V2ComPar V2Com Participacoes S.A.
38:F8:CA Owin OWIN Inc.
@@ -22224,6 +22230,7 @@
48:D6:D5 Google Google, Inc.
48:D7:05 Apple Apple, Inc.
48:D7:FF BlankomA BLANKOM Antennentechnik GmbH
+48:D8:45 Shenzhen Shenzhen Mainuoke Electronics Co., Ltd
48:D8:55 Telvent
48:D8:FE ClaridyS ClarIDy Solutions, Inc.
48:DA:96 EddySmar Eddy Smart Home Solutions Inc.
@@ -22236,6 +22243,7 @@
48:E2:44 HonHaiPr Hon Hai Precision Ind. Co.,Ltd.
48:E3:C3 Jenoptik JENOPTIK Advanced Systems GmbH
48:E6:95 Insigma Insigma Inc
+48:E6:C0 SimcomWi SIMCom Wireless Solutions Co.,Ltd.
48:E9:F1 Apple Apple, Inc.
48:EA:63 Zhejiang Zhejiang Uniview Technologies Co., Ltd.
48:EB:30 EternaTe Eterna Technology, Inc.
@@ -22322,6 +22330,7 @@
4C:48:DA BeijingA Beijing Autelan Technology Co.,Ltd
4C:49:E3 XiaomiCo Xiaomi Communications Co Ltd
4C:4B:68 MobileDe Mobile Device, Inc.
+4C:4D:66 NanjingJ Nanjing Jiahao Technology Co., Ltd.
4C:4E:03 TctMobil TCT mobile ltd
4C:4E:35 Cisco Cisco Systems, Inc
4C:52:62 FujitsuT Fujitsu Technology Solutions GmbH
@@ -22586,6 +22595,7 @@
50:5A:C6 Guangdon Guangdong Super Telecom Co.,Ltd.
50:5B:C2 LiteonTe Liteon Technology Corporation
50:5D:AC HuaweiTe Huawei Technologies Co.,Ltd
+50:5F:B5 AskeyCom Askey Computer Corp.
50:60:28 Xirrus Xirrus Inc.
50:61:84 Avaya Avaya Inc
50:61:BF Cisco Cisco Systems, Inc
@@ -22801,6 +22811,7 @@
54:44:08 Nokia Nokia Corporation
54:46:6B Shenzhen Shenzhen CZTIC Electronic Technology Co., Ltd
54:47:41 Xcheng Xcheng Holding
+54:47:D3 TsatAs Tsat As
54:48:10 Dell Dell Inc.
54:48:9C Cdoubles Cdoubles Electronics Co. Ltd.
54:4A:00 Cisco Cisco Systems, Inc
@@ -23898,6 +23909,7 @@
68:89:C1 HuaweiTe Huawei Technologies Co.,Ltd
68:8A:B5 EdpServi EDP Servicos
68:8A:F0 Zte zte corporation
+68:8B:0F ChinaMob China Mobile IOT Company Limited
68:8D:B6 Aetek Aetek Inc.
68:8F:2E HitronTe Hitron Technologies. Inc
68:8F:84 HuaweiTe Huawei Technologies Co.,Ltd
@@ -24607,6 +24619,7 @@
70:B3:D5:10:40:00/36 PlumSpZO Plum sp. z o.o
70:B3:D5:10:50:00/36 BeijingN Beijing Nacao Technology Co., Ltd.
70:B3:D5:10:60:00/36 AplexTec Aplex Technology Inc.
+70:B3:D5:10:70:00/36 Ooo"Alya OOO "Alyans"
70:B3:D5:10:80:00/36 TexCompu Tex Computer Srl
70:B3:D5:10:90:00/36 DitestFa DiTEST Fahrzeugdiagnose GmbH
70:B3:D5:10:A0:00/36 SeasonDe Season Design Technology
@@ -24978,6 +24991,7 @@
70:B3:D5:31:B0:00/36 Silterra SilTerra Malaysia Sdn. Bhd.
70:B3:D5:31:C0:00/36 Financie FINANCIERE DE L'OMBREE (eolane)
70:B3:D5:31:E0:00/36 Gillam-F Gillam-Fei S.A.
+70:B3:D5:31:F0:00/36 Elcoma
70:B3:D5:32:30:00/36 TattileS Tattile Srl
70:B3:D5:32:40:00/36 ThalesNe Thales Nederland BV
70:B3:D5:32:50:00/36 Bluemark BlueMark Innovations BV
@@ -25396,6 +25410,7 @@
70:B3:D5:5A:20:00/36 WallnerA Wallner Automation GmbH
70:B3:D5:5A:30:00/36 Ct CT Company
70:B3:D5:5A:50:00/36 Rehwork Rehwork GmbH
+70:B3:D5:5A:70:00/36 AbbSPA ABB S.p.A.
70:B3:D5:5A:80:00/36 Farmobil Farmobile
70:B3:D5:5A:90:00/36 BunkaShu Bunka Shutter Co., Ltd.
70:B3:D5:5A:A0:00/36 ChugokuE Chugoku Electric Manufacturing Co.,Inc
@@ -25518,6 +25533,7 @@
70:B3:D5:66:40:00/36 SankyoIn Sankyo Intec co.,ltd
70:B3:D5:66:50:00/36 Certusus CertUsus GmbH
70:B3:D5:66:60:00/36 AplexTec Aplex Technology Inc.
+70:B3:D5:66:90:00/36 Pano0Ram Pano0ramic Power
70:B3:D5:66:A0:00/36 Private
70:B3:D5:66:B0:00/36 Innitive Innitive B.V.
70:B3:D5:67:00:00/36 Particle Particle sizing systems
@@ -25977,6 +25993,7 @@
70:B3:D5:91:80:00/36 GlovaRai Glova Rail A/S
70:B3:D5:91:A0:00/36 FujianLa Fujian Landfone Information Technology Co.,Ltd
70:B3:D5:91:B0:00/36 Dolotron Dolotron d.o.o.
+70:B3:D5:91:C0:00/36 AlereTec Alere Technologies AS
70:B3:D5:91:E0:00/36 Creotech Creotech Instruments S.A.
70:B3:D5:91:F0:00/36 Jsc"Info JSC "InformInvestGroup"
70:B3:D5:92:00:00/36 Slat
@@ -26215,6 +26232,7 @@
70:B3:D5:A7:60:00/36 PietroFi Pietro Fiorentini
70:B3:D5:A7:80:00/36 Bionics Bionics co.,ltd.
70:B3:D5:A7:A0:00/36 FluidMan Fluid Management Technology
+70:B3:D5:A7:B0:00/36 Smartsaf SmartSafe
70:B3:D5:A7:C0:00/36 Transele Transelektronik Messgeräte GmbH
70:B3:D5:A7:E0:00/36 QuiccoSo QUICCO SOUND Corporation
70:B3:D5:A8:10:00/36 SiendaNe Sienda New Media Technologies GmbH
@@ -26378,6 +26396,7 @@
70:B3:D5:B5:90:00/36 Futurete FutureTechnologyLaboratories INC.
70:B3:D5:B5:C0:00/36 ProzessT Prozess Technologie
70:B3:D5:B5:F0:00/36 Crdmdeve Crdmdeveoppements
+70:B3:D5:B6:00:00/36 ZaoZeo Zao Zeo
70:B3:D5:B6:20:00/36 SakuraSe Sakura Seiki Co.,Ltd.
70:B3:D5:B6:40:00/36 OsungLst Osung Lst Co.,Ltd.
70:B3:D5:B6:60:00/36 SilentGl Silent Gliss International Ltd
@@ -26386,6 +26405,7 @@
70:B3:D5:B6:B0:00/36 Cambria Cambria Corporation
70:B3:D5:B6:C0:00/36 Ghm-Mess GHM-Messtechnik GmbH (Standort IMTRON)
70:B3:D5:B6:D0:00/36 Movis
+70:B3:D5:B6:E0:00/36 Edgeware Edgeware AB
70:B3:D5:B7:10:00/36 Private
70:B3:D5:B7:20:00/36 Ub330Net UB330.net d.o.o.
70:B3:D5:B7:40:00/36 Onyield OnYield Inc Ltd
@@ -26526,6 +26546,7 @@
70:B3:D5:C3:D0:00/36 CistechS CISTECH Solutions
70:B3:D5:C3:E0:00/36 Dosadore Dosadores Alltronic
70:B3:D5:C3:F0:00/36 CodeBlue Code Blue Corporation
+70:B3:D5:C4:00:00/36 Hongseok HongSeok Ltd.
70:B3:D5:C4:10:00/36 MerlinCs Merlin CSI
70:B3:D5:C4:20:00/36 Crde
70:B3:D5:C4:30:00/36 FutureSk Future Skies
@@ -26638,6 +26659,7 @@
70:B3:D5:CE:90:00/36 Kinemetr Kinemetrics
70:B3:D5:CE:A0:00/36 Computer Computerwise, Inc.
70:B3:D5:CE:D0:00/36 Advanced Advanced Products Corporation Pte Ltd
+70:B3:D5:CF:00:00/36 Shenzhen Shenzhen Witlink Co.,Ltd.
70:B3:D5:CF:10:00/36 Lightdec LightDec GmbH & Co. KG
70:B3:D5:CF:20:00/36 Tinnos
70:B3:D5:CF:30:00/36 MeshMoti Mesh Motion Inc
@@ -28628,6 +28650,7 @@
88:53:D4 HuaweiTe Huawei Technologies Co.,Ltd
88:57:6D XtaElect XTA Electronics Ltd
88:57:EE Buffalo Buffalo.Inc
+88:5A:06 Guangdon Guangdong Oppo Mobile Telecommunications Corp.,Ltd
88:5A:92 Cisco Cisco Systems, Inc
88:5B:DD Aerohive Aerohive Networks Inc.
88:5C:47 AlcatelL Alcatel Lucent
@@ -28793,6 +28816,7 @@
88:DE:7C AskeyCom Askey Computer Corp.
88:DE:A9 Roku Roku, Inc.
88:DF:9E NewH3CTe New H3C Technologies Co., Ltd
+88:E0:34 ShinwaIn Shinwa industries(China) ltd.
88:E0:A0 Shenzhen Shenzhen VisionSTOR Technologies Co., Ltd
88:E0:F3 JuniperN Juniper Networks
88:E1:61 ArtBeiji Art Beijing Science and Technology Development Co., Ltd.
@@ -28933,6 +28957,7 @@
8C:59:8B CTechnol C Technologies AB
8C:59:C3 AdbItali ADB Italia
8C:5A:F0 Exeltech Exeltech Solar Products
+8C:5A:F8 BeijingX Beijing Xiaomi Electronics Co., Ltd.
8C:5B:F0 ArrisGro ARRIS Group, Inc.
8C:5C:A1 D-Broad d-broad,INC
8C:5D:60 Uci UCI Corporation Co.,Ltd.
@@ -29164,6 +29189,7 @@
90:55:AE Ericsson Ericsson, EAB/RWI/K
90:56:82 Lenbrook Lenbrook Industries Limited
90:56:92 Autotalk Autotalks Ltd.
+90:58:51 Technico Technicolor CH USA Inc.
90:59:AF TexasIns Texas Instruments
90:5C:44 CompalBr Compal Broadband Networks, Inc.
90:5F:2E TctMobil TCT mobile ltd
@@ -29204,6 +29230,7 @@
90:86:74 SichuanT Sichuan Tianyi Comheart Telecomco., Ltd
90:86:9B Zte zte corporation
90:88:A2 IonicsTe Ionics Technology Me Ltda
+90:89:5F WeifangG Weifang Goertek Electronics Co.,Ltd
90:8C:09 TotalPha Total Phase
90:8C:44 HKZongmu H.K Zongmu Technology Co., Ltd.
90:8C:63 GzWeedon GZ Weedong Networks Technology Co. , Ltd
@@ -29584,6 +29611,7 @@
98:44:B6 Infranor Infranor Sas
98:45:62 Shanghai Shanghai Baud Data Communication Co.,Ltd.
98:47:3C Shanghai Shanghai Sunmon Communication Technogy Co.,Ltd
+98:49:E1 BoeingDe Boeing Defence Australia
98:4A:47 ChgHospi CHG Hospital Beds
98:4B:4A ArrisGro ARRIS Group, Inc.
98:4B:E1 HewlettP Hewlett Packard
@@ -30471,6 +30499,7 @@ A4:7B:9D Espressi Espressif Inc.
A4:7C:14 Chargest ChargeStorm AB
A4:7C:1F Cobham Cobham plc
A4:7E:39 Zte zte corporation
+A4:81:7A CigShang Cig Shanghai Co Ltd
A4:81:EE Nokia Nokia Corporation
A4:82:69 Datrium Datrium, Inc.
A4:84:31 SamsungE Samsung Electronics Co.,Ltd
@@ -31589,6 +31618,7 @@ B8:8E:3A Infinite Infinite Technologies JLT
B8:8E:C6 Stateles Stateless Networks
B8:8E:DF Zencheer Zencheer Communication Technology Co., Ltd.
B8:8F:14 Analytic Analytica GmbH
+B8:8F:B4 PirelliT Pirelli Tyre S.P.A
B8:92:1D BgT&A Bg T&A
B8:94:36 HuaweiTe Huawei Technologies Co.,Ltd
B8:94:D2 RetailIn Retail Innovation HTT AB
@@ -31906,6 +31936,7 @@ BC:C6:DB Nokia Nokia Corporation
BC:C8:10 CiscoSpv Cisco SPVTG
BC:CA:B5 ArrisGro ARRIS Group, Inc.
BC:CD:45 Voismart
+BC:CF:4F ZyxelCom Zyxel Communications Corporation
BC:CF:CC Htc HTC Corporation
BC:D1:1F SamsungE Samsung Electronics Co.,Ltd
BC:D1:65 CiscoSpv Cisco SPVTG
@@ -31945,6 +31976,7 @@ C0:02:8D WinstarD WINSTAR Display CO.,Ltd
C0:03:80 JuniperN Juniper Networks
C0:05:C2 ArrisGro ARRIS Group, Inc.
C0:0D:7E Additech Additech, Inc.
+C0:10:B1 HmdGloba HMD Global Oy
C0:11:73 SamsungE Samsung Electronics Co.,Ltd
C0:11:A6 Fort-Tel Fort-Telecom ltd.
C0:12:42 AlphaSec Alpha Security Products
@@ -31969,6 +32001,7 @@ C0:29:F3 Xysystem
C0:2B:FC InesAppl iNES. applied informatics GmbH
C0:2C:7A Shenzhen Shenzhen Horn Audio Co.,Ltd.
C0:2D:EE Cuff
+C0:2E:25 Guangdon Guangdong Oppo Mobile Telecommunications Corp.,Ltd
C0:2F:F1 VoltaNet Volta Networks
C0:33:5E Microsof Microsoft
C0:34:B4 Gigaston Gigastone Corporation
@@ -32231,6 +32264,7 @@ C4:62:6B ZptVigan ZPT Vigantice
C4:62:EA SamsungE Samsung Electronics Co.,Ltd
C4:63:54 U-Raku U-Raku, Inc.
C4:64:13 Cisco Cisco Systems, Inc
+C4:64:B7 Fiberhom Fiberhome Telecommunication Technologies Co.,LTD
C4:64:E3 TexasIns Texas Instruments
C4:66:99 VivoMobi vivo Mobile Communication Co., Ltd.
C4:67:B5 Libraton Libratone A/S
@@ -32346,6 +32380,7 @@ C4:EE:AE VssMonit VSS Monitoring
C4:EE:F5 Ii-Vi II-VI Incorporated
C4:EF:70 HomeSkin Home Skinovations
C4:F0:81 HuaweiTe Huawei Technologies Co.,Ltd
+C4:F0:EC Fiberhom Fiberhome Telecommunication Technologies Co.,LTD
C4:F1:D1 BeijingS Beijing Sogou Technology Development Co., Ltd.
C4:F3:12 TexasIns Texas Instruments
C4:F4:64 SpicaInt Spica international
@@ -32841,6 +32876,7 @@ CC:E7:98 MySocial My Social Stuff
CC:E7:DF American American Magnetics, Inc.
CC:E8:AC SoyeaTec SOYEA Technology Co.,Ltd.
CC:EA:1C Dconwork DCONWORKS Co., Ltd
+CC:ED:DC Mitrasta MitraStar Technology Corp.
CC:EE:D9 VahleAut VAHLE Automation GmbH
CC:EF:48 Cisco Cisco Systems, Inc
CC:F0:FD ChinaMob China Mobile (Hangzhou) Information Technology Co., Ltd.
@@ -33181,6 +33217,7 @@ D4:53:83 MurataMa Murata Manufacturing Co., Ltd.
D4:53:AF VigoSyst VIGO System S.A.
D4:55:56 FiberMou Fiber Mountain Inc.
D4:55:BE Shenzhen Shenzhen Fast Technologies Co.,Ltd
+D4:58:00 Fiberhom Fiberhome Telecommunication Technologies Co.,LTD
D4:5A:B2 Galleon Galleon Systems
D4:5C:70 Wi-FiAll Wi-Fi Alliance
D4:5D:42 Nokia Nokia Corporation
@@ -33452,16 +33489,20 @@ D8:86:0B:20:00:00/28 GetSat Get SAT
D8:86:0B:30:00:00/28 Auvidea Auvidea GmbH
D8:86:0B:40:00:00/28 Teplovod Teplovodokhran Ltd.
D8:86:0B:50:00:00/28 Camtrace
+D8:86:0B:60:00:00/28 Scanmati Scanmatik
D8:86:0B:70:00:00/28 Grünbeck Grünbeck Wasseraufbereitung GmbH
+D8:86:0B:80:00:00/28 VrindaNa Vrinda Nano Technologies Pvt Ltd
D8:86:0B:90:00:00/28 DigitalC Digital Concepts
D8:86:0B:A0:00:00/28 GloScien GLO Science
D8:86:0B:B0:00:00/28 LibraryI Library Ideas
D8:86:0B:D0:00:00/28 ComnavTe ComNav Technology Ltd.
+D8:86:0B:E0:00:00/28 Shenzhen Shenzhen Yidong Technology Co.,Ltd
D8:87:D5 Leadcore Leadcore Technology CO.,LTD
D8:88:CE RfTechno RF Technology Pty Ltd
D8:8A:3B Unit-Em
D8:8B:4C Kingting KingTing Tech.
D8:8D:5C Elentec
+D8:8D:C8 AtilTech Atil Technology Co., LTD
D8:8F:76 Apple Apple, Inc.
D8:90:E8 SamsungE Samsung Electronics Co.,Ltd
D8:91:2A ZyxelCom Zyxel Communications Corporation
@@ -33861,6 +33902,19 @@ E0:55:3D CiscoMer Cisco Meraki
E0:55:97 Emergent Emergent Vision Technologies Inc.
E0:56:F4 Axesnetw AxesNetwork Solutions inc.
E0:58:9E LaerdalM Laerdal Medical
+E0:5A:9F IeeeRegi IEEE Registration Authority
+E0:5A:9F:00:00:00/28 Annapurn Annapurna labs
+E0:5A:9F:10:00:00/28 AitecSys Aitec System Co., Ltd.
+E0:5A:9F:20:00:00/28 ChengduS Chengdu Song Yuan Electronic Technology Co.,Ltd
+E0:5A:9F:30:00:00/28 LinkOfTh Link of Things Co., Ltd.
+E0:5A:9F:40:00:00/28 HaleProd Hale Products
+E0:5A:9F:50:00:00/28 Tryen
+E0:5A:9F:60:00:00/28 Fibrain
+E0:5A:9F:70:00:00/28 OmbGuita OMB Guitars LLC
+E0:5A:9F:80:00:00/28 FujianNe Fujian Newland Auto-ID Tech. Co.,Ltd.
+E0:5A:9F:A0:00:00/28 Contempo Contemporary Amperex Technology Co., Limited
+E0:5A:9F:B0:00:00/28 Shenzhen Shenzhen Rongan Networks Technology Co.,Ltd
+E0:5A:9F:D0:00:00/28 Mountz Mountz, Inc.
E0:5B:70 Innovid Innovid, Co., Ltd.
E0:5D:5C OyEveron Oy Everon Ab
E0:5D:A6 DetlefFi Detlef Fink Elektronik & Softwareentwicklung
diff --git a/services b/services
index cc5882d53e..b863197ca8 100644
--- a/services
+++ b/services
@@ -6064,7 +6064,7 @@ fairview 38202/tcp/udp # Fairview Message Service
agpolicy 38203/tcp/udp # AppGate Policy Server
ng-control 38412/sctp # NG Control Plane (3GPP)
xn-control 38422/sctp # Xn Control Plane (3GPP)
-e1-interface 38462/sctp # E1 signalling transport
+e1-interface 38462/sctp # E1 signalling transport (3GPP)
f1-control 38472/sctp # F1 Control Plane (3GPP)
sruth 38800/tcp # Sruth is a service for the distribution of routinely- generated but arbitrary files based on a publish/subscribe distribution model and implemented using a peer-to-peer transport mechanism
secrmmsafecopya 38865/tcp # Security approval process for use of the secRMM SafeCopy program
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index a0ec303b21..dbb4fc6d9d 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -926,15 +926,19 @@
</message>
<message>
<source>Hash (SHA256)</source>
- <translation type="unfinished"></translation>
+ <translation>Hash (SHA256)</translation>
</message>
<message>
<source>Hash (RIPEMD160)</source>
- <translation type="unfinished"></translation>
+ <translation>Hash (RIPEMD160)</translation>
</message>
<message>
<source>Hash (SHA1)</source>
- <translation type="unfinished"></translation>
+ <translation>Hash (SHA1)</translation>
+ </message>
+ <message>
+ <source> (gzip compressed)</source>
+ <translation type="vanished"> (gzip-komprimiert)</translation>
</message>
<message>
<source>Format</source>
@@ -1316,7 +1320,7 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
</message>
<message>
<source>Switch to the next file after the specified number of packets have been captured.</source>
- <translation type="unfinished"></translation>
+ <translation>Zur nächsten Datei wechseln wenn die angegebene Anzahl an Paketen aufgezeichnet wurden.</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>
@@ -1451,14 +1455,7 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
</message>
<message>
<source>Multiple files: No file limit given. You must specify a file size, interval, or number of packets for each file.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Multiple files: No file limit given. You must specify a file size or interval at which is switched to the next capture file
- if you want to use multiple files.</source>
- <oldsource>Multiple files: No file limit given. You must specify a file size or duration at which is switched to the next capture file
- if you want to use multiple files.</oldsource>
- <translation type="vanished">Dateisatz: Kein Limit angegeben. Wenn ein Dateisatz genutzt werden soll, muss eine Dateigröße oder eine Laufzeit angegeben werden, bei der zur nächsten Datei gewechselt wird</translation>
+ <translation>Dateisatz: Kein Limit angegeben. Es muss eine Dateigröße, ein Zeitintervall oder eine Paketanzahl definiert werden.</translation>
</message>
</context>
<context>
@@ -3065,6 +3062,10 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<translation>Länge</translation>
</message>
<message>
+ <source> (gzip compressed)</source>
+ <translation type="vanished"> (gzip komprimiert)</translation>
+ </message>
+ <message>
<source>Format</source>
<translation>Format</translation>
</message>
@@ -7489,7 +7490,7 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
</message>
<message>
<source>.</source>
- <translation>.</translation>
+ <translation type="vanished">.</translation>
</message>
<message>
<source>Do you want to save the changes you&apos;ve made%1?</source>
@@ -7877,6 +7878,10 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<translation>Länge</translation>
</message>
<message>
+ <source> (gzip compressed)</source>
+ <translation type="vanished"> (gzip-komprimiert)</translation>
+ </message>
+ <message>
<source>Format</source>
<translation>Format</translation>
</message>
@@ -12741,7 +12746,7 @@ text-decoration: underline;
</message>
<message>
<source>.</source>
- <translation>.</translation>
+ <translation type="vanished">.</translation>
</message>
<message>
<source> You receive automatic updates.</source>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index 8aa629d737..299d34f44b 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -7422,10 +7422,6 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Do you want to save the changes you&apos;ve made%1?</source>
<oldsource>Do you want to save the captured packets</oldsource>
<translation type="unfinished"></translation>
@@ -12537,10 +12533,6 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <source>.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source> You receive automatic updates.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 2849fae41d..7ae533110d 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -914,6 +914,10 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <source> (gzip compressed)</source>
+ <translation type="vanished">(compressé gzip)</translation>
+ </message>
+ <message>
<source>Format</source>
<translation>Format</translation>
</message>
@@ -3033,6 +3037,10 @@ NOTE: Une option DOIT être sélectionnée.</translation>
<translation>Longueur</translation>
</message>
<message>
+ <source> (gzip compressed)</source>
+ <translation type="vanished">(compressé gzip)</translation>
+ </message>
+ <message>
<source>Format</source>
<translation>Format</translation>
</message>
@@ -7459,7 +7467,7 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
</message>
<message>
<source>.</source>
- <translation>.</translation>
+ <translation type="vanished">.</translation>
</message>
<message>
<source>Do you want to save the changes you&apos;ve made%1?</source>
@@ -7841,6 +7849,10 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation>Longueur</translation>
</message>
<message>
+ <source> (gzip compressed)</source>
+ <translation type="vanished">(compressé gzip)</translation>
+ </message>
+ <message>
<source>Format</source>
<translation>Format</translation>
</message>
@@ -12646,10 +12658,6 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <source>.</source>
- <translation type="unfinished">.</translation>
- </message>
- <message>
<source> You receive automatic updates.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index 3d2bb5cf9a..68bd19d924 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -926,15 +926,19 @@
</message>
<message>
<source>Hash (SHA256)</source>
- <translation type="unfinished"></translation>
+ <translation>Hash (SHA256)</translation>
</message>
<message>
<source>Hash (RIPEMD160)</source>
- <translation type="unfinished"></translation>
+ <translation>Hash (RIPEMD160)</translation>
</message>
<message>
<source>Hash (SHA1)</source>
- <translation type="unfinished"></translation>
+ <translation>Hash (SHA1)</translation>
+ </message>
+ <message>
+ <source> (gzip compressed)</source>
+ <translation type="vanished"> (compresso con gzip)</translation>
</message>
<message>
<source>Format</source>
@@ -1316,7 +1320,7 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
</message>
<message>
<source>Switch to the next file after the specified number of packets have been captured.</source>
- <translation type="unfinished"></translation>
+ <translation>Passa al file successivo dopo aver catturato il numero di pacchetti specificato.</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>
@@ -1451,14 +1455,7 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
</message>
<message>
<source>Multiple files: No file limit given. You must specify a file size, interval, or number of packets for each file.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Multiple files: No file limit given. You must specify a file size or interval at which is switched to the next capture file
- if you want to use multiple files.</source>
- <oldsource>Multiple files: No file limit given. You must specify a file size or duration at which is switched to the next capture file
- if you want to use multiple files.</oldsource>
- <translation type="vanished">File multipli: non è stato fornito alcun limite di file. Devi specificare una dimensione del file o l&apos;intervallo trascorso il quale si passa al successivo file di cattura se vuoi utilizzare diversi file.</translation>
+ <translation>File multipli: non è stato fornito alcun limite di file. Devi specificare una dimensione del file, l&apos;intervallo o il numero di pacchetti per ogni file.</translation>
</message>
</context>
<context>
@@ -3065,6 +3062,10 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<translation>Lunghezza</translation>
</message>
<message>
+ <source> (gzip compressed)</source>
+ <translation type="vanished"> (compresso con gzip)</translation>
+ </message>
+ <message>
<source>Format</source>
<translation>Formato</translation>
</message>
@@ -7489,7 +7490,7 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
</message>
<message>
<source>.</source>
- <translation>.</translation>
+ <translation type="vanished">.</translation>
</message>
<message>
<source>Do you want to save the changes you&apos;ve made%1?</source>
@@ -7877,6 +7878,10 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<translation>Lunghezza</translation>
</message>
<message>
+ <source> (gzip compressed)</source>
+ <translation type="vanished"> (compresso con gzip)</translation>
+ </message>
+ <message>
<source>Format</source>
<translation>Formato</translation>
</message>
@@ -12736,7 +12741,7 @@ a:hover {
</message>
<message>
<source>.</source>
- <translation>.</translation>
+ <translation type="vanished">.</translation>
</message>
<message>
<source> You receive automatic updates.</source>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index 958ae122ba..ed21b07936 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -911,6 +911,10 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <source> (gzip compressed)</source>
+ <translation type="vanished"> (gzip圧縮)</translation>
+ </message>
+ <message>
<source>Format</source>
<translation>形式</translation>
</message>
@@ -3021,6 +3025,10 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>長さ</translation>
</message>
<message>
+ <source> (gzip compressed)</source>
+ <translation type="vanished"> (gzip圧縮)</translation>
+ </message>
+ <message>
<source>Format</source>
<translation>フォーマット</translation>
</message>
@@ -7446,7 +7454,7 @@ PLEASE NOTE: One option MUST be selected.</source>
</message>
<message>
<source>.</source>
- <translation>.</translation>
+ <translation type="vanished">.</translation>
</message>
<message>
<source>Do you want to save the changes you&apos;ve made%1?</source>
@@ -7832,6 +7840,10 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>長さ</translation>
</message>
<message>
+ <source> (gzip compressed)</source>
+ <translation type="vanished"> (gzip圧縮)</translation>
+ </message>
+ <message>
<source>Format</source>
<translation>フォーマット</translation>
</message>
@@ -12637,10 +12649,6 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <source>.</source>
- <translation type="unfinished">.</translation>
- </message>
- <message>
<source> You receive automatic updates.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index af3080532b..63e34edb29 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -917,6 +917,10 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <source> (gzip compressed)</source>
+ <translation type="vanished"> (skompresowany gzip)</translation>
+ </message>
+ <message>
<source>Format</source>
<translation>Format</translation>
</message>
@@ -3041,6 +3045,10 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
<translation>Długość</translation>
</message>
<message>
+ <source> (gzip compressed)</source>
+ <translation type="vanished"> (skompresowany gzip)</translation>
+ </message>
+ <message>
<source>Format</source>
<translation>Format</translation>
</message>
@@ -7461,7 +7469,7 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
</message>
<message>
<source>.</source>
- <translation>.</translation>
+ <translation type="vanished">.</translation>
</message>
<message>
<source>Do you want to save the changes you&apos;ve made%1?</source>
@@ -7851,6 +7859,10 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
<translation>Długość</translation>
</message>
<message>
+ <source> (gzip compressed)</source>
+ <translation type="vanished">(skompresowany gzip)</translation>
+ </message>
+ <message>
<source>Format</source>
<translation>Format</translation>
</message>
@@ -12683,10 +12695,6 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <source>.</source>
- <translation type="unfinished">.</translation>
- </message>
- <message>
<source> You receive automatic updates.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index d24accfc19..ace661ca09 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -931,6 +931,10 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <source> (gzip compressed)</source>
+ <translation type="vanished">(gzip 压缩)</translation>
+ </message>
+ <message>
<source>Format</source>
<translation>格式</translation>
</message>
@@ -3042,6 +3046,10 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>长度</translation>
</message>
<message>
+ <source> (gzip compressed)</source>
+ <translation type="vanished"> (gzip 压缩)</translation>
+ </message>
+ <message>
<source>Format</source>
<translation>格式</translation>
</message>
@@ -7463,7 +7471,7 @@ PLEASE NOTE: One option MUST be selected.</source>
</message>
<message>
<source>.</source>
- <translation>.</translation>
+ <translation type="vanished">.</translation>
</message>
<message>
<source>Do you want to save the changes you&apos;ve made%1?</source>
@@ -7849,6 +7857,10 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>长度</translation>
</message>
<message>
+ <source> (gzip compressed)</source>
+ <translation type="vanished">(gzip 压缩)</translation>
+ </message>
+ <message>
<source>Format</source>
<translation>格式</translation>
</message>
@@ -12672,10 +12684,6 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <source>.</source>
- <translation type="unfinished">.</translation>
- </message>
- <message>
<source> You receive automatic updates.</source>
<translation type="unfinished"></translation>
</message>