[Automatic update for 2016-04-17]

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

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

2 files changed, 224 insertions, 14 deletions

diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index fc81b7e93e..2674e63904 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2016-04-08)
+(last updated 2016-04-17)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -38355,8 +38355,8 @@ Decimal
       rpinto&ldapguru.net
 9600
   Williams Technology Consulting Services
-    Gage N. Williams
-      gage.williams&wtcs.org
+    Garth K. Williams
+      garth.williams&wtcs.org
 9601
   Keewaytinook Okimakanak
     Adi Linden
@@ -72367,9 +72367,9 @@ da Faculdade de Ciências e Tecnologia da Universidade Nova de Lisboa
     Niels Farver
       NielsF&tcelectronic.com
 18204
-  Computer And Software Enterprises, Inc.
+  HPD Software, LLC (formerly 'Computer And Software Enterprises, Inc.')
     Rick Gilligan
-      admin-oid&case.net
+      admin-oid&hpdsoftware.us
 18205
   Pioneer Industries, Inc.
     Gary Chen
@@ -111196,8 +111196,8 @@ Decentralization / Helenic Public Administra
       stefanh&hafenthal.de
 27904
   Suncorp-Metway Ltd
-    Tony Earley
-      tony.earley&suncorp.com.au
+    Domain Administrator
+      dnsinternet&suncorp.com.au
 27905
   Universitaet Wuerzburg
     Rechenzentrum
@@ -153594,7 +153594,7 @@ Decentralization / Helenic Public Administra
 38503
   Advtal52
     Mariano Rodrigues Lopez
-      iana&advtal52.com.ar
+      mariano&advtal52.com.ar
 38504
   Skyworth
     Cai Zhongpeng
@@ -158542,7 +158542,7 @@ Decentralization / Helenic Public Administra
 39740
   PSA Zeebrugge International Port nv
     Louis Stevens
-      louis.stevens&psa-zeebrugge.be
+      louis.stevens&globalpsa.com
 39741
   Egnyte Inc.
     Ramanathan Kavasseri
@@ -188604,9 +188604,9 @@ Decentralization / Helenic Public Administra
     Gabriele Valentini
       gabriele.valentini&tetsistemi.com
 47256
-  INSTER Tecnologia y comunicaciones
-    José Antonio Cárdenas Montero
-      jcardenas&antatelecom.es
+  INSTER Tecnologia y Comunicaciones
+    Jose Antonio Cardenas Montero
+      jcardenas&inster.es
 47257
   DBC A/S
     Lars Skjærlund
@@ -189839,6 +189839,174 @@ Decentralization / Helenic Public Administra
   Permian Resources, LLC
     Blake Reeves
       Blake.Reeves&PermianResources.com
