aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AUTHORS1
-rw-r--r--epan/enterprise-numbers170
-rw-r--r--epan/sminmpec.c41
-rw-r--r--manuf45
-rw-r--r--ui/qt/wireshark_de.ts9
-rw-r--r--ui/qt/wireshark_en.ts7
-rw-r--r--ui/qt/wireshark_fr.ts9
-rw-r--r--ui/qt/wireshark_it.ts9
-rw-r--r--ui/qt/wireshark_ja_JP.ts9
-rw-r--r--ui/qt/wireshark_pl.ts9
-rw-r--r--ui/qt/wireshark_zh_CN.ts9
11 files changed, 274 insertions, 44 deletions
diff --git a/AUTHORS b/AUTHORS
index e490ab4d38..2c89d46fc6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4235,6 +4235,7 @@ T. Scholz <scholzt234[AT]googlemail.com>
Tatsuhiro Tsujikawa <tatsuhiro.t[AT]gmail.com>
Thibault Gerondal <github[AT]tycale.be>
Thies Moeller <thies.moeller[AT]baslerweb.com>
+Thomas Klausner <tk[AT]giga.or.at>
Thomas Portassau <thomas.portassau[AT]hotmail.fr>
Thomas Shen <thomashen[AT]gmail.com>
Tigran Mkrtchyan <tigran.mkrtchyan[AT]desy.de>
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 0307164a89..5da68d4a07 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2016-07-24)
+(last updated 2016-07-31)
SMI Network Management Private Enterprise Codes:
@@ -52246,9 +52246,9 @@ Decimal
Harold Abrker
hvb&dsms.com
13173
- Dilax Intelcom GmbH
- Peter Walter
- walter&dilax.de
+ DILAX Intelcom GmbH
+ Denny Gebel
+ iana&dilax.com
13174
Eglin Air Force Base
Todd Tuckey
@@ -72464,8 +72464,8 @@ da Faculdade de Ciências e Tecnologia da Universidade Nova de Lisboa
project.manager&openca.org
18228
University Of Stuttgart
- Dr. Lisa Golka
- lisa.golka&rus.uni-stuttgart.de
+ Michael Stegmüller
+ Michael.Stegmueller&tik.uni-stuttgart.de
18229
Sonitrol Security Systems of Hartford, Inc.
Marc Swanson
@@ -148461,8 +148461,8 @@ Decentralization / Helenic Public Administra
frank&bikeshophub.com
37220
cPacket Networks Inc.
- Manuel Arias
- manny&cpacket.com
+ Hari Miriyala
+ hari&cpacket.com
37221
TerraVision Pty Ltd
Keven Weber
@@ -176440,7 +176440,7 @@ Decentralization / Helenic Public Administra
Jamison Budacki
jamison.budacki&erieinsurance.com
44215
- Phexon (formerly 'Arsslensoft')
+ Arsslensoft
Arsslen Idadi
arsslens021&gmail.com
44216
@@ -188437,8 +188437,8 @@ Decentralization / Helenic Public Administra
ynaranjo&nechigroup.com
47214
4all Tecnologia
- Gustavo Neto
- gustavo&4all.com
+ Eduardo Hahn
+ infra&4all.com
47215
Markus Losco
Markus Losco
@@ -192535,6 +192535,154 @@ Decentralization / Helenic Public Administra
Optima Tours GmbH
Silvio Šverko
silvio&optimatours.de
+48239
+ Non-public JSC "Krasnaya polyana"
+ Evgeniy Belokon
+ it&karousel.ru
+48240
+ senselan gmbh
+ Martin Kolly
+ martin.kolly&senselan.ch
+48241
+ Neptune and Company, Inc.
+ Seth Sanchez
+ ssanchez&neptuneinc.org
+48242
+ Mindit Services
+ Serban Nistor
+ serban.nistor&mindit.ro
+48243
+ Serban Nistor
+ Serban Nistor
+ serban.nistor&gmail.com
+48244
+ Quantic Vision, S.A.
+ Luis Bethancourt
+ luis.bethancourt&quanticvision.com
+48245
+ Atlas Air
+ timothy cochrane
+ timothy.cochrane&atlasair.com
+48246
+ Mission Microwave Technologies, Inc
+ Chad Deckman
+ chad&missionmicrowave.com
+48247
+ CENTRAL PARK HEMATOLOGY & ONCOLOGY, P.C.
+ David Halvorsen
+ david&cpho.com
+48248
+ innoTel Pty Ltd
+ Andrew Sims
+ info&innotel.com.au
+48249
+ Rohe Automation
+ Georgi Pangev
+ office&rohe-auto.com
+48250
+ 中国广东省深圳市核达中远通电源技术有限公司 (Shenzhen City, Guangdong Province, China COSCO through Nuclear Power Technology Co., Ltd.)
+ 谢先生 (xiejiangbo)
+ xiejiangbo&vapel.com
+48251
+ Liskl Networks, Inc
+ Loren Lisk
+ loren.lisk&liskl.com
+48252
+ Ecole CentraleSupelec
+ Renaud MONNET
+ Renaud.Monnet&CentraleSupelec.fr
+48253
+ OpusV
+ Mark Taylor
+ mark&opusv.com.au
+48254
+ Shaanxi XinTong Intelligent Technology Co., Ltd.
+ zhaoyu jia
+ jiazy&xaxintong.com
+48255
+ DiaSys Diagnostic Systems GmbH
+ Alexander Schwarz
+ a.schwarz&diasys.de
+48256
+ NISHANT.BIZ
+ NISHANT KUMAR
+ NISHANT.ORG&GMAIL.COM
+48257
+ Comoretel
+ Eric Lackore
+ elackore&comoretel.com
+48258
+ SourceClear
+ Pete Kocks
+ operations&srcclr.com
+48259
+ R+V Allgemeine Versicherung AG
+ Axel Panten
+ axel.panten&ruv.de
+48260
+ Guangzhou iplook network technologies Co.,Ltd.
+ Yong Liang
+ liangyong&iplooknetworks.com
+48261
+ Callison Networking Company
+ Christopher Callison
+ chris&callison.org
+48262
+ Tricentis GmbH
+ Heike Artner
+ h.artner&tricentis.com
+48263
+ Noble Markets, LLC
+ Jason Frisvold
+ jason&noblemarkets.net
+48264
+ Mairie de Saint-Maur-des-Fossés
+ Julien Huon
+ admin&mairie-saint-maur.com
+48265
+ Assembly Data System S.p.a.
+ Matteo Patrignanelli
+ matteo.patrignanelli&assembly.it
+48266
+ Mainmetall GmbH & Co. KG
+ Nils Berberich
+ nbe&mainmetall.de
+48267
+ Phexonite
+ Arsslen Idadi
+ arsslens021&gmail.com
+48268
+ c13 LLC
+ Arturo Dumas
+ dumas&c13.us
+48269
+ Info-Tech Research Group
+ PKI Admin
+ iana-pen&infotech.com
+48270
+ MiroNet AG
+ Mathias Seiler
+ noc&mironet.ch
+48271
+ AITelecom S.A. de C.V.
+ Fernando Rodriguez
+ frod&aitelecom.net
+48272
+ Examination Management Services, Inc.
+ Infrastructure Manager
+ infrastructure&emsinet.com
+48273
+ Computer Health
+ Michael Cameron
+ msp&chcorp.ca
+48274
+ Saxion University of Applied Sciences
+ Kick Molenveld
+ k.molenveld&saxion.nl
+48275
+ SingularIT Solutions
+ Jean-Marc Lavoie
+ pen&singularitsol.com
End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index ec05c67d94..76993b1b77 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -13193,7 +13193,7 @@ const value_string sminmpec_values[] = {
{ 13170, "caresys GmbH" },
{ 13171, "Cilys" },
{ 13172, "Dark Side of the Moon Software" },
- { 13173, "Dilax Intelcom GmbH" },
+ { 13173, "DILAX Intelcom GmbH" },
{ 13174, "Eglin Air Force Base" },
{ 13175, "Eurofer" },
{ 13176, "European Bank for Reconstruction and Development" },
@@ -44235,7 +44235,7 @@ const value_string sminmpec_values[] = {
{ 44212, "Oncology Hematology Care of Connecticut, LLC" },
{ 44213, "Happy Gears Inc" },
{ 44214, "Erie Indemnity Company" },
- { 44215, "Phexon (formerly 'Arsslensoft')" },
+ { 44215, "Arsslensoft" },
{ 44216, "FUYOH VIDEO INDUSTRY CO.,LTD." },
{ 44217, "FiberRoad" },
{ 44218, "Buffalo Boots GmbH" },
@@ -48259,6 +48259,43 @@ const value_string sminmpec_values[] = {
{ 48236, "Zschimmer & Schwarz GmbH & Co KG" },
{ 48237, "SOFTEL Corp." },
{ 48238, "Optima Tours GmbH" },
+ { 48239, "Non-public JSC \"Krasnaya polyana\"" },
+ { 48240, "senselan gmbh" },
+ { 48241, "Neptune and Company, Inc." },
+ { 48242, "Mindit Services" },
+ { 48243, "Serban Nistor" },
+ { 48244, "Quantic Vision, S.A." },
+ { 48245, "Atlas Air" },
+ { 48246, "Mission Microwave Technologies, Inc" },
+ { 48247, "CENTRAL PARK HEMATOLOGY & ONCOLOGY, P.C." },
+ { 48248, "innoTel Pty Ltd" },
+ { 48249, "Rohe Automation" },
+ { 48250, "\0344\0270\0255\0345\0233\0275\0345\0271\0277\0344\0270\0234\0347\0234\0201\0346\0267\0261\0345\0234\0263\0345\0270\0202\0346\0240\0270\0350\0276\0276\0344\0270\0255\0350\0277\0234\0351\0200\0232\0347\0224\0265\0346\0272\0220\0346\0212\0200\0346\0234\0257\0346\0234\0211\0351\0231\0220\0345\0205\0254\0345\0217\0270 (Shenzhen City, Guangdong Province, China COSCO through Nuclear Power Technology Co., Ltd.)" },
+ { 48251, "Liskl Networks, Inc" },
+ { 48252, "Ecole CentraleSupelec" },
+ { 48253, "OpusV" },
+ { 48254, "Shaanxi XinTong Intelligent Technology Co., Ltd." },
+ { 48255, "DiaSys Diagnostic Systems GmbH" },
+ { 48256, "NISHANT.BIZ" },
+ { 48257, "Comoretel" },
+ { 48258, "SourceClear" },
+ { 48259, "R+V Allgemeine Versicherung AG" },
+ { 48260, "Guangzhou iplook network technologies Co.,Ltd." },
+ { 48261, "Callison Networking Company" },
+ { 48262, "Tricentis GmbH" },
+ { 48263, "Noble Markets, LLC" },
+ { 48264, "Mairie de Saint-Maur-des-Foss\0303\0251s" },
+ { 48265, "Assembly Data System S.p.a." },
+ { 48266, "Mainmetall GmbH & Co. KG" },
+ { 48267, "Phexonite" },
+ { 48268, "c13 LLC" },
+ { 48269, "Info-Tech Research Group" },
+ { 48270, "MiroNet AG" },
+ { 48271, "AITelecom S.A. de C.V." },
+ { 48272, "Examination Management Services, Inc." },
+ { 48273, "Computer Health" },
+ { 48274, "Saxion University of Applied Sciences" },
+ { 48275, "SingularIT Solutions" },
{ 0, NULL}
};
diff --git a/manuf b/manuf
index 14ad9a9c71..9c2de2d50d 100644
--- a/manuf
+++ b/manuf
@@ -15428,7 +15428,7 @@
00:71:CC HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
00:73:8D Shenzhen # Shenzhen TINNO Mobile Technology Corp.
00:73:E0 SamsungE # Samsung Electronics Co.,Ltd
-00:74:9C RuijieNe # RUIJIE NETWORKS CO., LTD.
+00:74:9C RuijieNe # Ruijie Networks Co.,LTD
00:75:32 InidBv # INID BV
00:75:E1 AmptLlc # Ampt, LLC
00:78:88 CiscoInc # Cisco Systems, Inc
@@ -17506,7 +17506,7 @@
08:5A:E0 Recovisi # Recovision Technology Co., Ltd.
08:5B:0E Fortinet # Fortinet, Inc.
08:5B:DA Clinicar # CliniCare LTD
-08:5D:DD MercuryC # Mercury Corporation
+08:5D:DD MercuryC # MERCURY CORPORATION
08:60:6E AsustekC # ASUSTek COMPUTER INC.
08:62:66 AsustekC # ASUSTek COMPUTER INC.
08:63:61 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
@@ -18222,6 +18222,7 @@
18:F4:6A HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
18:F6:43 Apple # Apple, Inc.
18:F6:50 Multimed # Multimedia Pacific Limited
+18:F7:6B Zhejiang # Zhejiang Winsight Technology CO.,LTD
18:F8:7A I3Intern # i3 International Inc.
18:FA:6F IscAppli # ISC applied systems corp
18:FB:7B Dell # Dell Inc.
@@ -18429,6 +18430,19 @@
1C:BD:0E Amplifie # Amplified Engineering Pty Ltd
1C:BD:B9 D-LinkIn # D-Link International
1C:C0:35 PlanexCo # PLANEX COMMUNICATIONS INC.
+1C:C0:E1 IeeeRegi # IEEE Registration Authority
+1C:C0:E1:00:00:00/28 Shenzhen # Shenzhen Highsharp Electronics Ltd.
+1C:C0:E1:10:00:00/28 Hangzhou # Hangzhou Kaierda Electric Welding Machine Co.,Ltd
+1C:C0:E1:30:00:00/28 Hangzhou # HANGZHOU SOFTEL OPTIC CO., LTD
+1C:C0:E1:40:00:00/28 Alfareal # AlfaReal (Beijing) Technology Co., Ltd.
+1C:C0:E1:50:00:00/28 KidsWire # Kids Wireless Inc
+1C:C0:E1:70:00:00/28 Shenzhen # SHENZHEN KINSTONE D&T DEVELOP CO.,LTD
+1C:C0:E1:80:00:00/28 LxPtyLtd # LX Corporation Pty Ltd
+1C:C0:E1:90:00:00/28 OspiconL # Ospicon Company Limited
+1C:C0:E1:A0:00:00/28 Secheron # SECHERON SA
+1C:C0:E1:B0:00:00/28 ExigentS # Exigent Sensors
+1C:C0:E1:D0:00:00/28 NewlandN # NewLand (NZ) Communication Tech Limited
+1C:C0:E1:E0:00:00/28 YunYangF # Yun Yang Fire Safety Equipment Co.,Ltd.
1C:C1:1A Wavetron # Wavetronix
1C:C1:DE HewlettP # Hewlett Packard
1C:C3:16 Milesigh # MileSight Technology Co., Ltd.
@@ -18733,6 +18747,7 @@
24:BE:05 HewlettP # Hewlett Packard
24:BF:74 Private # Private
24:C0:B3 Rsf # RSF
+24:C1:BD CrrcDali # CRRC DALIAN R&D CO.,LTD.
24:C3:F9 Securita # Securitas Direct AB
24:C4:4A ZteCorpo # zte corporation
24:C6:96 SamsungE # Samsung Electronics Co.,Ltd
@@ -20531,6 +20546,7 @@
44:66:6E Ip-Line # IP-LINE
44:67:55 OrbitIrr # Orbit Irrigation
44:68:AB JuinLimi # JUIN COMPANY, LIMITED
+44:6A:B7 ArrisGro # ARRIS Group, Inc.
44:6C:24 ReallinE # Reallin Electronic Co.,Ltd
44:6D:57 LiteonTe # Liteon Technology Corporation
44:6D:6C SamsungE # Samsung Electronics Co.,Ltd
@@ -20876,7 +20892,6 @@
4C:E1:73:30:00:00/28 Outpacei # outpaceIO
4C:E1:73:40:00:00/28 HuizhouD # Huizhou Dehong Technology Co., Ltd.
4C:E1:73:50:00:00/28 Newvaste # NewVastek
-4C:E1:73:60:00:00/28 ChinaCnr # CHINA CNR CORPORATION LIMITED DALIAN ELECTRIC TRACTION R&D CENTER
4C:E1:73:70:00:00/28 ErsúlesL # Ersúles Limited
4C:E1:73:80:00:00/28 NanjingT # Nanjing Tongke Technology Development Co., LTD
4C:E1:73:90:00:00/28 Shenzhen # Shenzhen Evolution Dynamics Co., Ltd.
@@ -20990,6 +21005,7 @@
50:93:4F GradualT # Gradual Tecnologia Ltda.
50:97:72 Westingh # Westinghouse Digital
50:98:71 Inventum # Inventum Technologies Private Limited
+50:98:F3 RheemAus # Rheem Australia Pty Ltd
50:9E:A7 SamsungE # Samsung Electronics Co.,Ltd
50:9F:27 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
50:9F:3B OiElectr # OI ELECTRIC CO.,LTD
@@ -21248,6 +21264,7 @@
58:2B:DB PaxAb # Pax AB
58:2E:FE Lighting # Lighting Science Group
58:2F:42 Universa # Universal Electric Corporation
+58:31:12 Drust # DRUST
58:32:77 Reliance # Reliance Communications LLC
58:34:3B GlovastT # Glovast Technology Ltd.
58:35:D9 CiscoInc # Cisco Systems, Inc
@@ -21281,7 +21298,7 @@
58:67:1A Barnes&N # Barnes&Noble
58:67:7F ClareCon # Clare Controls Inc.
58:68:5D TempoAus # Tempo Australia Pty Ltd
-58:69:6C RuijieNe # Ruijie Networks Co.,LTD.
+58:69:6C RuijieNe # Ruijie Networks Co.,LTD
58:69:F9 FusionTr # Fusion Transactive Ltd.
58:6A:B1 Hangzhou # Hangzhou H3C Technologies Co., Limited
58:6D:8F Cisco-Li # Cisco-Linksys, LLC
@@ -22188,6 +22205,7 @@
70:18:8B HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
70:1A:04 LiteonTe # Liteon Technology Corporation
70:1A:ED Advas # ADVAS CO., LTD.
+70:1C:E7 IntelCor # Intel Corporate
70:1D:7F ComtechT # Comtech Technology Co., Ltd.
70:1D:C4 Northsta # NorthStar Battery Company, LLC
70:23:93 Fos4xGmb # fos4X GmbH
@@ -22816,6 +22834,7 @@
70:B3:D5:5F:F0:00/36 VaisalaO # Vaisala Oyj
70:B3:D5:60:00:00/36 Stellwer # Stellwerk GmbH
70:B3:D5:60:50:00/36 AplexTec # Aplex Technology Inc.
+70:B3:D5:60:70:00/36 Ateme # ATEME
70:B3:D5:60:90:00/36 PbsiGrou # PBSI Group Limited
70:B3:D5:60:B0:00/36 Edgeware # Edgeware AB
70:B3:D5:60:C0:00/36 IstElekt # IST ElektronikgesmbH
@@ -22851,6 +22870,7 @@
70:B3:D5:66:00:00/36 SmartSer # Smart Service Technologies CO., LTD
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:B0:00/36 Innitive # Innitive B.V.
70:B3:D5:67:10:00/36 SeaShell # Sea Shell Corporation
70:B3:D5:67:90:00/36 Emac # EMAC, Inc.
@@ -22866,6 +22886,7 @@
70:B3:D5:6A:00:00/36 ActiveRe # Active Research Limited
70:B3:D5:6A:10:00/36 GlialTec # GLIAL TECHNOLOGY
70:B3:D5:6A:50:00/36 AkenoriP # Akenori PTE LTD
+70:B3:D5:6A:80:00/36 VitschEl # Vitsch Electronics
70:B3:D5:6A:90:00/36 OhmoriEl # OHMORI ELECTRIC INDUSTRIES CO.LTD
70:B3:D5:6B:30:00/36 Duracomm # DuraComm Corporation
70:B3:D5:6B:50:00/36 ArtSpa # ART SPA
@@ -23162,6 +23183,7 @@
70:B3:D5:A2:C0:00/36 Tlv # TLV CO., LTD.
70:B3:D5:A2:E0:00/36 KokamLtd # Kokam Co., Ltd
70:B3:D5:A2:F0:00/36 BotekAb # Botek Systems AB
+70:B3:D5:A3:30:00/36 Tiama # TIAMA
70:B3:D5:A3:B0:00/36 GraceDes # Grace Design/Lunatec LLC
70:B3:D5:A3:C0:00/36 WaveMusi # Wave Music Ltd
70:B3:D5:A4:00:00/36 StrackLi # STRACK LIFT AUTOMATION GmbH
@@ -23178,6 +23200,7 @@
70:B3:D5:A5:90:00/36 Muuntosä # Muuntosähkö Oy - Trafox
70:B3:D5:A5:A0:00/36 RcsEnerg # RCS Energy Management Ltd
70:B3:D5:A5:B0:00/36 ChristEl # Christ Elektronik GmbH
+70:B3:D5:A5:C0:00/36 Molekule # Molekule
70:B3:D5:A5:E0:00/36 Conectai # ConectaIP Tecnologia S.L.
70:B3:D5:A6:20:00/36 Environe # Environexus
70:B3:D5:A6:60:00/36 TrapezeS # Trapeze Software Group Inc
@@ -23189,6 +23212,7 @@
70:B3:D5:A7:A0:00/36 FluidMan # Fluid Management Technology
70:B3:D5:A7:C0:00/36 Transele # Transelektronik Messgeräte GmbH
70:B3:D5:A8:10:00/36 SiendaNe # Sienda New Media Technologies GmbH
+70:B3:D5:A8:E0:00/36 OmeshCit # OMESH CITY GROUP
70:B3:D5:A9:10:00/36 IdealInd # IDEAL INDUSTRIES Ltd t/a Casella
70:B3:D5:A9:20:00/36 Grossenb # Grossenbacher Systeme AG
70:B3:D5:A9:30:00/36 MesCommu # Mes Communication Co., Ltd
@@ -23356,8 +23380,10 @@
70:B3:D5:C7:70:00/36 YönnetAk # Yönnet Akıllı Bina ve Otomasyon Sistemleri
70:B3:D5:C7:80:00/36 NetaElek # NETA Elektronik AS
70:B3:D5:C7:F0:00/36 TattileS # TATTILE SRL
+70:B3:D5:C8:00:00/36 LinkCare # Link Care Services
70:B3:D5:C8:10:00/36 DspDesig # DSP DESIGN
70:B3:D5:C8:50:00/36 SolidSta # Solid State Disks Ltd
+70:B3:D5:C8:60:00/36 Woodam # Woodam Co., Ltd.
70:B3:D5:C8:70:00/36 SiemensA # Siemens AG
70:B3:D5:C8:80:00/36 SinedSrl # SINED srl
70:B3:D5:C8:90:00/36 Ard # ARD
@@ -23549,6 +23575,7 @@
70:B3:D5:EB:10:00/36 CpContec # CP contech electronic GmbH
70:B3:D5:EB:20:00/36 ShooterD # Shooter Detection Systems
70:B3:D5:EB:70:00/36 Skreens # Skreens
+70:B3:D5:EB:D0:00/36 MidbitTe # midBit Technologies, LLC
70:B3:D5:EC:10:00/36 XafaxNed # Xafax Nederland bv
70:B3:D5:EC:60:00/36 Esii # ESII
70:B3:D5:EC:A0:00/36 Transtro # Transtronic AB
@@ -23585,6 +23612,7 @@
70:B3:D5:F2:D0:00/36 IdLockAs # ID Lock AS
70:B3:D5:F2:E0:00/36 Shanghai # Shanghai JCY Technology Company
70:B3:D5:F3:40:00/36 MacgrayS # MacGray Services
+70:B3:D5:F3:50:00/36 Carbontr # carbonTRACK
70:B3:D5:F3:60:00/36 Dinosys # dinosys
70:B3:D5:F3:80:00/36 Scanvaeg # Scanvaegt Nordic A/S
70:B3:D5:F3:90:00/36 ZenrosAp # Zenros ApS
@@ -24143,6 +24171,7 @@
7C:20:48 Koamtac # KoamTac
7C:20:64 Alcatel- # Alcatel-Lucent IPD
7C:25:87 Chaowifi # chaowifi.com
+7C:26:34 ArrisGro # ARRIS Group, Inc.
7C:2B:E1 Shenzhen # Shenzhen Ferex Electrical Co.,Ltd
7C:2C:F3 SecureEl # Secure Electrans Ltd
7C:2E:0D Blackmag # Blackmagic Design
@@ -24373,6 +24402,7 @@
80:57:19 SamsungE # Samsung Electronics Co.,Ltd
80:58:C5 NovatecK # NovaTec Kommunikationstechnik GmbH
80:59:FD Noviga # Noviga
+80:5E:C0 YealinkX # YEALINK(XIAMEN) NETWORK TECHNOLOGY CO.,LTD.
80:60:07 Rim # RIM
80:61:8F Shenzhen # Shenzhen sangfei consumer communications co.,ltd
80:64:59 Nimbus # Nimbus Inc.
@@ -25475,6 +25505,7 @@
98:DE:D0 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD.
98:E0:D9 Apple # Apple, Inc.
98:E1:65 Accutome # Accutome
+98:E4:76 Zentan # Zentan
98:E7:9A FoxconnN # Foxconn(NanJing) Communication Co.,Ltd.
98:E7:F4 HewlettP # Hewlett Packard
98:E7:F5 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
@@ -25572,6 +25603,7 @@
9C:7D:A3 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
9C:80:7D Syscable # SYSCABLE Korea Inc.
9C:80:DF Arcadyan # Arcadyan Technology Corporation
+9C:83:BF Pro-Visi # PRO-VISION, Inc.
9C:86:DA PhoenixG # Phoenix Geophysics Ltd.
9C:88:88 SimacTec # Simac Techniek NV
9C:88:AD Fiberhom # Fiberhome Telecommunication Technologies Co.,LTD
@@ -25647,6 +25679,7 @@
9C:F6:7D RicardoP # Ricardo Prague, s.r.o.
9C:F8:DB Shenzhen # shenzhen eyunmei technology co,.ltd
9C:F9:38 ArevaNpG # AREVA NP GmbH
+9C:FB:D5 VivoMobi # vivo Mobile Communication Co., Ltd.
9C:FB:F1 Mesomati # MESOMATIC GmbH & Co.KG
9C:FC:01 Apple # Apple, Inc.
9C:FF:BE Otsl # OTSL Inc.
@@ -26059,6 +26092,7 @@ A8:1B:5A Guangdon # GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.
A8:1B:5D FoxtelMa # Foxtel Management Pty Ltd
A8:1B:6A TexasIns # Texas Instruments
A8:1D:16 Azurewav # AzureWave Technology Inc.
+A8:1E:84 QuantaCo # QUANTA COMPUTER INC.
A8:1F:AF KryptonP # KRYPTON POLSKA
A8:20:66 Apple # Apple, Inc.
A8:24:EB ZaoNpoIn # ZAO NPO Introtest
@@ -26350,6 +26384,7 @@ AC:F0:B2 BeckerEl # Becker Electronics Taiwan Ltd.
AC:F1:DF D-LinkIn # D-Link International
AC:F2:C5 CiscoInc # Cisco Systems, Inc
AC:F7:F3 XiaomiCo # Xiaomi Communications Co Ltd
+AC:F8:5C Private # Private
AC:F9:7E Elesys # ELESYS INC.
AC:FD:93 WeifangG # Weifang GoerTek Electronics Co., Ltd.
AC:FD:CE IntelCor # Intel Corporate
@@ -27624,6 +27659,7 @@ CC:8C:E3 TexasIns # Texas Instruments
CC:90:93 HansongT # Hansong Tehnologies
CC:91:2B TeConnec # TE Connectivity Touch Solutions
CC:94:4A Pfeiffer # Pfeiffer Vacuum GmbH
+CC:94:70 Kinestra # Kinestral Technologies, Inc.
CC:95:D7 VizioInc # Vizio, Inc
CC:96:35 Lvs # LVS Co.,Ltd.
CC:96:A0 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
@@ -28528,6 +28564,7 @@ E0:D1:E6 AliphDba # Aliph dba Jawbone
E0:D3:1A EquesTec # EQUES Technology Co., Limited
E0:D7:BA TexasIns # Texas Instruments
E0:D9:A2 HippihAp # Hippih aps
+E0:D9:E3 EltexEnt # Eltex Enterprise Ltd.
E0:DA:DC JvcKenwo # JVC KENWOOD Corporation
E0:DB:10 SamsungE # Samsung Electronics Co.,Ltd
E0:DB:55 Dell # Dell Inc.
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 0cbe5759c5..2c7293d60c 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -1806,8 +1806,9 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
</message>
<message>
<location filename="coloring_rules_dialog.cpp" line="362"/>
- <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</source>
- <translation>Wireshark erkennt eine oder mehrere der Einfärbungsregeln nicht. Speichern verwirft diese.</translation>
+ <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
+ <oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
+ <translation type="unfinished">Wireshark erkennt eine oder mehrere der Einfärbungsregeln nicht. Speichern verwirft diese.</translation>
</message>
<message>
<location filename="coloring_rules_dialog.cpp" line="375"/>
@@ -2640,12 +2641,12 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<context>
<name>ExtcapArgumentFileSelection</name>
<message>
- <location filename="extcap_argument_file.cpp" line="112"/>
+ <location filename="extcap_argument_file.cpp" line="113"/>
<source>All Files (</source>
<translation>Alle Dateien (</translation>
</message>
<message>
- <location filename="extcap_argument_file.cpp" line="121"/>
+ <location filename="extcap_argument_file.cpp" line="122"/>
<source>Open File</source>
<translation>Öffne Datei</translation>
</message>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index d49dc732e2..cc36f08edb 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -1798,7 +1798,8 @@ PLEASE NOTE: One option MUST be selected.</source>
</message>
<message>
<location filename="coloring_rules_dialog.cpp" line="362"/>
- <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</source>
+ <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
+ <oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2625,12 +2626,12 @@ PLEASE NOTE: One option MUST be selected.</source>
<context>
<name>ExtcapArgumentFileSelection</name>
<message>
- <location filename="extcap_argument_file.cpp" line="112"/>
+ <location filename="extcap_argument_file.cpp" line="113"/>
<source>All Files (</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="extcap_argument_file.cpp" line="121"/>
+ <location filename="extcap_argument_file.cpp" line="122"/>
<source>Open File</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index f701906029..6e70f2fdcc 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -1807,8 +1807,9 @@ si vous voulez utiliser des fichiers multiples.</translation>
</message>
<message>
<location filename="coloring_rules_dialog.cpp" line="362"/>
- <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</source>
- <translation>Wireshark ne reconnaît pas une ou plusieurs de vos règles de coloriage. Sauvegarder les supprimera.</translation>
+ <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
+ <oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
+ <translation type="unfinished">Wireshark ne reconnaît pas une ou plusieurs de vos règles de coloriage. Sauvegarder les supprimera.</translation>
</message>
<message>
<location filename="coloring_rules_dialog.cpp" line="375"/>
@@ -2641,12 +2642,12 @@ si vous voulez utiliser des fichiers multiples.</translation>
<context>
<name>ExtcapArgumentFileSelection</name>
<message>
- <location filename="extcap_argument_file.cpp" line="112"/>
+ <location filename="extcap_argument_file.cpp" line="113"/>
<source>All Files (</source>
<translation>Tous les Fichiers (</translation>
</message>
<message>
- <location filename="extcap_argument_file.cpp" line="121"/>
+ <location filename="extcap_argument_file.cpp" line="122"/>
<source>Open File</source>
<translation>Ouvrir un fichier</translation>
</message>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index 4d3fedcd3f..aa79f166e8 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -1806,8 +1806,9 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
</message>
<message>
<location filename="coloring_rules_dialog.cpp" line="362"/>
- <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</source>
- <translation>Wireshark non riconosce una o più delle tue regole di colorazione. Il salvataggio le rimuoverà.</translation>
+ <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
+ <oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
+ <translation type="unfinished">Wireshark non riconosce una o più delle tue regole di colorazione. Il salvataggio le rimuoverà.</translation>
</message>
<message>
<location filename="coloring_rules_dialog.cpp" line="375"/>
@@ -2640,12 +2641,12 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<context>
<name>ExtcapArgumentFileSelection</name>
<message>
- <location filename="extcap_argument_file.cpp" line="112"/>
+ <location filename="extcap_argument_file.cpp" line="113"/>
<source>All Files (</source>
<translation>Tutti i file (</translation>
</message>
<message>
- <location filename="extcap_argument_file.cpp" line="121"/>
+ <location filename="extcap_argument_file.cpp" line="122"/>
<source>Open File</source>
<translation>Apri file</translation>
</message>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index 852f68eeed..a62c054c9b 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -1803,8 +1803,9 @@ PLEASE NOTE: One option MUST be selected.</source>
</message>
<message>
<location filename="coloring_rules_dialog.cpp" line="362"/>
- <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</source>
- <translation>Wiresharkはひとつかそれ以上の色付けルールを認識できません。保存は破棄されます。</translation>
+ <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
+ <oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
+ <translation type="unfinished">Wiresharkはひとつかそれ以上の色付けルールを認識できません。保存は破棄されます。</translation>
</message>
<message>
<location filename="coloring_rules_dialog.cpp" line="375"/>
@@ -2636,12 +2637,12 @@ PLEASE NOTE: One option MUST be selected.</source>
<context>
<name>ExtcapArgumentFileSelection</name>
<message>
- <location filename="extcap_argument_file.cpp" line="112"/>
+ <location filename="extcap_argument_file.cpp" line="113"/>
<source>All Files (</source>
<translation>すべてのファイル(</translation>
</message>
<message>
- <location filename="extcap_argument_file.cpp" line="121"/>
+ <location filename="extcap_argument_file.cpp" line="122"/>
<source>Open File</source>
<translation>ファイルを開く</translation>
</message>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index 4dc8ec2ffe..85c970c91c 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -1805,8 +1805,9 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
</message>
<message>
<location filename="coloring_rules_dialog.cpp" line="362"/>
- <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</source>
- <translation>Wireshark nie rozpoznał jednej lub wększej ilości twoich reguł kolorowania.Zapis spowoduje usunięcie ich.</translation>
+ <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
+ <oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
+ <translation type="unfinished">Wireshark nie rozpoznał jednej lub wększej ilości twoich reguł kolorowania.Zapis spowoduje usunięcie ich.</translation>
</message>
<message>
<location filename="coloring_rules_dialog.cpp" line="375"/>
@@ -2639,12 +2640,12 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
<context>
<name>ExtcapArgumentFileSelection</name>
<message>
- <location filename="extcap_argument_file.cpp" line="112"/>
+ <location filename="extcap_argument_file.cpp" line="113"/>
<source>All Files (</source>
<translation>Wszystkie pliki (</translation>
</message>
<message>
- <location filename="extcap_argument_file.cpp" line="121"/>
+ <location filename="extcap_argument_file.cpp" line="122"/>
<source>Open File</source>
<translation>Otwórz plik</translation>
</message>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 9932914c78..ffc143b801 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -1805,8 +1805,9 @@ PLEASE NOTE: One option MUST be selected.</source>
</message>
<message>
<location filename="coloring_rules_dialog.cpp" line="362"/>
- <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</source>
- <translation>Wireshark 无法识别您的一个或多个着色规则。保存将会丢弃它们。</translation>
+ <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
+ <oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
+ <translation type="unfinished">Wireshark 无法识别您的一个或多个着色规则。保存将会丢弃它们。</translation>
</message>
<message>
<location filename="coloring_rules_dialog.cpp" line="375"/>
@@ -2639,12 +2640,12 @@ PLEASE NOTE: One option MUST be selected.</source>
<context>
<name>ExtcapArgumentFileSelection</name>
<message>
- <location filename="extcap_argument_file.cpp" line="112"/>
+ <location filename="extcap_argument_file.cpp" line="113"/>
<source>All Files (</source>
<translation>所有文件 (</translation>
</message>
<message>
- <location filename="extcap_argument_file.cpp" line="121"/>
+ <location filename="extcap_argument_file.cpp" line="122"/>
<source>Open File</source>
<translation>打开文件</translation>
</message>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 00:51:43 +0000