[Automatic update for 2016-07-03]

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

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

1 files changed, 55 insertions, 10 deletions

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 405e5c8879..80ff8b8b80 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -149,6 +149,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x0445, "Lucent Technologies, Inc." },
     { 0x0446, "NMB Technologies Corp." },
     { 0x0447, "Momentum Microsystems" },
+    { 0x0449, "Duta Multi Robotik" },
     { 0x044a, "Shamrock Tech. Co., Ltd" },
     { 0x044b, "WSI" },
     { 0x044c, "CCL/ITRI" },
@@ -3067,14 +3068,24 @@ static const value_string usb_products_vals[] = {
     { 0x03eb2109, "STK541 ZigBee Development Board" },
     { 0x03eb210d, "XPLAIN evaluation kit (CDC ACM)" },
     { 0x03eb2110, "AVR JTAGICE3 Debugger and Programmer" },
+    { 0x03eb2111, "Xplained Pro board debugger and programmer" },
     { 0x03eb2122, "XMEGA-A1 Explained evaluation kit" },
+    { 0x03eb2140, "AVR JTAGICE3 (v3.x) Debugger and Programmer" },
     { 0x03eb2141, "ICE debugger" },
     { 0x03eb2310, "EVK11xx evaluation board" },
     { 0x03eb2fe4, "ATxmega32A4U DFU bootloader" },
     { 0x03eb2fe6, "Cactus V6 (DFU)" },
     { 0x03eb2fea, "Cactus RF60 (DFU)" },
+    { 0x03eb2fee, "atmega8u2 DFU bootloader" },
+    { 0x03eb2fef, "atmega16u2 DFU bootloader" },
     { 0x03eb2ff0, "atmega32u2 DFU bootloader" },
+    { 0x03eb2ff1, "at32uc3a3 DFU bootloader" },
+    { 0x03eb2ff3, "atmega16u4 DFU bootloader" },
     { 0x03eb2ff4, "atmega32u4 DFU bootloader" },
+    { 0x03eb2ff6, "at32uc3b0/1 DFU bootloader" },
+    { 0x03eb2ff7, "at90usb82 DFU bootloader" },
+    { 0x03eb2ff8, "at32uc3a0/1 DFU bootloader" },
+    { 0x03eb2ff9, "at90usb646/647 DFU bootloader" },
     { 0x03eb2ffa, "at90usb162 DFU bootloader" },
     { 0x03eb2ffb, "at90usb AVR DFU bootloader" },
     { 0x03eb2ffd, "at89c5130/c5131 DFU bootloader" },
@@ -3203,6 +3214,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f00c24, "Bluetooth Dongle" },
     { 0x03f00d12, "OfficeJet 9100 series" },
     { 0x03f00d17, "LaserJet 1012" },
+    { 0x03f00d4a, "SK-2025 Keyboard" },
     { 0x03f00e17, "LaserJet 1015" },
     { 0x03f00f0c, "Wireless Keyboard and Optical Mouse receiver" },
     { 0x03f00f11, "OfficeJet V40" },
@@ -3218,6 +3230,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f01017, "LaserJet 1300" },
     { 0x03f01024, "Smart Card Keyboard" },
     { 0x03f01027, "Virtual keyboard and mouse" },
+    { 0x03f0102a, "LaserJet Professional P 1102w" },
     { 0x03f01102, "PhotoSmart 240 series" },
     { 0x03f01104, "DeskJet 959c" },
     { 0x03f01105, "ScanJet 5470c/5490c" },
@@ -3363,7 +3376,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f02e17, "LaserJet 2600n" },
     { 0x03f02e24, "LP2275w Monitor Hub" },
     { 0x03f02f11, "PSC 1200" },
-    { 0x03f02f17, "EWS 2605dn" },
+    { 0x03f02f17, "Color LaserJet 2605dn" },
     { 0x03f02f24, "LP2475w Monitor Hub" },
     { 0x03f03002, "PhotoSmart P1000" },
     { 0x03f03004, "DeskJet 980c" },
@@ -3381,6 +3394,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f03217, "LaserJet 3050" },
     { 0x03f03302, "PhotoSmart 1218" },
     { 0x03f03304, "DeskJet 990c" },
+    { 0x03f03307, "v125w Stick" },
     { 0x03f03312, "OfficeJet J6410" },
     { 0x03f03317, "LaserJet 3052" },
     { 0x03f03402, "PhotoSmart 1115" },