+47565
+  Forcepoint LLC
+    Security Operations
+      domains&forcepoint.com
+47566
+  Uniper AG
+    Peter Marschall
+      peter.marschall&eon.com
+47567
+  Seifert Logistics GmbH
+    IT Abteilung
+      urgent&seifert-logistics.com
+47568
+  Pantel International
+    Matthew MacDonald
+      mmacdonald&pantelintl.com
+47569
+  FIAMM SoNick S.A.
+    Todeschini Marco
+      marco.todeschini&fiamm.com
+47570
+  Ennnot
+    Maxim Korolyov
+      info&ennnot.ru
+47571
+  Glowpoint
+    Ted Tzeng
+      ttzeng&glowpoint.com
+47572
+  University of Keele
+    Jonathan Knight
+      it.operations&keele.ac.uk
+47573
+  McFarland Clinic
+    Rich Voyek
+      rvoyek&mcfarlandclinic.com
+47574
+  City of Harker Heights
+    Gary Bates
+      gbates&ci.harker-heights.tx.us
+47575
+  AUTEC Gesellschaft fuer Automationstechnik mbH
+    Dr. Hartmut Staerke
+      dhs1&autec-gmbh.de
+47576
+  CapSenze Biosystems AB
+    Dag Erlandsson
+      de&capsenze.se
+47577
+  Newell Rubbermaid
+    Tom Glowacki
+      Tom.Glowacki&newellco.com
+47578
+  Vantiv Inc
+    William Cain
+      william.cain&vantiv.com
+47579
+  Open Software S.r.l.
+    Giuseppe Pitzus
+      giuseppe&osw.it
+47580
+  Liechtensteinische Landesverwaltung
+    Peter Kindle
+      wsc&llv.li
+47581
+  Styevko Attila
+    Styevko Attila
+      attila&sty.hu
+47582
+  Timothy Boronczyk
+    Timothy Boronczyk
+      tboronczyk&gmail.com
+47583
+  Gentrack
+    Vincent Commarieu
+      vincentc&gentrack.com
+47584
+  Hirealton network technology co., LTD
+    xiaojing.weng
+      xiaojing.weng&hirealton.com
+47585
+  上海兆越通讯技术有限公司 (Shanghai Communication Technology Co., Ltd. trillion more)
+    张健荣 (Zhang Jianrong)
+      2472265650&qq.com
+47586
+  Alfing Kessler Sondermaschinen GmbH
+    Dietmar Wieber
+      dwieber&aks.alfing.de
+47587
+  Rack2Cloud Limited
+    Nicholas McDermott
+      nick.mcdermott&rack2cloud.com
+47588
+  StatPro Group Plc.
+    George Palmer
+      george.palmer&statpro.com
+47589
+  Route443 LLP
+    Security Officer
+      info&route443.eu
+47590
+  iik
+    Paul Engel
+      pen&iik.dk
+47591
+  aidounix
+    Aidouni, Frederic
+      snmp&aidounix.com
+47592
+  NJATECH
+    Huzhong
+      huzhong&njatech.net
+47593
+  Shenzhen Electrical Co.
+    NIE YONG JUN
+      nyj981&163.com
+47594
+  Allwaywin Co., Ltd
+    Liu Wei
+      admin&allwaywin.com
+47595
+  cluster
+    wangzhibao
+      wangzhibao163&163.com
+47596
+  INSS
+    Eulaidy Assuncao
+      eulaidyreis&gmail.com
+47597
+  christmann informationstechnik + medien GmbH & Co. KG
+    Wolfgang Christmann
+      mail&christmann.info
+47598
+  Weiss Klimatechnik GmbH
+    Christoph Hammer
+      c.hammer&wkt.com
+47599
+  Changzhou Wisdom Intelligent Technology CO.,LTD.
+    dapeng ye
+      ydp&czwit.com
+47600
+  LLC "Commercial Bank" Bank Talmenka "
+    Cherkashin Dmitriy
+      cherkashin&tb22.ru
+47601
+  Novo Nordisk A/S
+    Preben Stilling Vestergaard
+      prsv&novonordisk.com
+47602
+  pandoranorge
+    John Thingstad
+      jpthing&online.no
+47603
+  eClinicalWorks
+    Paul R. Dittrich
+      paul.dittrich&eclinicalworks.com
+47604
+  OOO NPP ETRA-Plus (Ltd, Research and Production Enterprise)
+    Alexander Arserntiev
+      stolknovenie&gmail.com
+47605
+  OOO BALTSTAR
+    Pavel Galkin
+      administrator&baltstar.net
+47606
+  ocuro
+    Badrul Alam
+      balam&ocuro.net
 
 
 End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index f34cf2e5e6..e53b035b31 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -18224,7 +18224,7 @@ const value_string sminmpec_values[] = {
     { 18201, "Bestseller A/S" },
     { 18202, "Belatronix Kommunikation & EDV" },
     { 18203, "TC Electronic A/S" },
-    { 18204, "Computer And Software Enterprises, Inc." },
+    { 18204, "HPD Software, LLC (formerly 'Computer And Software Enterprises, Inc.')" },
     { 18205, "Pioneer Industries, Inc." },
     { 18206, "iVolve Pty Ltd" },
     { 18207, "ANTs software inc." },
@@ -47276,7 +47276,7 @@ const value_string sminmpec_values[] = {
     { 47253, "secureNET Switzerland Inc." },
     { 47254, "Western Australian Internet Association Inc." },
     { 47255, "T&T sistemi srl" },
-    { 47256, "INSTER Tecnologia y comunicaciones" },
+    { 47256, "INSTER Tecnologia y Comunicaciones" },
     { 47257, "DBC A/S" },
     { 47258, "The Automobile Association (AA PLC)" },
     { 47259, "LUNATICANET" },
@@ -47585,6 +47585,48 @@ const value_string sminmpec_values[] = {
     { 47562, "Chengdu Emfuture Automation Engineering Co., Ltd" },
     { 47563, "Falcon Critical Care Transport" },
     { 47564, "Permian Resources, LLC" },
+    { 47565, "Forcepoint LLC" },
+    { 47566, "Uniper AG" },
+    { 47567, "Seifert Logistics GmbH" },
+    { 47568, "Pantel International" },
+    { 47569, "FIAMM SoNick S.A." },
+    { 47570, "Ennnot" },
+    { 47571, "Glowpoint" },
+    { 47572, "University of Keele" },
+    { 47573, "McFarland Clinic" },
+    { 47574, "City of Harker Heights" },
+    { 47575, "AUTEC Gesellschaft fuer Automationstechnik mbH" },
+    { 47576, "CapSenze Biosystems AB" },
+    { 47577, "Newell Rubbermaid" },
+    { 47578, "Vantiv Inc" },
+    { 47579, "Open Software S.r.l." },
+    { 47580, "Liechtensteinische Landesverwaltung" },
+    { 47581, "Styevko Attila" },
+    { 47582, "Timothy Boronczyk" },
+    { 47583, "Gentrack" },
+    { 47584, "Hirealton network technology co., LTD" },
+    { 47585, "\0344\0270\0212\0346\0265\0267\0345\0205\0206\0350\0266\0212\0351\0200\0232\0350\0256\0257\0346\0212\0200\0346\0234\0257\0346\0234\0211\0351\0231\0220\0345\0205\0254\0345\0217\0270 (Shanghai Communication Technology Co., Ltd. trillion more)" },
+    { 47586, "Alfing Kessler Sondermaschinen GmbH" },
+    { 47587, "Rack2Cloud Limited" },
+    { 47588, "StatPro Group Plc." },
+    { 47589, "Route443 LLP" },
+    { 47590, "iik" },
+    { 47591, "aidounix" },
+    { 47592, "NJATECH" },
+    { 47593, "Shenzhen Electrical Co." },
+    { 47594, "Allwaywin Co., Ltd" },
+    { 47595, "cluster" },
+    { 47596, "INSS" },
+    { 47597, "christmann informationstechnik + medien GmbH & Co. KG" },
+    { 47598, "Weiss Klimatechnik GmbH" },
+    { 47599, "Changzhou Wisdom Intelligent Technology CO.,LTD." },
+    { 47600, "LLC \"Commercial Bank\" Bank Talmenka \"" },
+    { 47601, "Novo Nordisk A/S" },
+    { 47602, "pandoranorge" },
+    { 47603, "eClinicalWorks" },
+    { 47604, "OOO NPP ETRA-Plus (Ltd, Research and Production Enterprise)" },
+    { 47605, "OOO BALTSTAR" },
+    { 47606, "ocuro" },
     {    0, NULL}
 };