[Automatic update for 2018-07-01]

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

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

3 files changed, 196 insertions, 16 deletions

diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 09ec214fc1..6a2def2fe5 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2018-06-23)
+(last updated 2018-06-29)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -41143,8 +41143,8 @@ Decimal
       dcesi_bgp&itiltd.co.in
 10297
   Advantech Co., Ltd.
-    Franz Wei
-      franz.wei&advantech.com.tw
+    Guider Lee
+      guider.lee&advantech.com.tw
 10298
   Arbeitsgemeinschaft fuer total abgehobene Technologie
     Alexander Talos
@@ -54575,8 +54575,8 @@ Decimal
       agascon&bancozaragozano.es
 13755
   Carleton College
-    Richard L. Goerwitz III
-      richard.goerwitz&carleton.edu
+    Webmasters and Sysadmins
+      iana-tech-contact&carleton.edu
 13756
   C-LOG International
     Francisco Guiomar
@@ -56043,9 +56043,9 @@ da Faculdade de Ciências e Tecnologia da Universidade Nova de Lisboa
     Yvan Cottyn
       technical&stone-it.be
 14122
-  Wireless Broadband Alliance Ltd (formerly 'Wi-Fi Alliance')
-    Bhavani Prasad Yerrapalli
-      bhavaniprasad&wballiance.net
+  Wireless Broadband Alliance Ltd
+    Bruno Tomas
+      bruno&wballiance.com
 14123
   Expertcity Inc.
     Anshuman Kanwar
@@ -73884,8 +73884,8 @@ da Faculdade de Ciências e Tecnologia da Universidade Nova de Lisboa
       r_stucke&yahoo.com
 18583
   Bit 9 Inc.
-    Ian Poynter
-      contact-a&bit9inc.com
+    Todd Stadelhofer
+      tstadelhofer&carbonblack.com
 18584
   Avanex  Co.
     Phillip Wang
@@ -106195,8 +106195,8 @@ Institute
       fm_tech&nttr.co.jp
 26655
   Advantech Co., Ltd
-    Thomas Chung
-      thomas.chung&advantech.com.tw
+    Guider Lee
+      guider.lee&advantech.com.tw
 26656
   Allan Associates
     Edward Allan
@@ -143749,7 +143749,7 @@ Decentralization / Helenic Public Administra
       soroka&kamaz.org
 36042
   LIAB ApS
-    Mikkel S. Andersen
+    Mikael Dich
       info&liab.dk
 36043
   Athena Wireless Communications Inc.
@@ -208491,6 +208491,150 @@ Decentralization / Helenic Public Administra
   Avanfort
     Serg Kalashnikov
       serg&niform.ru
