[Automatic update for 2015-10-25]

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

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

4 files changed, 172 insertions, 24 deletions

diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 7491b2b1c6..01ab532b86 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2015-10-18)
+(last updated 2015-10-23)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -4430,9 +4430,9 @@ Decimal
     Keith Wiles
       keith&iphase.com
 1104
-  First Virtual Holdings Incorporated
+  Brave Software, Inc.
     Marshall T. Rose
-      mrose&dbc.fv.com
+      mrose&brave.com
 1105
   NetCell Systems, Inc.
     Frank Jiang
@@ -51495,8 +51495,8 @@ Decimal
       jonas.jonsson&terraplay.com
 12985
   University of St Andrews
-    Malcolm Bain
-      m.bain&st-andrews.ac.uk
+    Duncan Brannen
+      dbb&st-andrews.ac.uk
 12986
   Verlagsgruppe Straubinger Tagblatt / Landshuter Zeitung
     Roland Hebertinger
@@ -55555,9 +55555,9 @@ da Faculdade de Ciências e Tecnologia da Universidade Nova de Lisboa
     Thomas MacNeil
       thomasmacneil&yahoo.com
 14000
-  InterZone
-    M. Kabrianis
-      info&interzone.gr
+  Michail Kamprianis
+    Michail Kamprianis
+      michalis.kamprianis&gmail.com
 14001
   DRS Technologies Canada Ltd. (formerly 'DRS Flight Safety and Communications')
     Nikola Vladisavljevic
@@ -102515,8 +102515,8 @@ de Bruxelles, asbl
       fabio.radin&visionee.com
 25736
   Duval County Public Schools
-    Jacqueline S. Moody
-      moodyj&duvalschools.org
+    James Moore
+      moorej&duvalschools.org
 25737
   Reality Communications
     Karl Wagner
@@ -143756,9 +143756,9 @@ Decentralization / Helenic Public Administra
     Warren Steffen
       wsteffen&athenawirelesscommunications.com
 36044
-  NSSR.neT
+  UCC Pro GmbH (formerly 'NSSR.neT')
     Stefan Richter
-      Stefan.Richter&nssr.net
+      Stefan.Richter&UCCPro.ch
 36045
   Uma Electrotechnical Services
     Devendra Kumar Shukla
@@ -151864,9 +151864,9 @@ Decentralization / Helenic Public Administra
     Paul C. Bryan
       pbryan&anode.ca
 38071
-  MaximaTelecom CJSC
-    Sergey Ponomarenko
-      sponomarenko&effts.ru
+  MaximaTelecom JSC
+    Sergey Komarov
+      sk&maximatelecom.ru
 38072
   Linear Photonics, LLC
     Tim Naples
@@ -171961,8 +171961,8 @@ Decentralization / Helenic Public Administra
       mbernard&hyperwallet.com
 43095
   Service2Media B.V.
-    Gerben van der Stouwe
-      gvanderstouwe&service2media.com
+    Robert Hassing
+      robert&service2media.com
 43096
   James Guse (JAG Enterprises)
     James Guse
@@ -180293,8 +180293,8 @@ Decentralization / Helenic Public Administra
       jwdavidson&gmail.com
 45178
   Direktion der Justiz und des Innern des Kantons Zuerich
-    Fabian Jucker
-      fabian.jucker&ji.zh.ch
+    Simon Giger
+      simon.giger&ji.zh.ch
 45179
   Jablotron Alarms a.s.
     Karel Hladik
@@ -186211,6 +186211,114 @@ Decentralization / Helenic Public Administra
   EKCR
     Ziker Koz
       5033282&gmail.com
