[Automatic update for 2018-03-25]

Update manuf, services enterprise numbers, translations, and other items.

Change-Id: Ie7d9f2b00222e5ed4e05b5c3fc9100ad26e65084
Reviewed-on: https://code.wireshark.org/review/26635
Reviewed-by: Gerald Combs <gerald@wireshark.org>

diff --git a/AUTHORS b/AUTHORS
index 23b4edda974816b3d975e6ca19fb25bbe02525e4..6f4bd59a6d6b0349a1510d4b6712c06584d4576e 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -4182,6 +4182,7 @@ Ilya Gavrilov             <ilya.dev[AT]gmail.com>
 Ionut Ceausu           <ionut.ceausu[AT]gmail.com>
 Ivan Ermakov           <iermakov[AT]yahoo.com>
 Ivan Nardi             <nardi.ivan[AT]gmail.com>
+Ivan Secerin           <ivan.severin.m[AT]gmail.com>
 J. Bruce Fields                <bfields[AT]redhat.com>
 JC Wren                        <jcwren[AT]jcwren.com>
 Jaime Caamaño Ruiz    <jaime.caamano.ruiz[AT]ericsson.com>
@@ -4334,6 +4335,7 @@ Nicolas BERTIN            <nicolas.bertin[AT]al-enterprise.com>
 Nicolas Cavallari      <nicolas.cavallari[AT]green-communications.fr>
 Nicolas Darchis                <ndarchis[AT]cisco.com>
 Nicolas S. Dade                <nic.dade[AT]gmail.com>
+Nikhil AP              <nikhilap[AT]arista.com>
 Nikolai Ipatyev                <wallprime[AT]yandex.com>
 Nils Ohlmeier          <github[AT]ohlmeier.org>
 Nitzan Carmi           <nitzanc[AT]mellanox.com>
@@ -4505,7 +4507,9 @@ Yan Burman                <yanb[AT]mellanox.com>
 Yang Luo               <hsluoyz[AT]qq.com>
 Yann Diorcet           <yann[AT]diorcet.fr>
 Yann Lejeune           <ylejeune[AT]netyl.org>
+Yasuyuki Tanaka                <yasuyuki.tanaka[AT]inria.fr>
 Yasuyuki Tanaka                <yatch1.tanaka[AT]toshiba.co.jp>
+Yuri Chislov           <yuri.chislov[AT]gmail.com>
 Yurii Lysyi            <yurii.lysyi[AT]ericsson.com>
 Yury Gargay            <yury.gargay[AT]gmail.com>
 Zdeněk Žamberský    <zzdevel[AT]seznam.cz>

diff --git a/enterprises.tsv b/enterprises.tsv
index 31cb93f29de8f11281cb99136dcf6e7cb55c91c8..d30fcaa2ff1be44249406101e309c4d8ae721252 100644 (file)
--- 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-03-17)
+# (last updated 2018-03-24)
 
 0      Reserved
 1      NxNetworks
@@ -51446,7 +51446,7 @@
 51631  Bocom BBM
 51632  AND Agency
 51633  Eurotel Bilgi Iletisim Sistemleri A.S.
-51634  RobotSzoft
+51634  RobotSzoft Kft
 51635  PagerDuty, Inc.
 51636  CEGI
 51637  Ovostar Union
@@ -51457,3 +51457,57 @@
 51642  IIC Workshop
 51643  Janus Henderson Investors
 51644  IP-Only Networks AB
+51645  The Trustee for KM Licence Trust
+51646  Becker Nachrichtentechnik GmbH
+51647  Rennes Métropole
+51648  Ingenico e-Commerce Solutions
+51649  BHS Corrugated Maschinen- und Anlagenbau GmbH
+51650  St. Nikolaus-Hospital
+51651  Piekarnia Oskroba S.A.
+51652  DEA Deutsche Erdoel AG
+51653  NorthWestern Energy
+51654  Convergence Systems Limited
+51655  H W Communications Limited
+51656  Xtiva Financial Systems Inc
+51657  marclachapelle.com
+51658  Transports GUILMET
+51659  0x19e Networks
+51660  Combat Networks Inc.
+51661  FRPC JSC RPA Mars
+51662  Telna Inc
+51663  Maspex  Sp. z o.o. Sp.K.
+51664  Kodegenix
+51665  South Carolina Law Enforcement Division
+51666  iC Consult GmbH
+51667  BroadSource Group Pty Ltd
+51668  Dannes transport i Rengsjö
+51669  Qeshm paya pars
+51670  Parspooyesh
+51671  Silk Road Infrastructure Communication Development Co
+51672  payammail
+51673  Sanjesh Afzar Asia
+51674  TEACHERS MUTUAL BANK LIMITED
+51675  FaSTTUBe
+51676  Cloud Kom d.o.o
+51677  NIL Ltd.
+51678  Intrising Networks, Inc.
+51679  GIAL
+51680  mSensis S.A.
+51681  Dr. KADE Pharmazeutische Fabrik GmbH
+51682  Rebex CR, s.r.o.
+51683  MegaDrive
+51684  Umdasch Digital Retail GmbH
+51685  verdict id limited
+51686  Flexential
+51687  SRG Radiology
+51688  The Pictsweet Company
+51689  EverTrust
+51690  Idsu
+51691  ANIMALL
+51692  Bluetest AB
+51693  Smarting
+51694  Feistritzwerke-STEWEAG-GmbH
+51695  DARZ GmbH
+51696  Massachusetts Financial Services Company
+51697  Anywave Communication Technologies INC
+51698  Netbytes, Inc.

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index b85b5dedcc3c961f510e4b354fc3b589965dab04..dc8de4954e0d82a15f9a3abc448e385f128be80c 100644 (file)
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -38,7 +38,9 @@ static const value_string usb_vendors_vals[] = {
     { 0x0004, "Nebraska Furniture Mart" },
     { 0x0011, "Unknown" },
     { 0x0053, "Planex" },
+    { 0x0078, "Microntek" },
     { 0x0079, "DragonRise Inc." },
+    { 0x0085, "Boeye Technology Co., Ltd." },
     { 0x0105, "Trust International B.V." },
     { 0x0127, "IBP" },
     { 0x0145, "Unknown" },
@@ -47,6 +49,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x0204, "Chipsbank Microelectronics Co., Ltd" },
     { 0x0218, "Hangzhou Worlde" },
     { 0x02ad, "HUMAX Co., Ltd." },
+    { 0x0303, "Mini Automation Controller" },
     { 0x0324, "OCZ Technology Inc" },
     { 0x0325, "OCZ Technology Inc" },
     { 0x0386, "LTS" },
@@ -3036,8 +3039,14 @@ static const value_string usb_products_vals[] = {
     { 0x00017778, "Counterfeit flash drive [Kingston]" },
     { 0x00117788, "counterfeit flash drive" },
     { 0x00535301, "GW-US54ZGL 802.11bg" },
+    { 0x00780006, "Joystick" },
     { 0x00790006, "PC TWIN SHOCK Gamepad" },
     { 0x00790011, "Gamepad" },
+    { 0x00791800, "Mayflash Wii U Pro Game Controller Adapter [DirectInput]" },
+    { 0x0079181b, "Venom Arcade Joystick" },
+    { 0x00791843, "Mayflash GameCube Controller Adapter" },
+    { 0x00791844, "Mayflash GameCube Controller" },
+    { 0x00850600, "eBook Reader" },
     { 0x0105145f, "NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211]" },
     { 0x01270002, "HDM Interface" },
     { 0x01270127, "ibp" },
@@ -3407,6 +3416,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f02a1d, "Integrated Module with Bluetooth 2.1 Wireless technology" },
     { 0x03f02b11, "PSC 2170 series" },
     { 0x03f02b17, "LaserJet 1020" },
+    { 0x03f02b4a, "Business Slim Keyboard" },
     { 0x03f02c12, "Officejet J4680" },
     { 0x03f02c17, "LaserJet 1022" },
     { 0x03f02c24, "Logitech M-UAL-96 Mouse" },
