[Automatic update for 2016-10-02]

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

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

1 files changed, 59 insertions, 5 deletions

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index a87b5df86c..32ae949b24 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -1709,7 +1709,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x0dc0, "G7 Solutions (formerly Great Notions)" },
     { 0x0dc1, "Tamagawa Seiki Co., Ltd" },
     { 0x0dc3, "Athena Smartcard Solutions, Inc." },
-    { 0x0dc4, "Macpower Peripherals, Ltd" },
+    { 0x0dc4, "inXtron, Inc." },
     { 0x0dc5, "SDK Co., Ltd" },
     { 0x0dc6, "Precision Squared Technology Corp." },
     { 0x0dc7, "First Cable Line, Inc." },
@@ -1949,9 +1949,10 @@ static const value_string usb_vendors_vals[] = {
     { 0x0fdc, "Micro Plus" },
     { 0x0fde, "Oregon Scientific" },
     { 0x0fe0, "Osterhout Design Group" },
+    { 0x0fe2, "Air Techniques" },
     { 0x0fe4, "IN-Tech Electronics, Ltd" },
     { 0x0fe5, "Greenconn (U.S.A.), Inc." },
-    { 0x0fe6, "Kontron (Industrial Computer Source / ICS Advent)" },
+    { 0x0fe6, "ICS Advent" },
     { 0x0fe9, "DVICO" },
     { 0x0fea, "United Computer Accessories" },
     { 0x0feb, "CRS Electronic Co., Ltd" },
@@ -2538,17 +2539,22 @@ static const value_string usb_vendors_vals[] = {
     { 0x18e8, "Qcom" },
     { 0x18ea, "Matrox Graphics, Inc." },
     { 0x18ec, "Arkmicro Technologies Inc." },
+    { 0x18f8, "[Maxxter]" },
+    { 0x18fb, "Scriptel Corporation" },
     { 0x18fd, "FineArch Inc." },
+    { 0x1901, "GE Healthcare" },
     { 0x1908, "GEMBIRD" },
     { 0x190d, "Motorola GSG" },
     { 0x1914, "Alco Digital Devices Limited" },
     { 0x1915, "Nordic Semiconductor ASA" },
+    { 0x191c, "Innovative Technology LTD" },
     { 0x1923, "FitLinxx" },
     { 0x1926, "NextWindow" },
     { 0x192f, "Avago Technologies, Pte." },
     { 0x1930, "Shenzhen Xianhe Technology Co., Ltd." },
     { 0x1931, "Ningbo Broad Telecommunication Co., Ltd." },
     { 0x1934, "Feature Integration Technology Inc. (Fintek)" },
+    { 0x1938, "Meinberg Funkuhren GmbH & Co. KG" },
     { 0x1941, "Dream Link" },
     { 0x1943, "Sensoray Co., Inc." },
     { 0x1949, "Lab126, Inc." },
@@ -3424,6 +3430,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f03817, "LaserJet P2015 series" },
     { 0x03f03902, "PhotoSmart 130" },
     { 0x03f03912, "Officejet Pro 8500" },
+    { 0x03f03917, "LaserJet P2014" },
     { 0x03f03a02, "PhotoSmart 7150" },
     { 0x03f03a11, "OfficeJet 5500 series" },
     { 0x03f03a17, "Printing Support" },
@@ -5259,6 +5266,7 @@ static const value_string usb_products_vals[] = {
     { 0x045e0780, "Comfort Curve Keyboard 3000" },
     { 0x045e0797, "Optical Mouse 200" },
     { 0x045e07a5, "Wireless Receiver 1461C" },
+    { 0x045e07b9, "Wired Keyboard 200" },
     { 0x045e07ca, "Surface Pro 3 Docking Station Audio Device" },
     { 0x045e07f8, "Wired Keyboard 600 (model 1576)" },
     { 0x045e07fd, "Nano Transceiver 1.1" },
@@ -5494,6 +5502,7 @@ static const value_string usb_products_vals[] = {
     { 0x046d0a4d, "G430 Surround Sound Gaming Headset" },
     { 0x046d0b02, "C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)" },
     { 0x046d8801, "Video Camera" },
+    { 0x046db014, "Bluetooth Mouse M336/M337/M535" },
     { 0x046db305, "BT Mini-Receiver" },
     { 0x046dbfe4, "Premium Optical Wheel Mouse" },
     { 0x046dc000, "N43 [Pilot Mouse]" },
@@ -5613,6 +5622,7 @@ static const value_string usb_products_vals[] = {
     { 0x046dc22b, "Gaming Keyboard G110 G-keys" },
     { 0x046dc22d, "G510 Gaming Keyboard" },
     { 0x046dc22e, "G510 Gaming Keyboard onboard audio" },
+    { 0x046dc231, "G13 Virtual Mouse" },
     { 0x046dc245, "G400 Optical Mouse" },
     { 0x046dc246, "Gaming Mouse G300" },
     { 0x046dc248, "G105 Gaming Keyboard" },
@@ -5635,6 +5645,7 @@ static const value_string usb_products_vals[] = {
     { 0x046dc29c, "Speed Force Wireless Wheel for Wii" },
     { 0x046dc2a0, "Wingman Force Feedback Mouse" },
     { 0x046dc2a1, "WingMan Force Feedback Mouse" },
+    { 0x046dc2ab, "G13 Joystick" },
     { 0x046dc301, "iTouch Keyboard" },
     { 0x046dc302, "iTouch Pro Keyboard" },
     { 0x046dc303, "iTouch Keyboard" },
@@ -7533,6 +7544,7 @@ static const value_string usb_products_vals[] = {
     { 0x04d8c001, "PicoLCD 20x4" },
     { 0x04d8e11c, "TL866CS EEPROM Programmer [MiniPRO]" },
     { 0x04d8f2c4, "Macareux-labs Hygrometry Temperature Sensor" },
+    { 0x04d8f2f7, "Yepkit YKUSH" },
     { 0x04d8f3aa, "Macareux-labs Usbce Bootloader mode" },
     { 0x04d8f437, "SBE Tech Ultrasonic Anemometer" },
     { 0x04d8f4b5, "SmartScope" },
@@ -10705,6 +10717,8 @@ static const value_string usb_products_vals[] = {
     { 0x060b6231, "Thermaltake eSPORTS Meka Keyboard" },
     { 0x060b8007, "P-W1G1F12 VER:1 [Macally MegaCam]" },
     { 0x060ba001, "Maxwell Compact Pc PM3" },
+    { 0x0617000a, "Thymio-II" },
+    { 0x0617000c, "Thymio-II Wireless" },
     { 0x06180101, "Mouse" },
     { 0x06190101, "SLP-100 Driver" },
     { 0x06190102, "SLP-200 Driver" },
@@ -13872,6 +13886,7 @@ static const value_string usb_products_vals[] = {
     { 0x0b483012, "TT-connect CT2-4650 CI" },
     { 0x0b483014, "TT-TVStick CT2-4400" },
     { 0x0b483015, "TT-connect CT2-4650 CI" },
+    { 0x0b483017, "TT-connect S2-4650 CI" },
     { 0x0b49064f, "Trance Vibrator" },
     { 0x0b4b0100, "D'music MP3 Player" },
     { 0x0b4d110a, "Graphtec CC200-20" },
@@ -15535,6 +15550,12 @@ static const value_string usb_products_vals[] = {
     { 0x0fcee1b0, "D6708" },
     { 0x0fcee1b5, "D2004" },
     { 0x0fcee1ba, "D6683" },
+    { 0x0fcee1bb, "SO-02G" },
+    { 0x0fcee1bc, "D2203" },
+    { 0x0fcee1c0, "SGP621" },
+    { 0x0fcee1c2, "D2533" },
+    { 0x0fcee1c9, "E6553" },
+    { 0x0fcee1cf, "SGP771" },
     { 0x0fcef0fa, "MN800 / Smartwatch 2 (DFU mode)" },
     { 0x0fcf1003, "ANT Development Board" },
     { 0x0fcf1004, "ANTUSB Stick" },
@@ -15560,6 +15581,7 @@ static const value_string usb_products_vals[] = {
     { 0x0fe6811e, "Parallel Adapter" },
     { 0x0fe69700, "DM9601 Fast Ethernet Adapter" },
     { 0x0fe94020, "TViX M-6500" },
+    { 0x0fe99010, "FusionRemote IR receiver" },
     { 0x0fe9db00, "FusionHDTV DVB-T (MT352+LgZ201) (uninitialized)" },
     { 0x0fe9db01, "FusionHDTV DVB-T (MT352+LgZ201) (initialized)" },
     { 0x0fe9db10, "FusionHDTV DVB-T (MT352+Thomson7579) (uninitialized)" },
@@ -15589,12 +15611,13 @@ static const value_string usb_products_vals[] = {
     { 0x100461f9, "LG Electronics Inc. V909 G-Slate" },
     { 0x100461fc, "Optimus 3" },
     { 0x100461fe, "Optimus Android Phone [USB tethering mode]" },
-    { 0x10046300, "G2/Optimus Android Phone" },
+    { 0x1004627f, "G3 (VS985) Android Phone (MTP/Download mode)" },
+    { 0x10046300, "G2/Optimus Android Phone [Charge mode]" },
     { 0x1004631c, "LG Electronics Inc. LG-E617G/P700" },
     { 0x1004631d, "Optimus Android Phone (Camera/PTP Mode)" },
     { 0x1004631e, "G2/Optimus Android Phone [Camera/PTP mode]" },
     { 0x1004631f, "Optimus Android Phone (Charge Mode)" },
-    { 0x1004633e, "G2 Android Phone [MTP mode]" },
+    { 0x1004633e, "G2/G3 Android Phone [MTP/PTP/Download mode]" },
     { 0x10046344, "G2 Android Phone [tethering mode]" },
     { 0x10046356, "Optimus Android Phone [Virtual CD mode]" },
     { 0x10046800, "CDMA Modem" },
@@ -15722,13 +15745,20 @@ static const value_string usb_products_vals[] = {
     { 0x10580742, "My Passport Essential SE (WDBGYS)" },
     { 0x10580748, "My Passport (WDBKXH, WDBY8L)" },
     { 0x105807a8, "My Passport (WDBBEP), My Passport for Mac (WDBLUZ)" },
+    { 0x105807ae, "My Passport Edge for Mac (WDBJBH)" },
+    { 0x105807ba, "PiDrive (WDLB)" },
     { 0x10580810, "My Passport Ultra (WDBZFP)" },
+    { 0x10580816, "My Passport Air (WDBBLW)" },
     { 0x10580820, "My Passport Ultra (WDBMWV, WDBZFP)" },
+    { 0x10580822, "My Passport Ultra (WDBBUZ)" },
+    { 0x10580824, "My Passport Slim (WDBPDZ)" },
     { 0x10580830, "My Passport Ultra (WDBZFP)" },
+    { 0x10580837, "My Passport Ultra (WDBBKD)" },
     { 0x10580900, "MyBook Essential External HDD" },
     { 0x10580901, "My Book Essential Edition (Green Ring) (WDG1U)" },
     { 0x10580902, "My Book Pro Edition (WDG1T)" },
     { 0x10580903, "My Book Premium Edition" },
+    { 0x10580905, "My Book Pro Edition II (WD10000C033-001)" },
     { 0x10580910, "My Book Essential Edition (Green Ring) (WDG1U)" },
     { 0x10581001, "Elements Desktop (WDE1U)" },
     { 0x10581003, "WD Elements Desktop (WDE1UBK)" },
@@ -15737,6 +15767,7 @@ static const value_string usb_products_vals[] = {
     { 0x10581023, "Elements SE Portable (WDBABV)" },
     { 0x10581042, "Elements SE Portable (WDBPCK)" },
     { 0x10581048, "Elements Portable (WDBU6Y)" },
+    { 0x10581078, "Elements Portable (WDBUZG)" },
     { 0x1058107c, "Elements Desktop (WDBWLG)" },
     { 0x105810a2, "Elements SE Portable (WDBPCK)" },
     { 0x105810a8, "Elements Portable (WDBUZG)" },
@@ -15752,7 +15783,10 @@ static const value_string usb_products_vals[] = {
     { 0x10581123, "My Book 3.0 (WDBABP)" },
     { 0x10581130, "My Book Essential (WDBACW)" },
     { 0x10581140, "My Book Essential (WDBACW)" },
-    { 0x10581230, "My Book (WDBFJK0030HBK)" },
+    { 0x10581230, "My Book (WDBFJK)" },
+    { 0x10581235, "My Book (WDBFJK0040HBK)" },
+    { 0x1058259d, "My Passport Ultra (WDBBKD)" },
+    { 0x1058259f, "My Passport Ultra (WD10JMVW)" },
     { 0x1059000b, "StarSign Bio Token 3.0" },
     { 0x105be065, "BCM43142A0 Bluetooth module" },
     { 0x10631555, "MC141555 Hub" },
@@ -17560,12 +17594,31 @@ static const value_string usb_products_vals[] = {
     { 0x18ec3366, "Bresser Biolux NV" },
     { 0x18f60102, "Sirius Stiletto" },
     { 0x18f60110, "Sirius Stiletto 2" },
+    { 0x18f80f99, "Optical gaming mouse" },
+    { 0x18fb01c0, "ST1501-STN" },
+    { 0x18fb01c1, "ST1526-STN" },
+    { 0x18fb01c2, "ST1501-PYJ" },
+    { 0x18fb01c3, "ST1501B-PYJ" },
+    { 0x18fb01c4, "ST1501-PUN" },
+    { 0x18fb01c5, "ST1401-STN" },
+    { 0x18fb01c7, "ST1526-PYJ" },
+    { 0x18fb01c8, "ST1501-ECA" },
+    { 0x18fb01c9, "ST1476-STN" },
+    { 0x18fb01cb, "ST1571-STN" },
+    { 0x18fb0200, "ST1500" },
+    { 0x18fb0201, "ST1550" },
+    { 0x18fb0202, "ST1525" },
+    { 0x18fb0204, "ST1400" },
+    { 0x18fb0206, "ST1475" },
+    { 0x18fb0207, "ST1570" },
+    { 0x19010015, "Nemo Tracker" },
     { 0x19081320, "PhotoFrame PF-15-1" },
     { 0x1915000c, "Wireless Desktop nRF24L01 CX-1766" },
     { 0x19152233, "Linksys WUSB11 v2.8 802.11b Adapter [Atmel AT76C505]" },
     { 0x19152234, "Linksys WUSB54G v1 OEM 802.11g Adapter [Intersil ISL3886]" },
     { 0x19152235, "Linksys WUSB54GP v1 OEM 802.11g Adapter [Intersil ISL3886]" },
     { 0x19152236, "Linksys WUSB11 v3.0 802.11b Adapter [Intersil PRISM 3]" },
+    { 0x191c4104, "Banknote validator NV-150" },
     { 0x19230002, "Personal SyncPoint" },
     { 0x19260003, "1900 HID Touchscreen" },
     { 0x19260006, "1950 HID Touchscreen" },
@@ -17602,6 +17655,7 @@ static const value_string usb_products_vals[] = {
     { 0x19340602, "F71610 or F71612 Consumer Infrared Receiver/Transceiver" },
     { 0x19340702, "Integrated Consumer Infrared Receiver/Transceiver" },
     { 0x19345168, "F71610A or F71612A Consumer Infrared Receiver/Transceiver" },
+    { 0x19380501, "TCR51USB IRIG Time Code Reader" },
     { 0x19418021, "WH1080 Weather Station / USB Missile Launcher" },
     { 0x19432250, "Model 2250 MPEG and JPEG Capture Card" },
     { 0x19432253, "Model 2253 Audio/Video Codec Card" },