@@ -3470,6 +3484,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f05717, "LaserJet M1120n MFP" },
     { 0x03f05811, "PhotoSmart C5100 series" },
     { 0x03f05817, "LaserJet M1319f MFP" },
+    { 0x03f0581d, "lt4112 Gobi 4G Module Network Device" },
     { 0x03f05911, "PhotoSmart C6180" },
     { 0x03f05912, "Officejet Pro 8600" },
     { 0x03f05a11, "PhotoSmart C7100 series" },
@@ -4207,6 +4222,7 @@ static const value_string usb_products_vals[] = {
     { 0x041e3060, "Sound Blaster Audigy 2 ZS External" },
     { 0x041e3061, "SoundBlaster Audigy 2 ZS Video Editor" },
     { 0x041e3090, "Sound Blaster Digital Music SX" },
+    { 0x041e30d0, "Xmod" },
     { 0x041e30d3, "Sound Blaster Play!" },
     { 0x041e3100, "IR Receiver (SB0540)" },
     { 0x041e3121, "WoW tap chat" },
@@ -4215,6 +4231,7 @@ static const value_string usb_products_vals[] = {
     { 0x041e3f02, "E-Mu 0202" },
     { 0x041e3f04, "E-Mu 0404" },
     { 0x041e3f07, "E-Mu Xmidi 1x1" },
+    { 0x041e3f0e, "Xmidi 1x1 Tab" },
     { 0x041e4003, "VideoBlaster Webcam Go Plus [W9967CF]" },
     { 0x041e4004, "Nomad II MG" },
     { 0x041e4005, "Webcam Blaster Go ES" },
@@ -4275,6 +4292,7 @@ static const value_string usb_products_vals[] = {
     { 0x041e4087, "Live! Cam Socialize HD 1080 [VF0680]" },
     { 0x041e4088, "Live! Cam Chat HD [VF0700]" },
     { 0x041e4095, "Live! Cam Sync HD [VF0770]" },
+    { 0x041e4097, "Live! Cam Chat HD [VF0700]" },
     { 0x041e4100, "Nomad Jukebox 2" },
     { 0x041e4101, "Nomad Jukebox 3" },
     { 0x041e4102, "NOMAD MuVo^2" },
@@ -4498,6 +4516,7 @@ static const value_string usb_products_vals[] = {
     { 0x04210610, "CS-15 (Internet Stick 3G modem)" },
     { 0x04210661, "Lumia 620/920" },
     { 0x0421069a, "130 [RM-1035] (Charging only)" },
+    { 0x042106fc, "Lumia 640 Phone" },
     { 0x04210720, "X (RM-980)" },
     { 0x04210800, "Connectivity Cable DKU-5" },
     { 0x04210801, "Data Cable DKU-6" },
@@ -4514,6 +4533,7 @@ static const value_string usb_products_vals[] = {
     { 0x0423030a, "PETracer x1" },
     { 0x04231237, "Andromeda Hub" },
     { 0x04240001, "Integrated Hub" },
+    { 0x04240140, "LPC47M14x hub" },
     { 0x04240acd, "Sitecom Internal Multi Memory reader/writer MD-005" },
     { 0x04240fdc, "Floppy" },
     { 0x042410cd, "Sitecom Internal Multi Memory reader/writer MD-005" },
@@ -4541,6 +4561,7 @@ static const value_string usb_products_vals[] = {
     { 0x04247500, "LAN7500 Ethernet 10/100/1000 Adapter" },
     { 0x04249512, "SMC9512/9514 USB Hub" },
     { 0x04249514, "SMC9514 Hub" },
+    { 0x04249904, "LAN9512/LAN9514 Ethernet 10/100 Adapter (SAL10)" },
     { 0x0424a700, "2 Port Hub" },
     { 0x0424ec00, "SMSC9512/9514 Fast Ethernet Adapter" },
     { 0x04250101, "G-Tech Wireless Mouse & Keyboard" },
@@ -4565,6 +4586,7 @@ static const value_string usb_products_vals[] = {
     { 0x0430a4a2, "Ethernet (RNDIS and CDC ethernet)" },
     { 0x0430cdab, "Raritan KVM dongle" },
     { 0x04310100, "Mouse-Trak 3-button Track Ball" },
+    { 0x04320031, "Document Processor" },
     { 0x04331101, "IBM Game Controller" },
     { 0x0433abab, "Keyboard" },
     { 0x04360005, "CameraMate (DPCM_USB)" },
@@ -4737,6 +4759,9 @@ static const value_string usb_products_vals[] = {
     { 0x0443002e, "Millennium Keyboard" },
     { 0x04466781, "Keyboard with PS/2 Mouse Port" },
     { 0x04466782, "Keyboard" },
+    { 0x04490128, "Menengah" },
+    { 0x04490210, "Dasar" },
+    { 0x04490612, "Lanjutan" },
     { 0x044e1104, "Japanese Keyboard" },
     { 0x044e2002, "MD-5500 Printer" },
     { 0x044e2014, "Bluetooth Device" },
@@ -4794,7 +4819,9 @@ static const value_string usb_products_vals[] = {
     { 0x04516060, "RNDIS/BeWAN ADSL2+" },
     { 0x04516070, "RNDIS/BeWAN ADSL2+" },
     { 0x0451625f, "TUSB6250 ATA Bridge" },
+    { 0x04518041, "Hub" },
     { 0x04518042, "Hub" },
+    { 0x04518043, "Hub" },
     { 0x04518142, "TUSB8041 4-Port Hub" },
     { 0x0451926b, "TUSB9260 Boot Loader" },
     { 0x0451dbc0, "Device Bay Controller" },
@@ -5030,7 +5057,7 @@ static const value_string usb_products_vals[] = {
     { 0x045e00f8, "LifeCam NX-6000" },
     { 0x045e00f9, "Wireless Desktop Receiver 3.1" },
     { 0x045e0202, "Xbox Controller" },
-    { 0x045e0280, "XBox Device" },
+    { 0x045e0280, "Xbox Memory Unit (8MB)" },
     { 0x045e0283, "Xbox Communicator" },
     { 0x045e0284, "Xbox DVD Playback Kit" },
     { 0x045e0285, "Xbox Controller S" },
@@ -5052,12 +5079,13 @@ static const value_string usb_products_vals[] = {
     { 0x045e02ad, "Xbox NUI Audio" },
     { 0x045e02ae, "Xbox NUI Camera" },
     { 0x045e02b0, "Xbox NUI Motor" },
-    { 0x045e02b6, "Xbox 360 / Bluetooth Wireless Headset" },
+    { 0x045e02b6, "Xbox360 Bluetooth Wireless Headset" },
     { 0x045e02be, "Kinect for Windows NUI Audio" },
     { 0x045e02bf, "Kinect for Windows NUI Camera" },
     { 0x045e02c2, "Kinect for Windows NUI Motor" },
-    { 0x045e02d1, "XBOX One Controller for Windows" },
+    { 0x045e02d1, "Xbox One Controller" },
     { 0x045e02d5, "Xbox One Digital TV Tuner" },
+    { 0x045e02dd, "Xbox One Controller (Covert Forces/Firmware 2015)" },
     { 0x045e0400, "Windows Powered Pocket PC 2002" },
     { 0x045e0401, "Windows Powered Pocket PC 2002" },
     { 0x045e0402, "Windows Powered Pocket PC 2002" },
@@ -5441,6 +5469,8 @@ static const value_string usb_products_vals[] = {
     { 0x046d0a0b, "ClearChat Pro USB" },
     { 0x046d0a0c, "Clear Chat Comfort USB Headset" },
     { 0x046d0a13, "Z-5 Speakers" },
+    { 0x046d0a14, "USB Headset" },
+    { 0x046d0a15, "G35 Headset" },
     { 0x046d0a17, "G330 Headset" },
     { 0x046d0a1f, "G930" },
     { 0x046d0a29, "H600 [Wireless Headset]" },
@@ -5520,8 +5550,10 @@ static const value_string usb_products_vals[] = {
     { 0x046dc06c, "Optical Mouse" },
     { 0x046dc077, "M105 Optical Mouse" },
     { 0x046dc07c, "M-R0017 [G700s Rechargeable Gaming Mouse]" },
+    { 0x046dc07d, "G502 Mouse" },
+    { 0x046dc07e, "G402 Gaming Mouse" },
     { 0x046dc101, "UltraX Media Remote" },
-    { 0x046dc110, "Harmony 785/885 Remote" },
+    { 0x046dc110, "Harmony 785/880/885 Remote" },
     { 0x046dc111, "Harmony 525 Remote" },
     { 0x046dc112, "Harmony 890 Remote" },
     { 0x046dc11f, "Harmony 900/1100 Remote" },
@@ -5951,13 +5983,16 @@ static const value_string usb_products_vals[] = {
     { 0x0480a007, "External Disk USB 3.0" },
     { 0x0480a009, "Stor.E Basics" },
     { 0x0480a00d, "STOR.E BASICS 500GB" },
+    { 0x0480a100, "Canvio Alu 2TB 2.5\" Black External Disk Model HDTH320EK3CA" },
     { 0x0480a202, "Canvio Basics HDD" },
+    { 0x0480a208, "Canvio Basics 2TB USB 3.0 Portable Hard Drive" },
     { 0x0480b001, "Stor.E Partner" },
     { 0x0480d000, "External Disk 2TB Model DT01ABA200" },
     { 0x0480d010, "External Disk 3TB" },
     { 0x0480d011, "Canvio Desk" },
     { 0x0482000e, "FS-1020D Printer" },
     { 0x0482000f, "FS-1920 Mono Printer" },
+    { 0x04820015, "FS-1030D printer" },
     { 0x04820100, "Finecam S3x" },
     { 0x04820101, "Finecam S4" },
     { 0x04820103, "Finecam S5" },
@@ -5976,11 +6011,10 @@ static const value_string usb_products_vals[] = {
     { 0x04832017, "Biometric Smart Card Reader" },
     { 0x04832018, "BioSimKey" },
     { 0x04832302, "Portable Flash Device (PFD)" },
-    { 0x0483347b, "ST-LINK/V2-1" },
-    { 0x04833744, "STLINK Pseudo disk" },
+    { 0x04833744, "ST-LINK/V1" },
     { 0x04833747, "ST Micro Connect Lite" },
     { 0x04833748, "ST-LINK/V2" },
-    { 0x0483374b, "ST-LINK/V2.1 (Nucleo-F103RB)" },
+    { 0x0483374b, "ST-LINK/V2.1" },
     { 0x04834810, "ISDN adapter" },
     { 0x0483481d, "BT Digital Access adapter" },
     { 0x04835000, "ST Micro/Ergenic ERG BT-002 Bluetooth Adapter" },
@@ -6321,6 +6355,7 @@ static const value_string usb_products_vals[] = {
     { 0x04a910b6, "PIXMA iP4300 Printer" },
     { 0x04a910c2, "PIXMA iP1800 Printer" },
     { 0x04a910c4, "Pixma iP4500 Printer" },
+    { 0x04a910c9, "PIXIMA iP4600 Printer" },
     { 0x04a91404, "W6400PG" },
     { 0x04a91405, "W8400PG" },
     { 0x04a9150f, "BIJ2350 PCL" },
@@ -6379,6 +6414,7 @@ static const value_string usb_products_vals[] = {
     { 0x04a9190a, "CanoScan LiDE 210" },
     { 0x04a9190d, "CanoScan 9000F Mark II" },
     { 0x04a9190e, "CanoScan LiDE 120" },
+    { 0x04a9190f, "CanoScan LiDE 220" },
     { 0x04a92200, "CanoScan LiDE 25" },
     { 0x04a92201, "CanoScan FB320U" },
     { 0x04a92202, "CanoScan FB620U" },
@@ -6447,6 +6483,7 @@ static const value_string usb_products_vals[] = {
     { 0x04a92650, "iR 6800C EUR" },
     { 0x04a92651, "iR 3100C EUR" },
     { 0x04a92655, "FP-L170/MF350/L380/L398" },
+    { 0x04a92656, "iR1510-1670 CAPT Printer" },
     { 0x04a92659, "MF8100" },
     { 0x04a9265b, "CAPT Printer" },
     { 0x04a9265c, "iR C3220" },
@@ -6794,10 +6831,13 @@ static const value_string usb_products_vals[] = {
     { 0x04a9329a, "PowerShot SX60 HS" },
     { 0x04a9329b, "PowerShot SX520 HS" },
     { 0x04a9329c, "PowerShot SX400 IS" },
+    { 0x04a9329d, "PowerShot G7 X" },
     { 0x04a9329f, "PowerShot SX530 HS" },
     { 0x04a932a6, "PowerShot SX710 HS" },
     { 0x04a932aa, "Powershot ELPH 160 / IXUS 160" },
     { 0x04a932ac, "PowerShot ELPH 170 IS / IXUS 170" },
+    { 0x04a932ad, "PowerShot SX410 IS" },
+    { 0x04a932c1, "PowerShot ELPH 180 / IXUS 175" },
     { 0x04ad2501, "Bluetooth Device" },
     { 0x04b00102, "Coolpix 990" },
     { 0x04b00103, "Coolpix 880" },
@@ -7008,6 +7048,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" },
+    { 0x04b4f232, "Mono embedded computer" },
     { 0x04b4fd13, "Programmable power socket" },
     { 0x04b53064, "Hantek DSO-3064" },
     { 0x04b80001, "Stylus Color 740 / Photo 750" },
@@ -7301,10 +7342,11 @@ static const value_string usb_products_vals[] = {
     { 0x04ca1766, "HID Monitor Controls" },
     { 0x04ca2004, "Bluetooth 4.0 [Broadcom BCM20702A0]" },
     { 0x04ca2006, "Broadcom BCM43142A0 Bluetooth Device" },
+    { 0x04ca3005, "Atheros Bluetooth" },
     { 0x04ca300b, "Atheros AR3012 Bluetooth" },
     { 0x04ca300d, "Atheros AR3012 Bluetooth" },
     { 0x04ca300f, "Atheros AR3012 Bluetooth" },
-    { 0x04ca3014, "Qualcoom Atheros Bluetooth" },
+    { 0x04ca3014, "Qualcomm Atheros Bluetooth" },
     { 0x04ca7025, "HP HD Webcam" },
     { 0x04ca7046, "TOSHIBA Web Camera - HD" },
     { 0x04ca9304, "Hub" },
@@ -7490,6 +7532,7 @@ static const value_string usb_products_vals[] = {
     { 0x04d91503, "Keyboard" },
     { 0x04d91603, "Keyboard" },
     { 0x04d91702, "Keyboard LKS02" },
+    { 0x04d91818, "Keyboard [Diatec Filco Majestouch 2]" },
     { 0x04d92011, "Keyboard [Diatec Filco Majestouch 1]" },
     { 0x04d92013, "Keyboard [Das Keyboard]" },
     { 0x04d92221, "Keyboard" },
@@ -7497,6 +7540,7 @@ static const value_string usb_products_vals[] = {
     { 0x04d92519, "Shenzhen LogoTech 2.4GHz receiver" },
     { 0x04d92832, "HT82A832R Audio MCU" },
     { 0x04d92834, "HT82A834R Audio MCU" },
+    { 0x04d9a01c, "wireless multimedia keyboard with trackball [Trust ADURA 17911]" },
     { 0x04d9a055, "Keyboard" },
     { 0x04da0901, "LS-120 Camera" },
     { 0x04da0912, "SDR-S10" },
@@ -7835,6 +7879,7 @@ static const value_string usb_products_vals[] = {
     { 0x04e86125, "D3 Station External Hard Drive" },
     { 0x04e861b5, "M3 Portable Hard Drive 2TB" },
     { 0x04e861b6, "M3 Portable Hard Drive 1TB" },
+    { 0x04e861f3, "MU-PT500B [T3 500GB USB SSD]" },
     { 0x04e86601, "Mobile Phone" },
     { 0x04e86602, "Galaxy" },
     { 0x04e86603, "Galaxy" },
@@ -8539,6 +8584,7 @@ static const value_string usb_products_vals[] = {
     { 0x04fc0538, "Wireless Optical Mouse 2.4G [Bright]" },
     { 0x04fc0561, "Flexcam 100" },
     { 0x04fc05d8, "Wireless keyboard/mouse" },
+    { 0x04fc05da, "SPEEDLINK SNAPPY Wireless Mouse Nano" },
     { 0x04fc0c15, "SPIF215A SATA bridge" },
     { 0x04fc0c25, "SATALink SPIF225A" },
     { 0x04fc1528, "SPCA1527A/SPCA1528 SD card camera (webcam mode)" },
@@ -16569,7 +16615,6 @@ static const value_string usb_products_vals[] = {
     { 0x15180001, "HDReye High Dynamic Range Camera" },
     { 0x15180002, "HDReye (before firmware loads)" },
     { 0x15190020, "HSIC Device" },
-    { 0x15190443, "Telit LN930" },
     { 0x15246680, "UTS 6680" },
     { 0x15270200, "YAP Phone (no firmware)" },
     { 0x15270201, "YAP Phone" },