+46658
+  AssetOwl
+    Fletch Hogan
+      admin&assetowl.com
+46659
+  BBR Verkehrstechnik GmbH
+    Eugen Maier
+      maier&bbr-vt.de
+46660
+  Volvo Group Telematics
+    Ola Dawidson
+      ola.dawidson&volvo.com
+46661
+  Bucherer AG
+    Maurizio Riva
+      IT&bucherer.com
+46662
+  Pointek 
+    Yagiz Yildirim
+      yagiz.yildirim&pointek.com.tr
+46663
+  TORRING SYSTEMS CORP
+    Pavel Kiriakov
+      forhosting&lucky-labs.com
+46664
+  Novatronic
+    Alfredo Guzmán
+      aguzman&novatronic.com
+46665
+  Reshin
+    Viktor Reshin
+      reshin-va&yandex.ru
+46666
+  NPF Modem, Ltd.
+    Alex Gorokhov
+      asg&npfmodem.spb.ru
+46667
+  Limited Liability Company «ICBCOM»
+    Dmitriy Ivushkin
+      divushkin&icbcom.ru
+46668
+  ENX Association
+    Immo Wehrenberg
+      immo.wehrenberg&enx.com
+46669
+  Job Corps
+    Bill Stites
+      stites.bill&jobcorps.org
+46670
+  OCTAGON computer&communication
+    Alexander Steins
+      alexander.steins&octagon.de
+46671
+  Medical Specialists of Fairfield, LLC.
+    Victoria Root
+      Victoria.msf12&gmail.com
+46672
+  PrimeDesign
+    Markus Primes
+      admin&primedesign.at
+46673
+  Minoris
+    Kent Gustavsson
+      kent&minoris.se
+46674
+  cantaa GmbH
+    Andreas Micklei
+      andreas.micklei&cantaa.de
+46675
+  Essential Energy
+    Matt Coman
+      matthew.coman&essentialenergy.com.au
+46676
+  Weir Shared Services Ltd
+    Cory Davis
+      cory.davis&weirgroup.com
+46677
+  XATU
+    HeiSir
+      369946814&qq.com
+46678
+  naksitrallid.com
+    Vladislav Artemyev
+      iana&naksitrallid.com
+46679
+  Bistum Würzburg
+    Michael Seufert
+      Michael.Seufert&bistum-wuerzburg.de
+46680
+  Control Techniques
+    Auryn Hughes
+      auryn.hughes&emerson.com
+46681
+  SV Informatik GmbH
+    Andreas Legler
+      iana&sv-informatik.de
+46682
+  Applied Optoelectronics, Inc.
+    Mark Siejka
+      mark_siejka&ao-inc.com
+46683
+  Zdravec Bulgaria Ltd
+    Alexander Atanasov
+      hw&zdravec-bulgaria.com
+46684
+  Nazessen
+    Peter Breur
+      peytor&gmx.com
 
 
 End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index ac05388a19..86c7e09f9d 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -1124,7 +1124,7 @@ const value_string sminmpec_values[] = {
     {  1101, "MoNet Systems, Inc." },
     {  1102, "Metricom, Inc." },
     {  1103, "Xact, Inc" },
-    {  1104, "First Virtual Holdings Incorporated" },
+    {  1104, "Brave Software, Inc." },
     {  1105, "NetCell Systems, Inc." },
     {  1106, "Uni-QLennart Norlanderlennart.norlander&uniq.se" },
     {  1107, "DISA Space Systems Development Division" },
@@ -14020,7 +14020,7 @@ const value_string sminmpec_values[] = {
     { 13997, "Invisible Industries" },
     { 13998, "Conceptual MindWorks, Inc." },
     { 13999, "ItsNotA.com" },
-    { 14000, "InterZone" },
+    { 14000, "Michail Kamprianis" },
     { 14001, "DRS Technologies Canada Ltd. (formerly 'DRS Flight Safety and Communications')" },
     { 14002, "University of Wisconsin - Whitewater" },
     { 14003, "Saint Mary's College" },
@@ -36064,7 +36064,7 @@ const value_string sminmpec_values[] = {
     { 36041, "KAMAZ Inc." },
     { 36042, "LIAB ApS" },
     { 36043, "Athena Wireless Communications Inc." },
-    { 36044, "NSSR.neT" },
+    { 36044, "UCC Pro GmbH (formerly 'NSSR.neT')" },
     { 36045, "Uma Electrotechnical Services" },
     { 36046, "tdvine Co., Ltd" },
     { 36047, "Kadme AS" },
@@ -38091,7 +38091,7 @@ const value_string sminmpec_values[] = {
     { 38068, "Centrastate Medical Center, Inc." },
     { 38069, "Cetis, Inc." },
     { 38070, "Anode" },
-    { 38071, "MaximaTelecom CJSC" },
+    { 38071, "MaximaTelecom JSC" },
     { 38072, "Linear Photonics, LLC" },
     { 38073, "Defense Photonics Group" },
     { 38074, "Statropy Software LLC" },
@@ -46678,6 +46678,33 @@ const value_string sminmpec_values[] = {
     { 46655, "Innofidei Technologies Inc." },
     { 46656, "Polskie Koleje Pa\0305\0204stwowe S.A." },
     { 46657, "EKCR" },
+    { 46658, "AssetOwl" },
+    { 46659, "BBR Verkehrstechnik GmbH" },
+    { 46660, "Volvo Group Telematics" },
+    { 46661, "Bucherer AG" },
+    { 46662, "Pointek " },
+    { 46663, "TORRING SYSTEMS CORP" },
+    { 46664, "Novatronic" },
+    { 46665, "Reshin" },
+    { 46666, "NPF Modem, Ltd." },
+    { 46667, "Limited Liability Company \0302\0253ICBCOM\0302\0273" },
+    { 46668, "ENX Association" },
+    { 46669, "Job Corps" },
+    { 46670, "OCTAGON computer&communication" },
+    { 46671, "Medical Specialists of Fairfield, LLC." },
+    { 46672, "PrimeDesign" },
+    { 46673, "Minoris" },
+    { 46674, "cantaa GmbH" },
+    { 46675, "Essential Energy" },
+    { 46676, "Weir Shared Services Ltd" },
+    { 46677, "XATU" },
+    { 46678, "naksitrallid.com" },
+    { 46679, "Bistum W\0303\0274rzburg" },
+    { 46680, "Control Techniques" },
+    { 46681, "SV Informatik GmbH" },
+    { 46682, "Applied Optoelectronics, Inc." },
+    { 46683, "Zdravec Bulgaria Ltd" },
+    { 46684, "Nazessen" },
     {    0, NULL}
 };
 
diff --git a/manuf b/manuf
index 4245008cfc..ff90127a06 100644
--- a/manuf
+++ b/manuf
@@ -506,7 +506,7 @@
 00:01:C5	SimplerN               # Simpler Networks
 00:01:C6	QuarryTe               # Quarry Technologies
 00:01:C7	CiscoInc               # Cisco Systems, Inc
-00:01:C8	Conrad                 # CONRAD CORP.
+00:01:C8	ThomasCo               # THOMAS CONRAD CORP.
 00:01:C9	CiscoInc               # Cisco Systems, Inc
 00:01:CA	GeocastN               # Geocast Network Systems, Inc.
 00:01:CB	Evr                    # EVR
@@ -17593,6 +17593,7 @@
 0C:C8:1F	SummerIn               # Summer Infant, Inc.
 0C:C9:C6	SamwinHo               # Samwin Hong Kong Limited
 0C:CB:8D	AscoNuma               # ASCO Numatics GmbH
+0C:CC:26	Airenetw               # Airenetworks
 0C:CD:D3	Eastrive               # EASTRIVER TECHNOLOGY CO., LTD.
 0C:CD:FB	Edic                   # EDIC Systems Inc.
 0C:CF:D1	Springwa               # SPRINGWAVE Co., Ltd
@@ -18013,6 +18014,7 @@
 18:DC:56	YulongCo               # Yulong Computer Telecommunication Scientific(shenzhen)Co.,Lt
 18:E2:88	SttCondi               # STT Condigi
 18:E2:C2	SamsungE               # Samsung Electronics
+18:E3:BC	TctMobil               # TCT mobile ltd
 18:E7:28	CiscoInc               # Cisco Systems, Inc
 18:E7:F4	Apple                  # Apple, Inc.
 18:E8:0F	VikingEl               # Viking Electronics Inc.
@@ -20174,6 +20176,7 @@
 4C:AB:33	KstTechn               # KST technology
 4C:AC:0A	ZteCorpo               # zte corporation
 4C:AE:31	Shenghai               # ShengHai Electronics (Shenzhen) Ltd
+4C:B0:E8	BeijingR               # Beijing RongZhi xinghua technology co., LTD
 4C:B1:6C	HuaweiTe               # HUAWEI TECHNOLOGIES CO.,LTD
 4C:B1:99	Apple                  # Apple, Inc.
 4C:B4:EA	HrdSPte                # HRD (S) PTE., LTD.
@@ -21658,6 +21661,7 @@
 70:B3:D5:52:40:00/36	WuxiNewO               # Wuxi New Optical Communication Co.,Ltd.
 70:B3:D5:52:B0:00/36	GeAviati               # GE Aviation Cheltenham
 70:B3:D5:52:D0:00/36	TanakaEl               # Tanaka Electric Industry Co., Ltd.
+70:B3:D5:52:E0:00/36	Swisspon               # Swissponic Sagl
 70:B3:D5:53:00:00/36	Isis-ExL               # iSiS-Ex Limited
 70:B3:D5:53:80:00/36	Sydetion               # sydetion UG (h.b.)
 70:B3:D5:54:D0:00/36	QingdaoH               # Qingdao Haitian Weiye Automation Control System Co., Ltd
@@ -21698,6 +21702,7 @@
 70:B3:D5:5F:F0:00/36	VaisalaO               # Vaisala Oyj
 70:B3:D5:60:00:00/36	Stellwer               # Stellwerk GmbH
 70:B3:D5:60:50:00/36	AplexTec               # Aplex Technology Inc.
+70:B3:D5:60:90:00/36	PbsiGrou               # PBSI Group Limited
 70:B3:D5:60:B0:00/36	Edgeware               # Edgeware AB
 70:B3:D5:60:C0:00/36	IstElekt               # IST ElektronikgesmbH
 70:B3:D5:61:00:00/36	Polvisio               # POLVISION
@@ -22074,6 +22079,7 @@
 70:B3:D5:D0:D0:00/36	Logiwast               # Logiwaste AB
 70:B3:D5:D0:E0:00/36	BeijingA               # Beijing Aumiwalker technology CO.,LTD
 70:B3:D5:D1:20:00/36	Fideltro               # FIDELTRONIK POLAND SP. Z O.O.
+70:B3:D5:D1:B0:00/36	GrupoEpe               # Grupo Epelsa S.L.
 70:B3:D5:D1:E0:00/36	HoustonR               # Houston Radar LLC
 70:B3:D5:D1:F0:00/36	EmbsecAb               # Embsec AB
 70:B3:D5:D2:90:00/36	Sportzca               # Sportzcast
@@ -22385,6 +22391,7 @@
 74:BF:A1	Hyunteck               # HYUNTECK
 74:C2:46	AmazonTe               # Amazon Technologies Inc.
 74:C6:21	Zhejiang               # Zhejiang Hite Renewable Energy Co.,LTD
+74:C6:3B	Azurewav               # AzureWave Technology Inc.
 74:C9:9A	Ericsson               # Ericsson AB
 74:CA:25	Calxeda                # Calxeda, Inc.
 74:CD:0C	SmithMye               # Smith Myers Communications Ltd.
@@ -23086,6 +23093,7 @@
 88:95:B9	UnifiedP               # Unified Packet Systems Crop
 88:96:76	TtcMarco               # TTC MARCONI s.r.o.
 88:96:B6	GlobalFi               # Global Fire Equipment S.A.
+88:96:F2	ValeoSch               # Valeo Schalter und Sensoren GmbH
 88:97:DF	Entrypas               # Entrypass Corporation Sdn. Bhd.
 88:98:21	Teraon                 # TERAON
 88:9B:39	SamsungE               # Samsung Electronics Co.,Ltd
@@ -23649,6 +23657,7 @@
 9C:04:EB	Apple                  # Apple, Inc.
 9C:06:6E	HyteraCo               # Hytera Communications Corporation Limited
 9C:0D:AC	Tymphany               # Tymphany HK Limited
+9C:0E:4A	Shenzhen               # Shenzhen Vastking Electronic Co.,Ltd.
 9C:14:65	EdataEle               # Edata Elektronik San. ve Tic. A.Ş.
 9C:18:74	NokiaDan               # Nokia Danmark A/S
 9C:1C:12	ArubaNet               # Aruba Networks
@@ -23882,6 +23891,7 @@ A0:C6:EC	Shenzhen               # ShenZhen ANYK Technology Co.,LTD
 A0:CE:C8	CeLinkLi               # CE LINK LIMITED
 A0:CF:5B	CiscoInc               # Cisco Systems, Inc
 A0:D1:2A	AxproTec               # AXPRO Technology Inc.
+A0:D3:7A	IntelCor               # Intel Corporate
 A0:D3:C1	HewlettP               # Hewlett Packard
 A0:DA:92	NanjingG               # Nanjing Glarun Atten Technology Co. Ltd.
 A0:DC:04	Becker-A               # Becker-Antriebe GmbH
@@ -24091,6 +24101,7 @@ A8:49:A5	Lisantec               # Lisantech Co., Ltd.
 A8:54:B2	WistronN               # Wistron Neweb Corp.
 A8:55:6A	Pocketne               # Pocketnet Technology Inc.
 A8:57:4E	Tp-LinkT               # TP-LINK TECHNOLOGIES CO.,LTD.
+A8:58:40	Cambridg               # Cambridge Industries(Group) Co.,Ltd.
 A8:5B:78	Apple                  # Apple, Inc.
 A8:5B:B0	Shenzhen               # Shenzhen Dehoo Technology Co.,Ltd
 A8:5B:F3	AudivoGm               # Audivo GmbH
@@ -25260,6 +25271,7 @@ CC:19:A8	PtInovaç               # PT Inovação e Sistemas SA
 CC:1A:FA	ZteCorpo               # zte corporation
 CC:1B:E0	IeeeRegi               # IEEE Registration Authority
 CC:1E:FF	Metrolog               # Metrological Group BV
+CC:1F:C4	Invue                  # InVue
 CC:20:E8	Apple                  # Apple, Inc.
 CC:22:18	Innodigi               # InnoDigital Co., Ltd.
 CC:25:EF	Apple                  # Apple, Inc.
diff --git a/services b/services
index 7565fa3f48..cd7bb9a7c2 100644
--- a/services
+++ b/services
@@ -8469,6 +8469,7 @@ actifio-c2c      5103/tcp # Actifio C2C [Ravi_Kollipara] [Ravi_Kollipara] 2010-0
 tinymessage      5104/udp # TinyMessage [Josip_Medved] [Josip_Medved] 2010-10-20
 hughes-ap        5105/udp # Hughes Association Protocol [Varun_Santosh] [Varun_Santosh] 2010-10-20
 actifioudsagent  5106/tcp # Actifio UDS Agent [Actifio] [Madhav_Mutalik] 2014-06-05
+actifioreplic    5107/tcp # Disk to Disk replication between Actifio Clusters [Actifio] [Madhav_Mutalik] 2015-10-23
 taep-as-svc      5111/tcp # TAEP AS service [Liu_Changchun] [Liu_Changchun] 2008-11-05
 taep-as-svc      5111/udp # TAEP AS service [Liu_Changchun] [Liu_Changchun] 2008-11-05
 pm-cmdsvr        5112/tcp # PeerMe Msg Cmd Service [Marcos_Della] [Marcos_Della] 2005-08