[Automatic update for 2016-05-08]

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

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

2 files changed, 176 insertions, 26 deletions

diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index c4283bdb40..99baa5bb61 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2016-05-01)
+(last updated 2016-05-08)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -16334,9 +16334,9 @@ Decimal
     Steve Timko
       steve&timko.com
 4083
-  Telecom New Zealand
-    Michael Cray
-      michael.cray&team.xtra.co.nz
+  Spark New Zealand (formerly 'Telecom New Zealand')
+    IAM Team
+      iamteam&spark.co.nz
 4084
   Trilogy Development Group
     David Meeker
@@ -65127,9 +65127,9 @@ da Faculdade de Ciências e Tecnologia da Universidade Nova de Lisboa
     Sean Champ
       schamp&users.sourceforge.net
 16394
-  Pigeon Point Systems
+  Pentair Technical Products (formerly 'Pigeon Point Systems')
     Rich Vasse
-      rich&pigeonpoint.com
+      Richard.Vasse&pentair.com
 16395
   William R Sowerbutts
     William R Sowerbutts
@@ -116111,9 +116111,9 @@ Decentralization / Helenic Public Administra
     M. de Ridder
       marnix.de.ridder&rivm.nl
 29133
-  ATIS Systems GmbH
+  ATIS UHER S.A.
     Patrick Roth
-      Patrick.Roth&atis-systems.com
+      Patrick.Roth&voicecollect.net
 29134
   SpeedXS
     Attilla de Groot
@@ -128027,9 +128027,9 @@ Decentralization / Helenic Public Administra
     Peyo Hristov
       peyo&digitalsol.net
 32112
-  VCS Computer-Systeme GmbH
+  CENARIO systems GmbH (formerly 'VCS Computer-Systeme GmbH')
     Christian Kirschner
-      Christian.Kirschner&vcs-web.de
+      iana.pen&vcs-web.de
 32113
   Vocord
     Alexey Kadeishvili
@@ -131395,9 +131395,9 @@ Decentralization / Helenic Public Administra
     Peter Schuetz
       ps&yat.de
 32954
-  Matrix SpA
-    Alessandro Maestri
-      alessandro.maestri&matrix.it
+  Italiaonline S.p.A.
+    Mantovani Alberto
+      alberto.mantovani&italiaonline.it
 32955
   Hrvatske sume d.o.o
     Ratko Pacadi
@@ -131768,7 +131768,7 @@ Decentralization / Helenic Public Administra
       Christopher.Banck&nextwerk.de
 33047
   Freifunk Potsdam e.V.
-    Thomas Mellenthin
+    Kai Sommer
       iana&freifunk-potsdam.de
 33048
   Brand
@@ -136908,8 +136908,8 @@ Decentralization / Helenic Public Administra
       anssi.kolehmainen&vilant.com
 34332
   Forex Club International Ltd
-    Proskurin Kirill
-      sysadmin&fxclub.org
+    Aleksandr Ivanov
+      ivanov-av&fxclub.org
 34333
   Streamit BV
     Johan van der Stoel
@@ -158032,9 +158032,9 @@ Decentralization / Helenic Public Administra
     Semyon Chaichenets
       semyon.chaichenets&stantec.com
 39613
-  Torres Networks
-    Jude Pragash V.
-      v.jude&torresnetworks.com
+  Sawridge Systems India Pvt Ltd
+    Pothirajan Kandasamy
+      pothirajan.kandasamy&sawridgesystems.com
 39614
   Valid
     Ben van Zanten
@@ -190214,7 +190214,7 @@ Decentralization / Helenic Public Administra
 47658
   ZITH
     Sherwood Wang
-      sherwood&zith.org
+      sherwoodwang&zith.org
 47659
   Actions-Micro
     Tingya Wang
@@ -190527,6 +190527,126 @@ Decentralization / Helenic Public Administra
   L2M Solutions doo
     Miljan Djakonovic
       office&l2m.rs