+52228
+  music support group
+    Michael Hendel
+      technik&musicsupportgroup.com
+52229
+  Roboteurs Inc
+    Reiner Schmidt
+      reinerschmidt&roboteurs.com
+52230
+  WuHan SanJiang Space Network Communication Co,LTD
+    Gao Quan
+      24420546&qq.com
+52231
+  sentieris
+    jim chu
+      jim&sentieris.com
+52232
+  Bitline Informatikberatung GmbH
+    Daniel Metzger
+      daniel.metzger&bitline.ch
+52233
+  Internetswitch
+    Maarten Wolzak
+      iana-pen&internetswitch.com
+52234
+  Hostsharing eG
+    Hostmaster of the Day
+      info&hostsharing.net
+52235
+  ZheJiang Taoshi Technology CO.,LTD.
+    Chuanfeng Zhang
+      zhangcf&topsvision.net
+52236
+  Lyon e-Sport
+    Etienne Glossi
+      administratif&lyon-esport.fr
+52237
+  Covenant Transportation Group
+    Howell Strain
+      hstrain&covenanttransport.com
+52238
+  AMP Robotics
+    Richard Stilborn
+      richard&amprobotics.com
+52239
+  Kernel Labs Inc.
+    Steven Toth
+      stoth&kernellabs.com
+52240
+  Piwiteam
+    Nicolas Rodrigues
+      nicolasrodrigues&outlook.fr
+52241
+  CENTRAL COAST MEDICAL ONCOLOGY CORP
+    Melody Plotner
+      melody&ccmo.us
+52242
+  Wataniya Mobile
+    Samer Hussein
+      samer.hussein&wataniya.ps
+52243
+  Luminor Bank AS
+    Mindaugas Apanavicius
+      pki&luminorgroup.com
+52244
+  NetWorkS!
+    Adam Milewski
+      certyfikaty&networks.pl
+52245
+  meituan
+    chuanjun Liu
+      liuchuanjun&meituan.com
+52246
+  HMSHost
+    Ryan Fondren
+      ryan.fondren&hmshost.com
+52247
+  Vivo Telefonica
+    Romulo Paulo
+      romulo.paulo&telefonica.com
+52248
+  Altergy Systems
+    Matthew Ellington
+      matthew.ellington&altergy.com
+52249
+  Jefferson Lab
+    Marty Wise
+      wise&jlab.org
+52250
+  First Weber, Inc.
+    Mike Steinhilber
+      steinhilberm&firstweber.com
+52251
+  Enconnex LLC
+    Thane Moore
+      thane&enconnex.com
+52252
+  MNF Group
+    James Woods
+      james.woods&mnfgroup.limited
+52253
+  Symbio Networks
+    James Woods
+      james.woods&symbionetworks.com
+52254
+  Dabee.ca
+    Ryan Workman
+      workerbe&gmail.com
+52255
+  Woodridge Baptist Church
+    Barry Merritt
+      bmerritt&woodridge.org
+52256
+  GloryTrust, LLC
+    OID Administrator
+      oidadmin&glorytrust.com
+52257
+  Ufi Space Co., Ltd.
+    Moore Lee
+      moore.cc.lee&ufispace.com
+52258
+  SDNIMO
+    Mark Chen
+      markchen&bjnimo.com
+52259
+  PSiDEO SA
+    Patrick Stuto
+      patrick.stuto&psideo.com
+52260
+  happn
+    Vincent Batoufflet
+      ops&happn.com
+52261
+  Suomen Tilaajavastuu Oy
+    Ville Niskala
+      admin&tilaajavastuu.fi
+52262
+  Service Benefit Plan Administrative Services Corp
+    Robert Wiseman
+      robert.wiseman&fepoc.com
+52263
+  NK Lundströms Trävaror AB
+    Anna Hansson
+      anna.hansson&nkltra.se
 
 
 End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index 3d018bd2cb..b7afcb1bb5 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -14142,7 +14142,7 @@ const value_string sminmpec_values[] = {
     { 14119, "Netlife AG" },
     { 14120, "Letifer.org" },
     { 14121, "Stone-IT" },
-    { 14122, "Wireless Broadband Alliance Ltd (formerly 'Wi-Fi Alliance')" },
+    { 14122, "Wireless Broadband Alliance Ltd" },
     { 14123, "Expertcity Inc." },
     { 14124, "UK/CA/JN Joint Astronomy Centre" },
     { 14125, "SENAO INTERNATIONAL CO., Ltd." },
@@ -52248,6 +52248,42 @@ const value_string sminmpec_values[] = {
     { 52225, "Block Array Corporation" },
     { 52226, "PEPE Invest s.r.o." },
     { 52227, "Avanfort" },
+    { 52228, "music support group" },
+    { 52229, "Roboteurs Inc" },
+    { 52230, "WuHan SanJiang Space Network Communication Co,LTD" },
+    { 52231, "sentieris" },
+    { 52232, "Bitline Informatikberatung GmbH" },
+    { 52233, "Internetswitch" },
+    { 52234, "Hostsharing eG" },
+    { 52235, "ZheJiang Taoshi Technology CO.,LTD." },
+    { 52236, "Lyon e-Sport" },
+    { 52237, "Covenant Transportation Group" },
+    { 52238, "AMP Robotics" },
+    { 52239, "Kernel Labs Inc." },
+    { 52240, "Piwiteam" },
+    { 52241, "CENTRAL COAST MEDICAL ONCOLOGY CORP" },
+    { 52242, "Wataniya Mobile" },
+    { 52243, "Luminor Bank AS" },
+    { 52244, "NetWorkS!" },
+    { 52245, "meituan" },
+    { 52246, "HMSHost" },
+    { 52247, "Vivo Telefonica" },
+    { 52248, "Altergy Systems" },
+    { 52249, "Jefferson Lab" },
+    { 52250, "First Weber, Inc." },
+    { 52251, "Enconnex LLC" },
+    { 52252, "MNF Group" },
+    { 52253, "Symbio Networks" },
+    { 52254, "Dabee.ca" },
+    { 52255, "Woodridge Baptist Church" },
+    { 52256, "GloryTrust, LLC" },
+    { 52257, "Ufi Space Co., Ltd." },
+    { 52258, "SDNIMO" },
+    { 52259, "PSiDEO SA" },
+    { 52260, "happn" },
+    { 52261, "Suomen Tilaajavastuu Oy" },
+    { 52262, "Service Benefit Plan Administrative Services Corp" },
+    { 52263, "NK Lundstr\0303\0266ms Tr\0303\0244varor AB" },
     {    0, NULL}
 };
 
diff --git a/services b/services
index 4ee6cb7739..96273b11ce 100644
--- a/services
+++ b/services
@@ -1103,8 +1103,8 @@ qmqp              628/udp # QMQP [D_J_Bernstein] [D_J_Bernstein] 2018-04-05
 3com-amp3         629/udp # 3Com AMP3 [Prakash_Banthia] [Prakash_Banthia]
 rda               630/tcp # RDA [John_Hadjioannou] [John_Hadjioannou]
 rda               630/udp # RDA [John_Hadjioannou] [John_Hadjioannou]
-ipp               631/tcp # IPP (Internet Printing Protocol) [Carl_Uno_Manros] [Carl_Uno_Manros] Defined TXT keys: See BonjourPrinting.pdf.
-ipp               631/udp # IPP (Internet Printing Protocol) [Carl_Uno_Manros] [Carl_Uno_Manros] Defined TXT keys: See BonjourPrinting.pdf.
+ipp               631/tcp # IPP (Internet Printing Protocol) [IESG] [IESG] 2018-06-29 Defined TXT keys: See BonjourPrinting.pdf.
+ipp               631/udp # IPP (Internet Printing Protocol) [IESG] [IESG] 2018-06-29 Defined TXT keys: See BonjourPrinting.pdf.
 bmpp              632/tcp # bmpp [Troy_Rollo] [Troy_Rollo]
 bmpp              632/udp # bmpp [Troy_Rollo] [Troy_Rollo]
 servstat          633/tcp # Service Status update (Sterling Software) [Greg_Rose] [Greg_Rose]