[Automatic update for 2016-03-06]

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

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

3 files changed, 143 insertions, 10 deletions

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 52fbef5613..405e5c8879 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -15479,7 +15479,7 @@ static const value_string usb_products_vals[] = {
     { 0x104f0007, "Infinity Smart module" },
     { 0x104f0008, "Infinity CryptoKey" },
     { 0x104f0009, "RE-BL PlayStation 3 IR-to-Bluetooth converter" },
-    { 0x10500010, "Yubikey" },
+    { 0x10500010, "Yubikey (v1 or v2)" },
     { 0x10500110, "Yubikey NEO(-N) OTP" },
     { 0x10500111, "Yubikey NEO(-N) OTP+CCID" },
     { 0x10500112, "Yubikey NEO(-N) CCID" },
@@ -15488,8 +15488,16 @@ static const value_string usb_products_vals[] = {
     { 0x10500115, "Yubikey NEO(-N) U2F+CCID" },
     { 0x10500116, "Yubikey NEO(-N) OTP+U2F+CCID" },
     { 0x10500120, "Yubikey Touch U2F Security Key" },
-    { 0x10500200, "U2F Gnubby" },
+    { 0x10500200, "Gnubby U2F" },
     { 0x10500211, "Gnubby" },
+    { 0x10500401, "Yubikey 4 OTP" },
+    { 0x10500402, "Yubikey 4 U2F" },
+    { 0x10500403, "Yubikey 4 OTP+U2F" },
+    { 0x10500404, "Yubikey 4 CCID" },
+    { 0x10500405, "Yubikey 4 OTP+CCID" },
+    { 0x10500406, "Yubikey 4 U2F+CCID" },
+    { 0x10500407, "Yubikey 4 OTP+U2F+CCID" },
+    { 0x10500410, "Yubikey plus OTP+U2F" },
     { 0x10545004, "DSL 7420 Loader" },
     { 0x10545005, "DSL 7420 LAN Modem" },
     { 0x10580200, "FireWire USB Combo" },
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 59d2f935c8..8c1785d7a5 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2016-02-27)
+(last updated 2016-03-06)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -100686,9 +100686,9 @@ de Bruxelles, asbl
     Nozomi Masao
       masao&canon-elec.co.jp
 25279
-  OMX Group
-    James Anderson
-      james.anderson&omxgroup.com
+  Nasdaq MTS (formerly 'OMX Group')
+    Pamela Duffy
+      pamela.duffy&nasdaq.com
 25280
   Market Pulse International
     Paul Rainey
@@ -188052,9 +188052,9 @@ Decentralization / Helenic Public Administra
     Troy Garrison
       informationtechnology&spauldingclinical.com
 47118
-  FAWONG
+  Asian Arts Talents Foundation
     Felix Wong
-      felix&fawong.com
+      felix&aatf.us
 47119
   SCIFI
     Cosme Faria Corrêa
@@ -188783,6 +188783,106 @@ Decentralization / Helenic Public Administra
   itelligence AG
     Amine El-Ayadi
       help-network&itelligence.org
+47301
+  "NR"WEB US
+    Joshua K Betts
+      servers&nrwebus.com
+47302
+  Alnatura Produktions- und Handels GmbH
+    Thomas Brettnich
+      thomas.brettnich&alnatura.de
+47303
+  Moratua Solutions
+    Mahadi Siregar
+      regar.016&gmail.com
+47304
+  Ivnosys Soluciones S.L.
+    Jose Biosca
+      sistemas&ivnosys.com
+47305
+  FoxGuard Solutions
+    Mitch Helton
+      mhelton&foxguardsolutions.com
+47306
+  Jasper
+    Bobby Richardson
+      bobby.richardson&jasper.com
+47307
+  IgniteNet
+    Harold Bledsoe
+      hbledsoe&ignitenet.com
+47308
+  Lanbowan Technology Ltd.
+    guangdong yang
+      18626469675&163.com
+47309
+  Sofia Digital, Ltd.
+    Juha Joki
+      juha.joki&sofiadigital.com
+47310
+  botanic
+    Nicolas Dubost
+      systeme&botanic.com
+47311
+  Seacomp
+    Ivo Hlavaty
+      admin&seacomp.cz
+47312
+  Searidge Technologies
+    Justin Beattie
+      justin&searidgetech.com
+47313
+  Adenon Bilisim ve Iletisim Tek. San. ve Tic. Ltd. Sti.
+    Ergun SERAY
+      ergun.seray&adenon.com
+47314
+  Torrential Data Solutions, Inc.
+    Joseph Pickard
+      jpickard&torrentialdata.com
+47315
+  Wahsega Labs
+    Kelley Conway
+      kconway&wahsega.com
+47316
+  True Manufacturing
+    Jeremy Zanitsch
+      networkoperations&truemfg.com
+47317
+  University of Warsaw
+    Andrzej Zadrozny
+      devel&adm.uw.edu.pl
+47318
+  Optigo Networks
+    Stephen Chan
+      stephen&optigo.net
+47319
+  Riella Systems
+    Mike Riella
+      Mike&Riella.com
+47320
+  Advanced Enterprise Solutions Limited
+    Dan Williams
+      oid_admin&adventsol.co.uk
+47321
+  memit.de
+    Merlin Mittelbach
+      merlin.mittelbach&memit.de
+47322
+  Office IT-Partner Borås
+    Martin Westberg
+      martin.westberg&officeitpartner.se
+47323
+  TrustKo
+    Seongwoo Hong
+      certmaster&trustko.com
+47324
+  Mokop, Bartosz Rebeś
+    Bartosz Rebeś
+      admin&mokop.co
+47325
+  Suzhou Robot Information Technology Co.,Ltd.
+    Yin Haibo
+      yhb&szrobot.net
 
 
 End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index 9d530e2e12..97033956d6 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -25299,7 +25299,7 @@ const value_string sminmpec_values[] = {
     { 25276, "Gear6" },
     { 25277, "Pekao Inc." },
     { 25278, "Canon Electronics Inc." },
-    { 25279, "OMX Group" },
+    { 25279, "Nasdaq MTS (formerly 'OMX Group')" },
     { 25280, "Market Pulse International" },
     { 25281, "Westerstrand Urfabrik AB" },
     { 25282, "MDK Baden-W\0303\0274rttemberg" },
@@ -47138,7 +47138,7 @@ const value_string sminmpec_values[] = {
     { 47115, "The Star Entertainment Group Limited" },
     { 47116, "NPL Management Ltd" },
     { 47117, "Spaulding Clinical" },
-    { 47118, "FAWONG" },
+    { 47118, "Asian Arts Talents Foundation" },
     { 47119, "SCIFI" },
     { 47120, "Solustic - Solucoes em Tecnologia" },
     { 47121, "TDCH A/S" },
@@ -47321,6 +47321,31 @@ const value_string sminmpec_values[] = {
     { 47298, "Pastem Solutions, Ltd." },
     { 47299, "P2 Wireless Technologies Limited" },
     { 47300, "itelligence AG" },
+    { 47301, "\"NR\"WEB US" },
+    { 47302, "Alnatura Produktions- und Handels GmbH" },
+    { 47303, "Moratua Solutions" },
+    { 47304, "Ivnosys Soluciones S.L." },
+    { 47305, "FoxGuard Solutions" },
+    { 47306, "Jasper" },
+    { 47307, "IgniteNet" },
+    { 47308, "Lanbowan Technology Ltd." },
+    { 47309, "Sofia Digital, Ltd." },
+    { 47310, "botanic" },
+    { 47311, "Seacomp" },
+    { 47312, "Searidge Technologies" },
+    { 47313, "Adenon Bilisim ve Iletisim Tek. San. ve Tic. Ltd. Sti." },
+    { 47314, "Torrential Data Solutions, Inc." },
+    { 47315, "Wahsega Labs" },
+    { 47316, "True Manufacturing" },
+    { 47317, "University of Warsaw" },
+    { 47318, "Optigo Networks" },
+    { 47319, "Riella Systems" },
+    { 47320, "Advanced Enterprise Solutions Limited" },
+    { 47321, "memit.de" },
+    { 47322, "Office IT-Partner Bor\0303\0245s" },
+    { 47323, "TrustKo" },
+    { 47324, "Mokop, Bartosz Rebe\0305\0233" },
+    { 47325, "Suzhou Robot Information Technology Co.,Ltd." },
     {    0, NULL}
 };