+47737
+  BLUETOWN
+    Jesper Sandberg
+      js&bluetown.com
+47738
+  MilDef AB
+    Christoffer Martinsson
+      christoffer.martinsson&mildef.com
+47739
+  Fam.Andersson Skog AB
+    Marie Andersson
+      marie&askog.se
+47740
+  Holmen Skog AB
+    Christer Hörnfeldt
+      christer.hornfeldt&holmenskog.com
+47741
+  Vista Entertainment Solutions
+    Christoph Berthoud
+      christoph.berthoud&vista.co
+47742
+  V-Key Pte Ltd
+    Yoong Kwek Yuan
+      itsupport&v-key.com
+47743
+  Atelios Communication Systems GmbH
+    Hans-Juergen Schmidt
+      hans.schmidt&atelios.de
+47744
+  Tomra ASA
+    Vincent Ambo
+      vincent.ambo&tomra.com
+47745
+  Monmouth Hematology Oncology
+    Margaret Bell
+      mbell&barnabashealth.org
+47746
+  Celgene
+    Kushal Mukehrjee
+      kmukherjee&celgene.com
+47747
+  Oakwood Controls
+    John Harrell
+      admin&oakwoodcontrols.com
+47748
+  Rubricall, SL
+    Alejandro Pinedo
+      aph&rubricall.com
+47749
+  GemTalk Systems
+    Norm Green
+      norm.green&gemtalksystems.com
+47750
+  Bring Dialog Norge AS
+    Kim Olsen
+      support&bringdialog.no
+47751
+  Mattersight Corporation
+    Steven Anderson
+      steven.anderson&mattersight.com
+47752
+  Lycee Louis Armand
+    Ewen PRIGENT
+      ewen.prigent&ac-creteil.fr
+47753
+  Aperi Corporation
+    Brian Keane
+      bkeane&apericorp.com
+47754
+  Core Services Corporation
+    Michael Rulf
+      mrulf&coreservices.com
+47755
+  OpenRat CMS
+    Jan Dankert
+      jan.2016&jandankert.de
+47756
+  Global Oncology, Inc
+    LiiShin
+      lslin&global-oncology.com
+47757
+  Bariq Electronics
+    Muhammad Yahya
+      meetyahya&outlook.com
+47758
+  Służba Więzienna
+    Marcin Woldan
+      webmaster&sw.gov.pl
+47759
+  Sociedade Educacional Braz Cubas Ltda
+    Andre Janna
+      andre61&brazcubas.br
+47760
+  County of El Dorado
+    Tim Liston
+      tim.liston&edcgov.us
+47761
+  Wishnmix Ltd
+    Justin Megawarne
+      justin.megawarne&wishnmix.com
+47762
+  Section9
+    Mark Mc Nicholas
+      markmcn&section9.ie
+47763
+  OfficeFlex LLC
+    Bimal Saraiya
+      bimal&officeflexplano.com
+47764
+  Elektrownia Rybnik
+    Jan Radwański
+      jan.radwanski&edf.pl
+47765
+  DOC.INFOSAFE (ISRAEL) LTD
+    Andrei Tseitlin
+      it&swissinfocloud.ch
+47766
+  MACNICA FUJI ELECTRONICS HOLDINGS, INC.
+    Jiaqi Chen
+      chen-j&macnica.co.jp
 
 
 End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index ee8c5497e8..1aa44227f7 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -4103,7 +4103,7 @@ const value_string sminmpec_values[] = {
     {  4080, "Archangels Realty, Inc." },
     {  4081, "Zelea" },
     {  4082, "Timko Enterprises" },
-    {  4083, "Telecom New Zealand" },
+    {  4083, "Spark New Zealand (formerly 'Telecom New Zealand')" },
     {  4084, "Trilogy Development Group" },
     {  4085, "D.I.B. Ges. fuer Standortbetreiberdienste mbH" },
     {  4086, "Ericsson Research Montreal (LMC)" },
@@ -16414,7 +16414,7 @@ const value_string sminmpec_values[] = {
     { 16391, "RouteOne" },
     { 16392, "Cortland Communications" },
     { 16393, "Sean Champ Enterprises" },
-    { 16394, "Pigeon Point Systems" },
+    { 16394, "Pentair Technical Products (formerly 'Pigeon Point Systems')" },
     { 16395, "William R Sowerbutts" },
     { 16396, "justinknash.com" },
     { 16397, "U.S. Army ALTESS" },
@@ -29153,7 +29153,7 @@ const value_string sminmpec_values[] = {
     { 29130, "Lithuanian Academy of Physical Education" },
     { 29131, "PERSONAL_JG" },
     { 29132, "CalNet" },
-    { 29133, "ATIS Systems GmbH" },
+    { 29133, "ATIS UHER S.A." },
     { 29134, "SpeedXS" },
     { 29135, "Salvad\0303\0250 S.r.l." },
     { 29136, "Toys R Us Corporation" },
@@ -32132,7 +32132,7 @@ const value_string sminmpec_values[] = {
     { 32109, "ADC Co.,LLC" },
     { 32110, "IPVox Sdn Bhd" },
     { 32111, "Digital Solutions Ltd." },
-    { 32112, "VCS Computer-Systeme GmbH" },
+    { 32112, "CENARIO systems GmbH (formerly 'VCS Computer-Systeme GmbH')" },
     { 32113, "Vocord" },
     { 32114, "ORELIA SAS" },
     { 32115, "Zweites Deutsches Fernsehen Anstalt des oeffentlichen Rechts" },
@@ -32974,7 +32974,7 @@ const value_string sminmpec_values[] = {
     { 32951, "Wellseeing Communication Technology Co.,Ltd" },
     { 32952, "PheeNet Technology Corp." },
     { 32953, "YACOUB Automatiom GmbH" },
-    { 32954, "Matrix SpA" },
+    { 32954, "Italiaonline S.p.A." },
     { 32955, "Hrvatske sume d.o.o" },
     { 32956, "ipct.net" },
     { 32957, "IN Switch Solutions" },
@@ -39633,7 +39633,7 @@ const value_string sminmpec_values[] = {
     { 39610, "BITLANCER LLC" },
     { 39611, "Video Design Software Inc." },
     { 39612, "Stantec Consulting" },
-    { 39613, "Torres Networks" },
+    { 39613, "Sawridge Systems India Pvt Ltd" },
     { 39614, "Valid" },
     { 39615, "2008mcitp.com" },
     { 39616, "GlasgowNet" },
@@ -47757,6 +47757,36 @@ const value_string sminmpec_values[] = {
     { 47734, "Nomura Holdings, Inc." },
     { 47735, "Toyam Cox" },
     { 47736, "L2M Solutions doo" },
+    { 47737, "BLUETOWN" },
+    { 47738, "MilDef AB" },
+    { 47739, "Fam.Andersson Skog AB" },
+    { 47740, "Holmen Skog AB" },
+    { 47741, "Vista Entertainment Solutions" },
+    { 47742, "V-Key Pte Ltd" },
+    { 47743, "Atelios Communication Systems GmbH" },
+    { 47744, "Tomra ASA" },
+    { 47745, "Monmouth Hematology Oncology" },
+    { 47746, "Celgene" },
+    { 47747, "Oakwood Controls" },
+    { 47748, "Rubricall, SL" },
+    { 47749, "GemTalk Systems" },
+    { 47750, "Bring Dialog Norge AS" },
+    { 47751, "Mattersight Corporation" },
+    { 47752, "Lycee Louis Armand" },
+    { 47753, "Aperi Corporation" },
+    { 47754, "Core Services Corporation" },
+    { 47755, "OpenRat CMS" },
+    { 47756, "Global Oncology, Inc" },
+    { 47757, "Bariq Electronics" },
+    { 47758, "S\0305\0202u\0305\0274ba Wi\0304\0231zienna" },
+    { 47759, "Sociedade Educacional Braz Cubas Ltda" },
+    { 47760, "County of El Dorado" },
+    { 47761, "Wishnmix Ltd" },
+    { 47762, "Section9" },
+    { 47763, "OfficeFlex LLC" },
+    { 47764, "Elektrownia Rybnik" },
+    { 47765, "DOC.INFOSAFE (ISRAEL) LTD" },
+    { 47766, "MACNICA FUJI ELECTRONICS HOLDINGS, INC." },
     {    0, NULL}
 };