@@ -3460,10 +3470,12 @@ static const value_string usb_products_vals[] = {
     { 0x03f03a02, "PhotoSmart 7150" },
     { 0x03f03a11, "OfficeJet 5500 series" },
     { 0x03f03a17, "Printing Support" },
+    { 0x03f03a1d, "hs2340 HSPA+ mobile broadband" },
     { 0x03f03b02, "PhotoSmart 7150~" },
     { 0x03f03b05, "Scanjet N8460" },
     { 0x03f03b11, "PSC 1300 series" },
     { 0x03f03b17, "LaserJet M1005 MFP" },
+    { 0x03f03b2a, "Color LaserJet MFP M277dw" },
     { 0x03f03c02, "PhotoSmart 7350" },
     { 0x03f03c05, "Scanjet Professional 1000 Mobile Scanner" },
     { 0x03f03c11, "PSC 1358" },
@@ -3781,8 +3793,12 @@ static const value_string usb_products_vals[] = {
     { 0x0403a951, "HCP HIT GSM/GPRS modem [Cinterion MC55i]" },
     { 0x0403a9a0, "FT2232D - Dual UART/FIFO IC - FTDI" },
     { 0x0403abb8, "Lego Mindstorms NXTCam" },
+    { 0x0403b0c0, "microSensys RFID device" },
+    { 0x0403b0c1, "microSensys RFID device" },
     { 0x0403b0c2, "iID contactless RFID device" },
     { 0x0403b0c3, "iID contactless RFID device" },
+    { 0x0403b0c4, "RFID device" },
+    { 0x0403b0c5, "RFID device" },
     { 0x0403b810, "US Interface Navigator (CAT and 2nd PTT lines)" },
     { 0x0403b811, "US Interface Navigator (WKEY and FSK lines)" },
     { 0x0403b812, "US Interface Navigator (RS232 and CONFIG lines)" },
@@ -4612,15 +4628,19 @@ static const value_string usb_products_vals[] = {
     { 0x04242602, "USB 2.0 Hub" },
     { 0x04242640, "USB 2.0 Hub" },
     { 0x04242660, "Hub" },
+    { 0x0424274d, "HTC Hub Controller" },
+    { 0x04243fcc, "RME MADIface" },
     { 0x04244041, "Hub and media card controller" },
     { 0x04244060, "Ultra Fast Media Reader" },
     { 0x04244064, "Ultra Fast Media Reader" },
     { 0x04245434, "Hub" },
     { 0x04245534, "Hub" },
     { 0x04247500, "LAN7500 Ethernet 10/100/1000 Adapter" },
+    { 0x04249500, "LAN9500/LAN9500i" },
     { 0x04249512, "SMC9512/9514 USB Hub" },
     { 0x04249514, "SMC9514 Hub" },
     { 0x04249904, "LAN9512/LAN9514 Ethernet 10/100 Adapter (SAL10)" },
+    { 0x04249e00, "LAN9500A/LAN9500Ai" },
     { 0x0424a700, "2 Port Hub" },
     { 0x0424ec00, "SMSC9512/9514 Fast Ethernet Adapter" },
     { 0x04250101, "G-Tech Wireless Mouse & Keyboard" },
@@ -4845,6 +4865,10 @@ static const value_string usb_products_vals[] = {
     { 0x044f0402, "HOTAS Warthog Joystick" },
     { 0x044f0404, "HOTAS Warthog Throttle" },
     { 0x044f044f, "GP XID" },
+    { 0x044f0f00, "Steering Wheel for Xbox" },
+    { 0x044f0f03, "Steering Wheel for Xbox" },
+    { 0x044f0f07, "Controller for Xbox" },
+    { 0x044f0f10, "Modena GT Wheel" },
     { 0x044fa003, "Rage 3D Game Pad" },
     { 0x044fa01b, "PK-GP301 Driving Wheel" },
     { 0x044fa0a0, "Top Gun Joystick" },
@@ -4862,6 +4886,7 @@ static const value_string usb_products_vals[] = {
     { 0x044fb315, "Firestorm Dual Analog 3" },
     { 0x044fb323, "Dual Trigger 3-in-1 (PC Mode)" },
     { 0x044fb324, "Dual Trigger 3-in-1 (PS3 Mode)" },
+    { 0x044fb326, "Gamepad GP XID" },
     { 0x044fb603, "force feedback Wheel" },
     { 0x044fb605, "force feedback Racing Wheel" },
     { 0x044fb651, "Ferrari GT Rumble Force Wheel" },
@@ -5149,15 +5174,17 @@ static const value_string usb_products_vals[] = {
     { 0x045e02ae, "Xbox NUI Camera" },
     { 0x045e02b0, "Xbox NUI Motor" },
     { 0x045e02b6, "Xbox360 Bluetooth Wireless Headset" },
+    { 0x045e02bb, "Kinect Audio" },
     { 0x045e02be, "Kinect for Windows NUI Audio" },
     { 0x045e02bf, "Kinect for Windows NUI Camera" },
     { 0x045e02c2, "Kinect for Windows NUI Motor" },
     { 0x045e02d1, "Xbox One Controller" },
     { 0x045e02d5, "Xbox One Digital TV Tuner" },
-    { 0x045e02dd, "Xbox One Controller (Covert Forces/Firmware 2015)" },
+    { 0x045e02dd, "Xbox One Controller (Firmware 2015)" },
     { 0x045e02e3, "Xbox One Elite Controller" },
     { 0x045e02e6, "Wireless XBox Controller Dongle" },
     { 0x045e02ea, "Xbox One S Controller" },
+    { 0x045e02fd, "Xbox One S Controller [Bluetooth]" },
     { 0x045e0400, "Windows Powered Pocket PC 2002" },
     { 0x045e0401, "Windows Powered Pocket PC 2002" },
     { 0x045e0402, "Windows Powered Pocket PC 2002" },
@@ -5405,7 +5432,7 @@ static const value_string usb_products_vals[] = {
     { 0x046a0010, "SmartBoard XX44" },
     { 0x046a0011, "G83 (RS 6000) Keyboard" },
     { 0x046a0021, "CyMotion Expert Combo" },
-    { 0x046a0023, "CyMotion Master Linux Keyboard G230" },
+    { 0x046a0023, "Keyboard" },
     { 0x046a0027, "CyMotion Master Solar Keyboard" },
     { 0x046a002a, "Wireless Mouse & Keyboard" },
     { 0x046a002d, "SmartTerminal XX44" },
@@ -5415,6 +5442,7 @@ static const value_string usb_products_vals[] = {
     { 0x046a0041, "G86 6240 Keyboard" },
     { 0x046a0080, "eHealth Terminal ST 1503" },
     { 0x046a0081, "eHealth Keyboard G87 1504" },
+    { 0x046a00a1, "SmartCard Reader Keyboard KC 1000 SC" },
     { 0x046a0106, "R-300 Wireless Mouse Receiver" },
     { 0x046a010d, "MX-Board 3.0 Keyboard" },
     { 0x046ab090, "Keyboard" },
@@ -5427,6 +5455,7 @@ static const value_string usb_products_vals[] = {
     { 0x046d0082, "Acer Aspire 5672 Webcam" },
     { 0x046d0200, "WingMan Extreme Joystick" },
     { 0x046d0203, "M2452 Keyboard" },
+    { 0x046d0242, "Chillstream for Xbox 360" },
     { 0x046d0301, "M4848 Mouse" },
     { 0x046d0401, "HP PageScan" },
     { 0x046d0402, "NEC PageScan" },
@@ -5447,6 +5476,7 @@ static const value_string usb_products_vals[] = {
     { 0x046d081d, "HD Webcam C510" },
     { 0x046d0820, "QuickCam VC" },
     { 0x046d0821, "HD Webcam C910" },
+    { 0x046d0823, "HD Webcam B910" },
     { 0x046d0825, "Webcam C270" },
     { 0x046d0826, "HD Webcam C525" },
     { 0x046d0828, "HD Webcam B990" },
@@ -5672,9 +5702,9 @@ static const value_string usb_products_vals[] = {
     { 0x046dc213, "J-UH16 (Freedom 2.4 Cordless Joystick)" },
     { 0x046dc214, "ATK3 (Attack III Joystick)" },
     { 0x046dc215, "Extreme 3D Pro" },
-    { 0x046dc216, "Dual Action Gamepad" },
-    { 0x046dc218, "Logitech RumblePad 2 USB" },
-    { 0x046dc219, "Cordless RumblePad 2" },
+    { 0x046dc216, "F310 Gamepad [DirectInput Mode]" },
+    { 0x046dc218, "F510 Gamepad [DirectInput Mode]" },
+    { 0x046dc219, "F710 Gamepad [DirectInput Mode]" },
     { 0x046dc21a, "Precision Gamepad" },
     { 0x046dc21c, "G13 Advanced Gameboard" },
     { 0x046dc21d, "F310 Gamepad [XInput Mode]" },
@@ -5816,8 +5846,13 @@ static const value_string usb_products_vals[] = {
     { 0x046dc720, "Bluetooth wireless hub" },
     { 0x046dca03, "MOMO Racing" },
     { 0x046dca04, "Formula Vibration Feedback Wheel" },
+    { 0x046dca84, "Cordless Controller for Xbox" },
+    { 0x046dca88, "Thunderpad for Xbox" },
+    { 0x046dca8a, "Precision Vibration Feedback Wheel for Xbox" },
+    { 0x046dcaa3, "DriveFX Racing Wheel" },
     { 0x046dcab1, "Cordless Keyboard for Wii HID Receiver" },
     { 0x046dd001, "QuickCam Pro" },
+    { 0x046df301, "Controller" },
     { 0x046e0100, "Keyboard" },
     { 0x046e3001, "Mass Storage Device" },
     { 0x046e3002, "Mass Storage Device" },
@@ -6103,6 +6138,7 @@ static const value_string usb_products_vals[] = {
     { 0x04820203, "AH-K3001V" },
     { 0x04820204, "iBurst Terminal" },
     { 0x04820408, "FS-1320D Printer" },
+    { 0x04820640, "ECOSYS M6026cdn" },
     { 0x0482069b, "ECOSYS M2635dn" },
     { 0x04830137, "BeWAN ADSL USB ST (blue or green)" },
     { 0x04830138, "Unicorn II (ST70138B + MTC-20174TQ chipset)" },
@@ -6122,13 +6158,18 @@ static const value_string usb_products_vals[] = {
     { 0x04835000, "ST Micro/Ergenic ERG BT-002 Bluetooth Adapter" },
     { 0x04835001, "ST Micro Bluetooth Device" },
     { 0x04835710, "Joystick in FS Mode" },
-    { 0x04835720, "STM microSD Flash Device" },
+    { 0x04835720, "Mass Storage Device" },
     { 0x04835721, "Hantek DDS-3X25 Arbitrary Waveform Generator" },
-    { 0x04835730, "STM32 Audio Streaming" },
-    { 0x04835740, "STM32F407" },
+    { 0x04835722, "Bulk Demo" },
+    { 0x04835730, "Audio Speaker" },
+    { 0x04835731, "Microphone" },
+    { 0x04835740, "Virtual COM Port" },
     { 0x04837270, "ST Micro Serial Bridge" },
     { 0x04837554, "56k SoftModem" },
+    { 0x04838213, "ThermaData Logger Cradle" },
+    { 0x04838259, "Probe" },
     { 0x048391d1, "Sensor Hub" },
+    { 0x0483a171, "ThermaData WiFi" },
     { 0x0483df11, "STM Device in DFU Mode" },
     { 0x0483ff10, "Swann ST56 Modem" },
     { 0x04860185, "EeePC T91MT HID Touch Panel" },
@@ -6147,6 +6188,7 @@ static const value_string usb_products_vals[] = {
     { 0x0489e040, "Vizio VTAB1008" },
     { 0x0489e042, "Broadcom BCM20702 Bluetooth" },
     { 0x0489e04d, "Atheros AR3012 Bluetooth" },
+    { 0x0489e055, "BCM43142A0 broadcom bluetooth" },
     { 0x048d1165, "IT1165 Flash Controller" },
     { 0x048d1172, "Flash Drive" },
     { 0x048d1336, "SD/MMC Cardreader" },
@@ -6475,6 +6517,7 @@ static const value_string usb_products_vals[] = {
     { 0x04a91607, "DR-6080 Scanner" },
     { 0x04a91608, "DR-2580C Scanner" },
     { 0x04a91609, "DR-3080CII" },
+    { 0x04a9160a, "DR-2050C Scanner" },
     { 0x04a91700, "PIXMA MP110 Scanner" },
     { 0x04a91701, "PIXMA MP130 Scanner" },
     { 0x04a91702, "MP410 Composite" },
@@ -6638,11 +6681,14 @@ static const value_string usb_products_vals[] = {
     { 0x04a92623, "FAX-B180C" },
     { 0x04a92629, "FAXPHONE L75" },
     { 0x04a9262b, "LaserShot LBP-1120 Printer" },
+    { 0x04a9262c, "imageCLASS D300" },
     { 0x04a9262d, "iR C3200" },
     { 0x04a9262f, "PIXMA MP730" },
     { 0x04a92630, "PIXMA MP700" },
     { 0x04a92631, "LASER CLASS 700" },
     { 0x04a92632, "FAX-L2000" },
+    { 0x04a92633, "LASERCLASS 500" },
+    { 0x04a92634, "PC-D300/FAX-L400/ICD300" },
     { 0x04a92635, "MPC190" },
     { 0x04a92637, "iR C6800" },
     { 0x04a92638, "iR C3100" },
@@ -6697,6 +6743,7 @@ static const value_string usb_products_vals[] = {
     { 0x04a92687, "iR4530" },
     { 0x04a92688, "LBP3460" },
     { 0x04a92689, "FAX-L180/L380S/L398S" },
+    { 0x04a9268a, "LC310/L390/L408S" },
     { 0x04a9268c, "iR C6870" },
     { 0x04a9268d, "iR 6870C EUR" },
     { 0x04a9268e, "iR C5870" },
@@ -7035,6 +7082,7 @@ static const value_string usb_products_vals[] = {
     { 0x04a932c1, "PowerShot ELPH 180 / IXUS 175" },
     { 0x04a932c2, "PowerShot SX720 HS" },
     { 0x04a932d5, "PowerShot SX430 IS" },
+    { 0x04a932db, "SELPHY CP1300" },
     { 0x04ad2501, "Bluetooth Device" },
     { 0x04b00102, "Coolpix 990" },
     { 0x04b00103, "Coolpix 880" },
@@ -7230,6 +7278,8 @@ static const value_string usb_products_vals[] = {
     { 0x04b45500, "HID->COM RS232 Adapter" },
     { 0x04b45a9b, "Dacal CD/DVD Library D-101/DC-300/DC-016RW" },
     { 0x04b46370, "ViewMate Desktop Mouse CC2201" },
+    { 0x04b46502, "CY4609" },
+    { 0x04b46506, "CY4603" },
     { 0x04b46560, "CY7C65640 USB-2.0 \"TetraHub\"" },
     { 0x04b46830, "CY7C68300A EZ-USB AT2 USB 2.0 to ATA/ATAPI" },
     { 0x04b46831, "Storage Adapter ISD-300LP (CY)" },
@@ -7247,6 +7297,7 @@ static const value_string usb_products_vals[] = {
     { 0x04b4f000, "CY30700 Licorice evaluation board" },
     { 0x04b4f111, "CY8CKIT-002 PSoC MiniProg3 Rev A Program and debug kit" },
     { 0x04b4f115, "PSoC FirstTouch Programmer" },
+    { 0x04b4f231, "DELLY Changer 4in1 universal IR remote" },
     { 0x04b4f232, "Mono embedded computer" },
     { 0x04b4fd13, "Programmable power socket" },
     { 0x04b53064, "Hantek DSO-3064" },
@@ -7553,6 +7604,7 @@ static const value_string usb_products_vals[] = {
     { 0x04ca300d, "Atheros AR3012 Bluetooth" },
     { 0x04ca300f, "Atheros AR3012 Bluetooth" },
     { 0x04ca3014, "Qualcomm Atheros Bluetooth" },
+    { 0x04ca7022, "HP HD Webcam" },
     { 0x04ca7025, "HP HD Webcam" },
     { 0x04ca7046, "TOSHIBA Web Camera - HD" },
     { 0x04ca9304, "Hub" },
@@ -7564,7 +7616,7 @@ static const value_string usb_products_vals[] = {
     { 0x04cb0109, "FinePix F601 Zoom (PC CAM)" },
     { 0x04cb010a, "FinePix S602 (Pro) Zoom (DSC)" },
     { 0x04cb010b, "FinePix S602 (Pro) Zoom (PC CAM)" },
-    { 0x04cb010d, "FinePix Digital Camera 020531" },
+    { 0x04cb010d, "FinePix S2 pro" },
     { 0x04cb010e, "FinePix F402 Zoom (DSC)" },
     { 0x04cb010f, "FinePix F402 Zoom (PC CAM)" },
     { 0x04cb0110, "FinePix M603 Zoom (DSC)" },
@@ -7714,6 +7766,7 @@ static const value_string usb_products_vals[] = {
     { 0x04d88108, "ChipKit Pro MX7 (PIC32MX)" },
     { 0x04d89004, "Microchip REAL ICE" },
     { 0x04d8900a, "PICkit3" },
+    { 0x04d89012, "PICkit4" },
     { 0x04d8c001, "PicoLCD 20x4" },
     { 0x04d8e11c, "TL866CS EEPROM Programmer [MiniPRO]" },
     { 0x04d8f2c4, "Macareux-labs Hygrometry Temperature Sensor" },
@@ -7753,6 +7806,7 @@ static const value_string usb_products_vals[] = {
     { 0x04d92834, "HT82A834R Audio MCU" },
     { 0x04d9a01c, "wireless multimedia keyboard with trackball [Trust ADURA 17911]" },
     { 0x04d9a050, "Chatman V1" },
+    { 0x04d9a052, "USB-zyTemp" },
     { 0x04d9a055, "Keyboard" },
     { 0x04d9a096, "Keyboard" },
     { 0x04d9a09f, "E-Signal LUOM G10 Mechanical Gaming Mouse" },
@@ -7979,6 +8033,7 @@ static const value_string usb_products_vals[] = {
     { 0x04e83268, "ML-1610 Mono Laser Printer" },
     { 0x04e8326c, "ML-2010P Mono Laser Printer" },
     { 0x04e83276, "ML-3050/ML-3051 Laser Printer" },
+    { 0x04e8327e, "ML-2510 Series" },
     { 0x04e8328e, "CLP-310 Color Laser Printer" },
     { 0x04e83292, "ML-1640 Series Laser Printer" },
     { 0x04e83296, "ML-2580N Mono Laser Printer" },
@@ -8106,6 +8161,7 @@ static const value_string usb_products_vals[] = {
     { 0x04e861b5, "M3 Portable Hard Drive 2TB" },
     { 0x04e861b6, "M3 Portable Hard Drive 1TB" },
     { 0x04e861f3, "Portable SSD T3 (MU-PT250B, MU-PT500B)" },
+    { 0x04e861f5, "Portable SSD T5" },
     { 0x04e86601, "Mobile Phone" },
     { 0x04e86602, "Galaxy" },
     { 0x04e86603, "Galaxy" },
@@ -8207,6 +8263,7 @@ static const value_string usb_products_vals[] = {
     { 0x04f20618, "RG-0618U Wireless HID Receiver & KG-0609 Wireless Keyboard with Touchpad" },
     { 0x04f20718, "wired mouse" },
     { 0x04f20760, "Acer KU-0760 Keyboard" },
+    { 0x04f20833, "KU-0833 Keyboard" },
     { 0x04f20841, "HP Multimedia Keyboard" },
     { 0x04f20860, "2.4G Multimedia Wireless Kit" },
     { 0x04f21061, "HP KG-1061 Wireless Keyboard+Mouse" },
@@ -8259,6 +8316,7 @@ static const value_string usb_products_vals[] = {
     { 0x04f2b15c, "Sony Vaio Integrated Camera" },
     { 0x04f2b175, "4-Port Hub" },
     { 0x04f2b1aa, "Webcam-101" },
+    { 0x04f2b1ac, "HP Laptop Integrated Webcam [2 MP Fixed]" },
     { 0x04f2b1b4, "Lenovo Integrated Camera" },
     { 0x04f2b1b9, "Asus Integrated Webcam" },
     { 0x04f2b1cf, "Lenovo Integrated Camera" },
@@ -8275,7 +8333,9 @@ static const value_string usb_products_vals[] = {
     { 0x04f2b2b0, "Camera" },
     { 0x04f2b2b9, "Lenovo Integrated Camera UVC" },
     { 0x04f2b2da, "thinkpad t430s camera" },
+    { 0x04f2b2db, "Thinkpad T430 camera" },
     { 0x04f2b2ea, "Integrated Camera [ThinkPad]" },
+    { 0x04f2b2f4, "HP Webcam-50" },
     { 0x04f2b330, "Asus 720p CMOS webcam" },
     { 0x04f2b354, "UVC 1.00 device HD UVC WebCam" },
     { 0x04f2b394, "Integrated Camera" },
@@ -8284,6 +8344,8 @@ static const value_string usb_products_vals[] = {
     { 0x04f2b3fd, "HD WebCam (Asus N-series)" },
     { 0x04f2b40e, "HP Truevision HD camera" },
     { 0x04f2b444, "Lenovo Integrated Webcam" },
+    { 0x04f2b5ce, "Integrated Camera" },
+    { 0x04f2b5cf, "Integrated IR Camera" },
     { 0x04f3000a, "Touchscreen" },
     { 0x04f30103, "ActiveJet K-2024 Multimedia Keyboard" },
     { 0x04f3016f, "Touchscreen" },
@@ -8295,6 +8357,7 @@ static const value_string usb_products_vals[] = {
     { 0x04f30230, "3D Optical Mouse" },
     { 0x04f30232, "Mouse" },
     { 0x04f30234, "Optical Mouse" },
+    { 0x04f30235, "Optical Mouse" },
     { 0x04f302f4, "2.4G Cordless Mouse" },
     { 0x04f30381, "Touchscreen" },
     { 0x04f304a0, "Dream Cheeky Stress/Panic Button" },
@@ -9016,7 +9079,7 @@ static const value_string usb_products_vals[] = {
     { 0x0525a4a2, "Linux-USB Ethernet/RNDIS Gadget" },
     { 0x0525a4a3, "Linux-USB user-mode isochronous source/sink" },
     { 0x0525a4a4, "Linux-USB user-mode bulk source/sink" },
-    { 0x0525a4a5, "Pocketbook Pro 903" },
+    { 0x0525a4a5, "Pocketbook Pro 903 / Mobius 2 Action Cam" },
     { 0x0525a4a6, "Linux-USB Serial Gadget" },
     { 0x0525a4a7, "Linux-USB Serial Gadget (CDC ACM mode)" },
     { 0x0525a4a8, "Linux-USB Printer Gadget" },
@@ -9125,7 +9188,7 @@ static const value_string usb_products_vals[] = {
     { 0x05481005, "EZ Cart II GameBoy Flash Programmer" },
     { 0x054c0001, "HUB" },
     { 0x054c0002, "Standard HUB" },
-    { 0x054c0010, "DSC-S30/S70/S75/F505V/F505/FD92/W1 Cybershot/Mavica Digital Camera" },
+    { 0x054c0010, "Cyber-shot, Mavica (msc)" },
     { 0x054c0014, "Nogatech USBVision (SY)" },
     { 0x054c0022, "Storage Adapter V2 (TPP)" },
     { 0x054c0023, "CD Writer" },
@@ -9332,18 +9395,20 @@ static const value_string usb_products_vals[] = {
     { 0x054c05a8, "Sony NWZ-S765" },
     { 0x054c05b3, "Sony Sony Tablet S" },
     { 0x054c05b4, "Sony Sony Tablet S1" },
-    { 0x054c05c4, "DualShock 4 [CUH-ZCT1E]" },
+    { 0x054c05c4, "DualShock 4 [CUH-ZCT1x]" },
     { 0x054c061f, "Sony DSC-HX200V" },
     { 0x054c0689, "Walkman NWZ-B173F" },
     { 0x054c06bb, "WALKMAN NWZ-F805" },
     { 0x054c06c3, "RC-S380" },
     { 0x054c07c4, "ILCE-6000 (aka Alpha-6000) in Mass Storage mode" },
+    { 0x054c082f, "Walkman NWZW Series" },
     { 0x054c0847, "WG-C10 Portable Wireless Server" },
     { 0x054c088c, "Portable Headphone Amplifier" },
     { 0x054c08b7, "ILCE-6000 (aka Alpha-6000) in MTP mode" },
     { 0x054c094e, "ILCE-6000 (aka Alpha-6000) in PC Remote mode" },
     { 0x054c0994, "ILCE-6000 (aka Alpha-6000) in charging mode" },
-    { 0x054c09cc, "DualShock 4 [CUH-ZCT2E]" },
+    { 0x054c09cc, "DualShock 4 [CUH-ZCT2x]" },
+    { 0x054c0ba0, "Dualshock4 Wireless Adaptor" },
     { 0x054c0bb5, "Headset MDR-1000X" },
     { 0x054c1000, "Wireless Buzz! Receiver" },
     { 0x054c1294, "Sony DCR-SR75" },
@@ -9431,6 +9496,7 @@ static const value_string usb_products_vals[] = {
     { 0x055f0408, "BearPaw 2448 CU Pro" },
     { 0x055f0409, "BearPaw 2448 TA Pro" },
     { 0x055f040b, "ScanExpress A3 USB 1200 PRO" },
+    { 0x055f0501, "ScanExpress A3 2400 Pro" },
     { 0x055f0873, "ScanExpress 600 USB" },
     { 0x055f1000, "BearPaw 4800 TA Pro" },
     { 0x055fa350, "gSmart 350 Camera" },
@@ -9612,12 +9678,26 @@ static const value_string usb_products_vals[] = {
     { 0x056a034e, "DTH-W1620 [MobileStudio Pro 16] tablet" },
     { 0x056a034f, "DTH-1320 [Cintiq Pro 13] tablet" },
     { 0x056a0350, "DTH-1620 [Cintiq Pro 16] tablet" },
+    { 0x056a0351, "DTH-2420 [Cintiq Pro 24 PT] tablet" },
+    { 0x056a0352, "DTH-3220 [Cintiq Pro 32] tablet" },
     { 0x056a0353, "DTH-1320 [Cintiq Pro 13] touchscreen" },
     { 0x056a0354, "DTH-1620 [Cintiq Pro 16] touchscreen" },
+    { 0x056a0355, "DTH-2420 [Cintiq Pro 24 PT] touchscreen" },
+    { 0x056a0356, "DTH-3220 [Cintiq Pro 32] touchscreen" },
     { 0x056a0357, "PTH-660 [Intuos Pro (M)]" },
     { 0x056a0358, "PTH-860 [Intuos Pro (L)]" },
     { 0x056a035a, "DTH-1152 tablet" },
     { 0x056a0368, "DTH-1152 touchscreen" },
+    { 0x056a0374, "CTL-4100 [Intuos (S)]" },
+    { 0x056a0375, "CTL-6100 [Intuos (M)]" },
+    { 0x056a0376, "CTL-4100WL [Intuos BT (S)]" },
+    { 0x056a0378, "CTL-6100WL [Intuos BT (M)]" },
+    { 0x056a037a, "CTL-472 [One by Wacom (S)]" },
+    { 0x056a037b, "CTL-672 [One by Wacom (M)]" },
+    { 0x056a037c, "DTK-2420 [Cintiq Pro 24 P]" },
+    { 0x056a037d, "DTH-2452 tablet" },
+    { 0x056a037e, "DTH-2452 touchscreen" },
+    { 0x056a0382, "DTK-2451 tablet" },
     { 0x056a0400, "PenPartner 4x5" },
     { 0x056a4001, "TPC4001" },
     { 0x056a4004, "TPC4004" },
@@ -19146,10 +19226,11 @@ static const value_string usb_products_vals[] = {
     { 0x20df0001, "Entropy Key [UDEKEY01]" },
     { 0x20f10101, "iCube3 Camera" },
     { 0x20f4648b, "TEW-648UBM 802.11n 150Mbps Micro Wireless N Adapter [Realtek RTL8188CUS]" },
-    { 0x20f73001, "Camera with CMOS sensor [MQ]" },
-    { 0x20f73021, "Camera with CCD sensor [MD]" },
-    { 0x20f730b3, "Camera with CMOS sensor in Vision mode [MQ]" },
-    { 0x20f7a003, "Subminiature 5Mpix B/W Camera, MU9PM-MH" },
+    { 0x20f73001, "MQ or MD camera" },
+    { 0x20f73002, "MU camera" },
+    { 0x20f73021, "MJ camera" },
+    { 0x20f730b3, "MQ in U3V mode or MC camera" },
+    { 0x20f7a003, "MU camera" },
     { 0x21009e52, "Yaesu VX-7" },
     { 0x21009e54, "CT29B Radio Cable" },
     { 0x21009e57, "RTS01 Radio Cable" },

diff --git a/manuf b/manuf
index 8374d1b280c652aef3f0d10ee7b84845e6ef45c8..1dc997203f90540ada8e126d2e3b9a3f9b47c0b2 100644 (file)
--- a/manuf
+++ b/manuf
@@ -17852,6 +17852,7 @@
 0C:8A:87       Aglogica        AgLogica Holdings, Inc
 0C:8B:D3       ItelMobi        Itel Mobile Limited
 0C:8B:FD       IntelCor        Intel Corporate
+0C:8C:24       Shenzhen        SHENZHEN BILIAN ELECTRONIC CO.，LTD
 0C:8C:8F       KamoTech        Kamo Technology Limited
 0C:8C:DC       SuuntoOy        Suunto Oy
 0C:8D:98       TopEight        Top Eight Ind Corp
@@ -18412,6 +18413,7 @@
 18:39:19       Unicoi  Unicoi Systems
 18:39:6E       SunseaTe        Sunsea Telecommunications Co.,Ltd.
 18:3A:2D       SamsungE        Samsung Electronics Co.,Ltd
+18:3A:48       Vostrone        VostroNet
 18:3B:D2       BydPreci        BYD Precision Manufacture Company Ltd.
 18:3D:A2       IntelCor        Intel Corporate
 18:3F:47       SamsungE        Samsung Electronics Co.,Ltd
@@ -18826,6 +18828,7 @@
 1C:C1:1A       Wavetron        Wavetronix
 1C:C1:DE       HewlettP        Hewlett Packard
 1C:C3:16       Milesigh        MileSight Technology Co., Ltd.
+1C:C3:EB       Guangdon        Guangdong Oppo Mobile Telecommunications Corp.,Ltd
 1C:C5:86       Absolute        Absolute Acoustics
 1C:C6:3C       Arcadyan        Arcadyan Technology Corporation
 1C:C7:2D       Shenzhen        Shenzhen Huapu Digital CO.,Ltd
@@ -18887,6 +18890,7 @@
 20:12:57       MostLuck        Most Lucky Trading Ltd
 20:12:D5       Scientec        Scientech Materials Corporation
 20:13:E0       SamsungE        Samsung Electronics Co.,Ltd
+20:16:3D       Integrat        Integrated Device Technology (Malaysia) Sdn. Bhd.
 20:16:B9       IntelCor        Intel Corporate
 20:16:D8       LiteonTe        Liteon Technology Corporation
 20:18:0E       Shenzhen        Shenzhen Sunchip Technology Co., Ltd
@@ -19236,6 +19240,7 @@
 24:F5:A2       BelkinIn        Belkin International Inc.
 24:F5:AA       SamsungE        Samsung Electronics Co.,Ltd
 24:F6:77       Apple   Apple, Inc.
+24:FA:F3       Shanghai        Shanghai Flexem Technology Co.,Ltd.
 24:FD:52       LiteonTe        Liteon Technology Corporation
 24:FD:5B       Smartthi        SmartThings, Inc.
 28:02:45       KonzeSys        Konze System Technology Co.,Ltd.
@@ -19341,6 +19346,7 @@
 28:60:94       Capelec
 28:63:36       Siemens-        Siemens AG - Industrial Automation - EWA
 28:65:6B       Keystone        Keystone Microtech Corporation
+28:66:E3       Azurewav        AzureWave Technology Inc.
 28:6A:B8       Apple   Apple, Inc.
 28:6A:BA       Apple   Apple, Inc.
 28:6C:07       XiaomiEl        XIAOMI Electronics,CO.,LTD
@@ -19515,6 +19521,7 @@
 2C:0B:E9       Cisco   Cisco Systems, Inc
 2C:0E:3D       SamsungE        SAMSUNG ELECTRO-MECHANICS(THAILAND)
 2C:10:C1       Nintendo        Nintendo Co., Ltd.
+2C:18:75       Skyworth        Skyworth Digital Technology(Shenzhen) Co.,Ltd
 2C:18:AE       TrendEle        Trend Electronics Co., Ltd.
 2C:19:84       IdnTelec        IDN Telecom, Inc.
 2C:1A:31       Electron        Electronics Company Limited
@@ -19920,6 +19927,7 @@
 30:D3:86       Zte     zte corporation
 30:D4:6A       Autosale        Autosales Incorporated
 30:D5:87       SamsungE        Samsung Electronics Co.,Ltd
+30:D6:59       MergingT        Merging Technologies SA
 30:D6:C9       SamsungE        Samsung Electronics Co.,Ltd
 30:D9:D9       Apple   Apple, Inc.
 30:DE:86       CedacSof        Cedac Software S.r.l.
@@ -23090,6 +23098,7 @@
 64:10:84       HexiumTe        HEXIUM Technical Development Co., Ltd.
 64:12:25       Cisco   Cisco Systems, Inc
 64:12:69       ArrisGro        ARRIS Group, Inc.
+64:13:31       BoschCar        Bosch Car Multimedia (Wuhu) Co. Ltd.
 64:13:6C       Zte     zte corporation
 64:16:66       NestLabs        Nest Labs Inc.
 64:16:7F       Polycom
@@ -23440,6 +23449,7 @@
 68:DB:96       OpwillTe        OPWILL Technologies CO .,LTD
 68:DB:CA       Apple   Apple, Inc.
 68:DC:E8       Packetst        PacketStorm Communications
+68:DD:26       Shanghai        Shanghai Focus Vision Security Technology Co.,Ltd
 68:DF:DD       XiaomiCo        Xiaomi Communications Co Ltd
 68:E1:66       Private
 68:E4:1F       Unglaube        Unglaube Identech GmbH
@@ -23671,6 +23681,7 @@
 70:28:8B       SamsungE        Samsung Electronics Co.,Ltd
 70:29:00       Shenzhen        Shenzhen ChipTrip Technology Co,Ltd
 70:2A:7D       Epspot  EpSpot AB
+70:2A:D5       SamsungE        Samsung Electronics Co.,Ltd
 70:2B:1D       E-DomusI        E-Domus International Limited
 70:2C:1F       Wisol
 70:2D:84       I4cInnov        i4C Innovations
@@ -23944,6 +23955,7 @@
 70:B3:D5:0C:50:00/36   Precitec        Precitec Optronik GmbH
 70:B3:D5:0C:60:00/36   Embedded        Embedded Arts Co., Ltd.
 70:B3:D5:0C:80:00/36   FinRobot        Fin Robotics Inc
+70:B3:D5:0C:90:00/36   LineageP        Lineage Power Pvt Ltd.,
 70:B3:D5:0C:D0:00/36   AmlOcean        AML Oceanographic
 70:B3:D5:0C:E0:00/36   Innomind        Innominds Software Inc
 70:B3:D5:0D:10:00/36   CommonSe        Common Sense Monitoring Solutions Ltd.
@@ -24403,6 +24415,7 @@
 70:B3:D5:3C:30:00/36   Aimco
 70:B3:D5:3C:50:00/36   P4qElect        P4Q ELECTRONICS, S.L.
 70:B3:D5:3C:60:00/36   AcdElekr        ACD Elekronik GmbH
+70:B3:D5:3C:70:00/36   Softcrea        Softcreate Corp.
 70:B3:D5:3C:90:00/36   Duerkopp        Duerkopp-Adler
 70:B3:D5:3C:A0:00/36   Tti     TTI Ltd
 70:B3:D5:3C:C0:00/36   Teropta TerOpta Ltd
@@ -24435,8 +24448,10 @@
 70:B3:D5:3F:E0:00/36   MentorGr        Mentor Graphics
 70:B3:D5:3F:F0:00/36   HydraCon        Hydra Controls
 70:B3:D5:40:00:00/36   VtronPty        Vtron Pty Ltd
+70:B3:D5:40:10:00/36   Private
 70:B3:D5:40:40:00/36   Ranix   RANIX,Inc.
 70:B3:D5:40:50:00/36   MgSRL   MG s.r.l.
+70:B3:D5:40:60:00/36   Acrodea Acrodea, Inc.
 70:B3:D5:40:70:00/36   Idosens
 70:B3:D5:40:80:00/36   ComrodAs        Comrod AS
 70:B3:D5:40:A0:00/36   MonroeEl        Monroe Electronics, Inc.
@@ -24927,6 +24942,7 @@
 70:B3:D5:76:D0:00/36   Trimble
 70:B3:D5:76:E0:00/36   GrupoEpe        Grupo Epelsa S.L.
 70:B3:D5:76:F0:00/36   Oti     Oti Ltd
+70:B3:D5:77:00:00/36   Strega
 70:B3:D5:77:10:00/36   ApatorMi        Apator Miitors ApS
 70:B3:D5:77:20:00/36   Enmodus
 70:B3:D5:77:30:00/36   RuggedSc        Rugged Science
@@ -25240,6 +25256,7 @@
 70:B3:D5:97:F0:00/36   Bistos  BISTOS.,Co.,Ltd
 70:B3:D5:98:10:00/36   ZamirRec        Zamir Recognition Systems Ltd.
 70:B3:D5:98:40:00/36   SanminaI        Sanmina Israel
+70:B3:D5:98:50:00/36   BurkTech        Burk Technology
 70:B3:D5:98:60:00/36   AplexTec        Aplex Technology Inc.
 70:B3:D5:98:70:00/36   Axis    Axis Corporation
 70:B3:D5:98:90:00/36   Dcns
@@ -25261,6 +25278,7 @@
 70:B3:D5:9A:00:00/36   Eldes
 70:B3:D5:9A:10:00/36   ItsIndus        ITS Industrial Turbine Services GmbH
 70:B3:D5:9A:70:00/36   Honeywel        Honeywell
+70:B3:D5:9A:A0:00/36   TecsysDo        Tecsys do Brasil Industrial Ltda
 70:B3:D5:9A:D0:00/36   FortunaI        Fortuna Impex Pvt ltd
 70:B3:D5:9A:E0:00/36   Volansys        Volansys technologies pvt ltd
 70:B3:D5:9B:10:00/36   AplexTec        Aplex Technology Inc.
@@ -25367,6 +25385,7 @@
 70:B3:D5:A5:00:00/36   Lecip   Lecip Corporation
 70:B3:D5:A5:10:00/36   RfCode  RF Code
 70:B3:D5:A5:30:00/36   GsIndust        GS Industrie-Elektronik GmbH
+70:B3:D5:A5:40:00/36   Provedo
 70:B3:D5:A5:50:00/36   EmbestTe        Embest Technology Co., Ltd
 70:B3:D5:A5:60:00/36   DorletSa        Dorlet Sau
 70:B3:D5:A5:70:00/36   Pcsc
@@ -26531,6 +26550,7 @@
 78:07:38       ZUKElzab        Z.U.K. Elzab S.A.
 78:0A:C7       BaofengT        Baofeng TV Co., Ltd.
 78:0C:B8       IntelCor        Intel Corporate
+78:0C:F0       Cisco   Cisco Systems, Inc
 78:0F:77       Hangzhou        HangZhou Gubei Electronics Technology Co.,Ltd
 78:11:85       NbsPayme        NBS Payment Solutions Inc.
 78:11:DC       XiaomiEl        XIAOMI Electronics,CO.,LTD
@@ -26555,6 +26575,7 @@
 78:2B:CB       Dell    Dell Inc.
 78:2D:7E       Trendnet        TRENDnet, Inc.
 78:2E:EF       Nokia   Nokia Corporation
+78:2F:17       Xlab    Xlab Co.,Ltd
 78:30:3B       StephenT        Stephen Technologies Co.,Limited
 78:30:E1       Ultracle        UltraClenz, LLC
 78:31:2B       Zte     zte corporation
@@ -26888,6 +26909,7 @@
 7C:6A:F3       Integrat        Integrated Device Technology (Malaysia) Sdn. Bhd.
 7C:6B:33       TenyuTec        Tenyu Tech Co. Ltd.
 7C:6B:52       TigaroWi        Tigaro Wireless
+7C:6B:9C       Guangdon        Guangdong Oppo Mobile Telecommunications Corp.,Ltd
 7C:6B:F7       Nti     NTI co., ltd.
 7C:6C:39       PixsysSr        Pixsys Srl
 7C:6C:8F       AmsNeve Ams Neve Ltd
@@ -27385,6 +27407,7 @@
 84:85:0A       HellaSon        Hella Sonnen- und Wetterschutztechnik GmbH
 84:86:F3       Greenvit        Greenvity Communications
 84:89:AD       Apple   Apple, Inc.
+84:8A:8D       Cisco   Cisco Systems, Inc
 84:8D:84       Rajant  Rajant Corporation
 84:8D:C7       CiscoSpv        Cisco SPVTG
 84:8E:0C       Apple   Apple, Inc.
@@ -27404,6 +27427,7 @@
 84:9F:B5       HuaweiTe        Huawei Technologies Co.,Ltd
 84:A1:34       Apple   Apple, Inc.
 84:A1:D1       Sagemcom        Sagemcom Broadband SAS
+84:A2:4D       BirdsEye        Birds Eye Systems Private Limited
 84:A4:23       Sagemcom        Sagemcom Broadband SAS
 84:A4:66       SamsungE        Samsung Electronics Co.,Ltd
 84:A6:C8       IntelCor        Intel Corporate
@@ -27435,6 +27459,7 @@
 84:C7:EA       SonyMobi        Sony Mobile Communications Inc
 84:C8:B1       Incognit        Incognito Software Systems Inc.
 84:C9:B2       D-LinkIn        D-Link International
+84:C9:C6       Shenzhen        Shenzhen Gongjin Electronics Co.,Lt
 84:CD:62       Shenzhen        ShenZhen IDWELL Technology CO.,Ltd
 84:CF:BF       Fairphon        Fairphone
 84:D3:2A       Ieee1905        IEEE 1905.1
@@ -27633,6 +27658,7 @@
 88:96:76       TtcMarco        TTC MARCONI s.r.o.
 88:96:B6       GlobalFi        Global Fire Equipment S.A.
 88:96:F2       ValeoSch        Valeo Schalter und Sensoren GmbH
+88:97:65       ExandsIn        exands information technology Co.,Ltd
 88:97:DF       Entrypas        Entrypass Corporation Sdn. Bhd.
 88:98:21       Teraon
 88:9B:39       SamsungE        Samsung Electronics Co.,Ltd
@@ -27694,6 +27720,7 @@
 88:D0:39       TclTechn        TCL Technoly Electronics(Huizhou).,Ltd
 88:D1:71       Beghelli        Beghelli S.P.A
 88:D2:74       Zte     zte corporation
+88:D2:BF       GermanAu        German Autolabs
 88:D3:7B       FirmtekL        FirmTek, LLC
 88:D5:0C       Guangdon        Guangdong Oppo Mobile Telecommunications Corp.,Ltd
 88:D6:52       Amergint        AMERGINT Technologies
@@ -29736,6 +29763,7 @@ AC:FD:93        WeifangG        Weifang Goertek Electronics Co.,Ltd
 AC:FD:CE       IntelCor        Intel Corporate
 AC:FD:EC       Apple   Apple, Inc.
 B0:00:B4       Cisco   Cisco Systems, Inc
+B0:02:7E       MullerSe        Muller Services
 B0:05:94       LiteonTe        Liteon Technology Corporation
 B0:08:BF       VitalCon        Vital Connect, Inc.
 B0:09:D3       Avizia
@@ -30867,6 +30895,7 @@ C4:93:00        8devices
 C4:93:13       100fioNe        100fio networks technology llc
 C4:93:80       Speedyte        Speedytel technology
 C4:93:D9       SamsungE        Samsung Electronics Co.,Ltd
+C4:95:00       AmazonTe        Amazon Technologies Inc.
 C4:95:A2       Shenzhen        Shenzhen Weijiu Industry And Trade Development Co., Ltd
 C4:98:05       MinieumN        Minieum Networks, Inc
 C4:98:80       Apple   Apple, Inc.
@@ -31374,6 +31403,7 @@ CC:E8:AC        SoyeaTec        SOYEA Technology Co.,Ltd.
 CC:EA:1C       Dconwork        DCONWORKS  Co., Ltd
 CC:EE:D9       VahleDet        VAHLE DETO GmbH
 CC:EF:48       Cisco   Cisco Systems, Inc
+CC:F0:FD       ChinaMob        China Mobile (Hangzhou) Information Technology Co., Ltd.
 CC:F3:A5       ChiMeiCo        Chi Mei Communication Systems, Inc
 CC:F4:07       EukreaEl        Eukrea Electromatique Sarl
 CC:F5:38       3isysnet        3isysnetworks
@@ -31721,11 +31751,15 @@ D4:7B:35      NeoMonit        NEO Monitors AS
 D4:7B:75       HartingE        HARTING Electronics GmbH
 D4:7B:B0       AskeyCom        Askey Computer Corp
 D4:7C:44       IeeeRegi        IEEE Registration Authority
+D4:7C:44:00:00:00/28   ExaforeO        Exafore Oy
 D4:7C:44:10:00:00/28   InnovizT        Innoviz Technologies LTD
 D4:7C:44:20:00:00/28   YundingN        YunDing Network Technology (Beijing) Co., Ltd
 D4:7C:44:30:00:00/28   OmronSen        Omron Sentech Co., Ltd.
+D4:7C:44:40:00:00/28   SammiOnf        Sammi Onformation Systems
 D4:7C:44:60:00:00/28   AsdaIct ASDA ICT Co., Ltd.
 D4:7C:44:70:00:00/28   PongeeIn        Pongee Industries Co., Ltd.
+D4:7C:44:80:00:00/28   BeijingM        Beijing Maystar Information Technology Co., Ltd.
+D4:7C:44:90:00:00/28   SuzhouWa        Suzhou Wandian Palm Network Technology Co., Ltd
 D4:7C:44:A0:00:00/28   Tendzone        Tendzone International Pte Ltd
 D4:7C:44:B0:00:00/28   Optim   OPTiM Corporation
 D4:7C:44:C0:00:00/28   StriveOr        Strive Orthopedics Inc
@@ -32240,6 +32274,7 @@ E0:0C:7F        Nintendo        Nintendo Co., Ltd.
 E0:0D:B9       Cree    Cree, Inc.
 E0:0E:DA       Cisco   Cisco Systems, Inc
 E0:10:7F       RuckusWi        Ruckus Wireless
+E0:12:83       Shenzhen        Shenzhen Fanzhuo Communication Technology Co., Lt
 E0:14:3E       Modoosis        Modoosis Inc.
 E0:18:77       Fujitsu Fujitsu Limited
 E0:19:1D       HuaweiTe        Huawei Technologies Co.,Ltd

diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 13173668086f763acdd68e26199ef25cb953093a..f84b2b7c788c2cfef88ebdbbfd8571901e228ca3 100644 (file)
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -7774,22 +7774,6 @@ text-decoration: underline;
         <source>Confirm unsaved capture files</source>
         <translation>Bei ungesicherten Mitschnittdateien nachfragen</translation>
     </message>
-    <message>
-        <source>If checked the packet detail items will be automatically scrolled when they are expanded.</source>
-        <translation type="vanished">Wenn aktiviert scrollen ausgeklappte Paketdetails automatisch.</translation>
-    </message>
-    <message>
-        <source>Automatically scroll packet details</source>
-        <translation type="vanished">Automatisches Scrollen der Paketdetails</translation>
-    </message>
-    <message>
-        <source>Percentage distance from the top to scroll packet details.</source>
-        <translation type="vanished">Prozentualer Abstand von oben bis zu den scrollenden Paketdetails.</translation>
-    </message>
-    <message>
-        <source>Packet detail scroll percentage:</source>
-        <translation type="vanished">Prozentualer Scrollfortschritt Paketdetails:</translation>
-    </message>
     <message>
         <source>Main toolbar style:</source>
         <translation>Stil Hauptleiste</translation>

diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 863a16178228706d185f53ab55ddcef2090a3ca0..0bbd33a674a7982f5b5e4216fd2769f1ee09d7f3 100644 (file)
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -7723,22 +7723,6 @@ a:hover {
         <source>Confirm unsaved capture files</source>
         <translation>Toujours Confirmer avant un fichier de capture non sauvegardé</translation>
     </message>
-    <message>
-        <source>If checked the packet detail items will be automatically scrolled when they are expanded.</source>
-        <translation type="vanished">Cocher les éléments de détail paquets seront automatiquement défiler quand ils sont étendus.</translation>
-    </message>
-    <message>
-        <source>Automatically scroll packet details</source>
-        <translation type="vanished">Défilement automatique lors de l&apos;affichage des détails</translation>
-    </message>
-    <message>
-        <source>Percentage distance from the top to scroll packet details.</source>
-        <translation type="vanished">Distance en pourcentage du haut pour faire défiler les détails des paquets.</translation>
-    </message>
-    <message>
-        <source>Packet detail scroll percentage:</source>
-        <translation type="vanished">Pourcentage détail paquet de défilement:</translation>
-    </message>
     <message>
         <source>Main toolbar style:</source>
         <translation>Style de la barre d&apos;outils principale :</translation>

diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index a38f155a04002d698cac7344af05342643803b28..c219496128c859dbe70c6b92af1bca7c58cd0e64 100644 (file)
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -7774,22 +7774,6 @@ a:hover {
         <source>Confirm unsaved capture files</source>
         <translation>Conferma file di cattura non salvati</translation>
     </message>
-    <message>
-        <source>If checked the packet detail items will be automatically scrolled when they are expanded.</source>
-        <translation type="vanished">Se selezionato, le voci di dettaglio del pacchetto saranno automaticamente scorse mentre vengono espanse.</translation>
-    </message>
-    <message>
-        <source>Automatically scroll packet details</source>
-        <translation type="vanished">Scorri automaticamente i dettagli dei pacchetto</translation>
-    </message>
-    <message>
-        <source>Percentage distance from the top to scroll packet details.</source>
-        <translation type="vanished">Distanza percentuale dall&apos;inizio per scorrere i dettagli del pacchetto.</translation>
-    </message>
-    <message>
-        <source>Packet detail scroll percentage:</source>
-        <translation type="vanished">Percentuale di scorrimento dei dettagli del pacchetto:</translation>
-    </message>
     <message>
         <source>Main toolbar style:</source>
         <translation>Stile della barra degli strumenti principale:</translation>

diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index e49fff1f64d69fe5452b062d28067832cedc2008..6de38ce64d235619679ee6fb6fad5a36d37026ed 100644 (file)
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -7707,22 +7707,6 @@ a:hover {
         <source>Confirm unsaved capture files</source>
         <translation>保存していないキャプチャファイルの確認</translation>
     </message>
-    <message>
-        <source>If checked the packet detail items will be automatically scrolled when they are expanded.</source>
-        <translation type="vanished">パケット詳細の項目にチェックをすると自動的に拡張した際にスクロールします</translation>
-    </message>
-    <message>
-        <source>Automatically scroll packet details</source>
-        <translation type="vanished">パケット詳細を自動的にスクロール</translation>
-    </message>
-    <message>
-        <source>Percentage distance from the top to scroll packet details.</source>
-        <translation type="vanished">パケット詳細を一番上からスクロールした割合(%)</translation>
-    </message>
-    <message>
-        <source>Packet detail scroll percentage:</source>
-        <translation type="vanished">パケット詳細はスクロールした割合(%)：</translation>
-    </message>
     <message>
         <source>Main toolbar style:</source>
         <translation>メニューツールバーのスタイル:</translation>

diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index c1bf47dfcd05b7a30d2ef69ad2900d30f883d0db..e4017513b1dc12ad25b5c8c231aeaa8209a61ab1 100644 (file)
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -7754,22 +7754,6 @@ text-decoration: underline;
         <source>Confirm unsaved capture files</source>
         <translation>Potwierdź zamykanie niezapisanych plików przechwytywania</translation>
     </message>
-    <message>
-        <source>If checked the packet detail items will be automatically scrolled when they are expanded.</source>
-        <translation type="vanished">Jeśli zaznaczono to szczegółypakietu będą automatycznie przewijane gdy są rozwijane.</translation>
-    </message>
-    <message>
-        <source>Automatically scroll packet details</source>
-        <translation type="vanished">Automatyczne przewijanie szczegółów pakietu</translation>
-    </message>
-    <message>
-        <source>Percentage distance from the top to scroll packet details.</source>
-        <translation type="vanished">Procentowa odległość przesuwania od góry do szczegółów pakietu.</translation>
-    </message>
-    <message>
-        <source>Packet detail scroll percentage:</source>
-        <translation type="vanished">Procent przewijania szczegółów pakietu:</translation>
-    </message>
     <message>
         <source>Main toolbar style:</source>
         <translation>Główny pasek stylów:</translation>

diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 8e4673a11de1138ebe1bde9c38fc5b87ee98d284..5d110797b1b1c448aa7facd03b46aa80ff609fb2 100644 (file)
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -7754,22 +7754,6 @@ text-decoration: underline;
         <source>Confirm unsaved capture files</source>
         <translation>确认未保存的捕获文件</translation>
     </message>
-    <message>
-        <source>If checked the packet detail items will be automatically scrolled when they are expanded.</source>
-        <translation type="vanished">若选中，分组详情项目将随着展开而自动滚动。</translation>
-    </message>
-    <message>
-        <source>Automatically scroll packet details</source>
-        <translation type="vanished">自动滚动分组详情视图</translation>
-    </message>
-    <message>
-        <source>Percentage distance from the top to scroll packet details.</source>
-        <translation type="vanished">从顶部到滚动分组详情的百分比距离。</translation>
-    </message>
-    <message>
-        <source>Packet detail scroll percentage:</source>
-        <translation type="vanished">分组详情滚动百分比:</translation>
-    </message>
     <message>
         <source>Main toolbar style:</source>
         <translation>主工具栏样式：</translation>