[Automatic update for 2017-12-31]

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

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

1 files changed, 60 insertions, 4 deletions

diff --git a/manuf b/manuf
index d97ec4e597..b730b4c8c9 100644
--- a/manuf
+++ b/manuf
@@ -5750,7 +5750,7 @@
 00:16:59	ZMPRadwa	Z.M.P. Radwag
 00:16:5A	HarmanSp	Harman Specialty Group
 00:16:5B	GripAudi	Grip Audio
-00:16:5C	Trackflo	Trackflow Ltd
+00:16:5C	Trackflo	Trackflow Ltd.
 00:16:5D	Airdefen	AirDefense, Inc.
 00:16:5E	Precisio	Precision I/O
 00:16:5F	Fairmoun	Fairmount Automation
@@ -8433,7 +8433,7 @@
 00:20:0B	Octagon	Octagon Systems Corp.
 00:20:0C	Adastra		Adastra Systems Corp
 00:20:0D	CarlZeis	Carl Zeiss
-00:20:0E	Satellit	Satellite Technology Mgmt, Inc
+00:20:0E	Nsslglob	NSSLGlobal Technologies AS
 00:20:0F	Ebrains	EBRAINS Inc
 00:20:10	JeolSyst	Jeol System Technology Co. Ltd
 00:20:11	Canopus		Canopus Co Ltd
@@ -13360,7 +13360,7 @@
 00:50:C2:94:20:00/36	KeithKoe	Keith & Koep GmbH
 00:50:C2:94:30:00/36	Quanzhou	QuanZhou TDX Electronics Co., Ltd.
 00:50:C2:94:40:00/36	Wireonai	Wireonair A/S
-00:50:C2:94:50:00/36	Ex-IFlow	Ex-i Flow Measurement Ltd.
+00:50:C2:94:50:00/36	ExiFlowM	Exi Flow Measurement Ltd
 00:50:C2:94:60:00/36	MegwareC	MEGWARE Computer GmbH
 00:50:C2:94:70:00/36	Imexhigh	IMEXHIGHWAY cvba
 00:50:C2:94:80:00/36	Electron	Electronia
@@ -15158,6 +15158,7 @@
 00:56:2B	Cisco	Cisco Systems, Inc
 00:56:CD	Apple	Apple, Inc.
 00:57:D2	Cisco	Cisco Systems, Inc
+00:58:3F	PcAquari	PC Aquarius
 00:59:07	Lenovoem	LenovoEMC Products USA, LLC
 00:59:79	Networke	Networked Energy Services
 00:59:AC	KpnBV	Kpn. B.V.
@@ -18074,6 +18075,7 @@
 10:AF:78	Shenzhen	Shenzhen ATUE Technology Co., Ltd
 10:B1:F8	HuaweiTe	Huawei Technologies Co.,Ltd
 10:B2:6B	Base	base Co.,Ltd.
+10:B3:6F	BoweiTec	Bowei Technology Company Limited
 10:B7:13	Private
 10:B7:F6	Plastofo	Plastoform Industries Ltd.
 10:B9:FE	LikaSrl	Lika srl
@@ -19717,6 +19719,21 @@
 30:19:66	SamsungE	Samsung Electronics Co.,Ltd
 30:1A:28	MakoNetw	Mako Networks Ltd
 30:1F:9A	IeeeRegi	IEEE Registration Authority
+30:1F:9A:00:00:00/28	IlsanEle	Ilsan Electronics
+30:1F:9A:10:00:00/28	Dewesoft	Dewesoft d.o.o.
+30:1F:9A:20:00:00/28	ChisonMe	CHISON Medical Technologies Co., Ltd.
+30:1F:9A:30:00:00/28	Micomsof	Micomsoft Co.,Ltd.
+30:1F:9A:40:00:00/28	NcmSuppl	NCM Supplies, Inc.
+30:1F:9A:50:00:00/28	BeijingS	Beijing Surestar Technology Co. Ltd,
+30:1F:9A:60:00:00/28	YishengT	YiSheng technology  co.,LTD
+30:1F:9A:70:00:00/28	Triax	Triax A/S
+30:1F:9A:80:00:00/28	FineTriu	Fine Triumph Technology Corp.,Ltd.
+30:1F:9A:90:00:00/28	Private
+30:1F:9A:A0:00:00/28	HunanCha	Hunan Changsha Hengjian Technoldgy Develpment Co.,Ltd.
+30:1F:9A:B0:00:00/28	SmartCom	Smart Component Technologies LTD
+30:1F:9A:C0:00:00/28	OrigamiG	Origami Group Limited
+30:1F:9A:D0:00:00/28	Olimex	OLIMEX Ltd
+30:1F:9A:E0:00:00/28	Shenzhen	Shenzhen Fengliyuan Energy Conservating Technology Co. Ltd
 30:21:5B	Shenzhen	Shenzhen Ostar Display Electronic Co.,Ltd
 30:29:BE	Shanghai	Shanghai MRDcom Co.,Ltd
 30:2D:E8	JdaLlcJd	JDA, LLC (JDA Systems)
@@ -20007,6 +20024,7 @@
 34:88:5D	Logitech	Logitech Far East
 34:8A:7B	SamsungE	Samsung Electronics Co.,Ltd
 34:8A:AE	Sagemcom	Sagemcom Broadband SAS
+34:8B:75	LavaInte	LAVA INTERNATIONAL(H.K) LIMITED
 34:8F:27	RuckusWi	Ruckus Wireless
 34:95:DB	Logitec	Logitec Corporation
 34:96:72	Tp-LinkT	TP-LINK TECHNOLOGIES CO.,LTD.
@@ -21489,6 +21507,9 @@
 48:02:2A	B-LinkEl	B-Link Electronic Limited
 48:03:62	DesayEle	DESAY ELECTRONICS(HUIZHOU)CO.,LTD
 48:06:6A	Tempered	Tempered Networks, Inc.
+48:0B:B2	IeeeRegi	IEEE Registration Authority
+48:0B:B2:70:00:00/28	BeijingD	Beijing Dragon Resources Limited.
+48:0B:B2:A0:00:00/28	XiamenRo	Xiamen Rongta Technology Co.,Ltd.
 48:0C:49	Nakayo	NAKAYO Inc
 48:0E:EC	Tp-LinkT	TP-LINK TECHNOLOGIES CO.,LTD.
 48:0F:CF	HewlettP	Hewlett Packard
@@ -23732,6 +23753,7 @@
 70:B3:D5:0C:E0:00/36	Innomind	Innominds Software Inc
 70:B3:D5:0D:20:00/36	Unmanned	Unmanned Spa
 70:B3:D5:0D:30:00/36	TsatAs	Tsat As
+70:B3:D5:0D:40:00/36	Guangzho	Guangzhou Male Industrial Animation Technology Co.,Ltd.
 70:B3:D5:0D:60:00/36	TattileS	Tattile Srl
 70:B3:D5:0D:70:00/36	RussianT	Russian Telecom Equipment Company
 70:B3:D5:0D:80:00/36	LaserIma	Laser Imagineering GmbH
@@ -23942,6 +23964,7 @@
 70:B3:D5:24:60:00/36	SalineLe	Saline Lectronics, Inc.
 70:B3:D5:24:B0:00/36	ToseiEng	Tosei Engineering Corp.
 70:B3:D5:24:D0:00/36	InfoCrea	INFO CREATIVE (HK) LTD
+70:B3:D5:24:E0:00/36	ChengduC	Chengdu Cove Technology CO.,LTD
 70:B3:D5:24:F0:00/36	ElbitBmd	ELBIT SYSTEMS BMD AND LAND EW - ELISRA LTD
 70:B3:D5:25:00:00/36	DatumEle	Datum Electronics Limited
 70:B3:D5:25:20:00/36	SierraNe	Sierra Nevada Corporation
@@ -24234,6 +24257,7 @@
 70:B3:D5:46:10:00/36	Tesec	TESEC Corporation
 70:B3:D5:46:20:00/36	Eartex
 70:B3:D5:46:50:00/36	Energism	Energisme
+70:B3:D5:46:90:00/36	Gentec	Gentec Systems  Co.
 70:B3:D5:46:B0:00/36	Airborne	Airborne Engineering Limited
 70:B3:D5:46:C0:00/36	Shanghai	Shanghai Chenzhu Instrument Co., Ltd.
 70:B3:D5:46:F0:00/36	ServaTra	serva transport systems GmbH
@@ -24617,6 +24641,7 @@
 70:B3:D5:73:40:00/36	MansionI	Mansion Industry Co., Ltd.
 70:B3:D5:73:50:00/36	SwissAud	Swiss Audio
 70:B3:D5:73:70:00/36	SdBiosen	SD Biosensor
+70:B3:D5:73:90:00/36	Zigencor	Zigencorp, Inc
 70:B3:D5:73:A0:00/36	Private
 70:B3:D5:73:B0:00/36	S-I-C
 70:B3:D5:73:D0:00/36	Netways	NETWAYS GmbH
@@ -25843,6 +25868,7 @@
 70:B3:D5:FE:B0:00/36	LesDistr	Les distributions Multi-Secure incorporee
 70:B3:D5:FE:C0:00/36	Finder	Finder SpA
 70:B3:D5:FE:F0:00/36	Hangzhou	Hangzhou Hualan Microelectronique Co.,Ltd
+70:B3:D5:FF:00:00/36	E-Metrot	E-MetroTel
 70:B3:D5:FF:10:00/36	DataStra	Data Strategy Limited
 70:B3:D5:FF:30:00/36	AplexTec	Aplex Technology Inc.
 70:B3:D5:FF:40:00/36	Serveron	Serveron Corporation
@@ -26697,6 +26723,7 @@
 80:00:6E	Apple	Apple, Inc.
 80:01:84	Htc	HTC Corporation
 80:02:DF	Ora	ORA Inc.
+80:05:88	RuijieNe	Ruijie Networks Co.,LTD
 80:05:DF	MontageT	Montage Technology Group Limited
 80:07:A2	EssonTec	Esson Technology Inc.
 80:09:02	Keysight	Keysight Technologies, Inc.
@@ -27111,6 +27138,7 @@
 84:ED:33	Bbmc	BBMC Co.,Ltd
 84:EF:18	IntelCor	Intel Corporate
 84:F1:29	Metrasca	Metrascale Inc.
+84:F3:EB	Espressi	Espressif Inc.
 84:F4:93	OmsSpolS	OMS spol. s.r.o.
 84:F6:4C	CrossPoi	Cross Point BV
 84:F6:FA	Miovisio	Miovision Technologies Incorporated
@@ -27197,6 +27225,21 @@
 88:5D:90:F0:00:00/28	Private
 88:5D:FB	Zte	zte corporation
 88:5F:E8	IeeeRegi	IEEE Registration Authority
+88:5F:E8:00:00:00/28	Junghein	Jungheinrich Norderstedt AG & Co. KG
+88:5F:E8:10:00:00/28	ApoideaT	Apoidea Technology Co., Ltd.
+88:5F:E8:20:00:00/28	OptoEngi	Opto Engineering
+88:5F:E8:30:00:00/28	SonnetLa	Sonnet Labs Inc.
+88:5F:E8:40:00:00/28	BeijingL	Beijing laiwei Technology  Co.,Ltd
+88:5F:E8:50:00:00/28	HauchBac	Hauch & Bach ApS
+88:5F:E8:60:00:00/28	Shenzhen	Shenzhen Xin Kingbrand Enterprises Co.,Ltd
+88:5F:E8:70:00:00/28	RedTechn	Red Technologies, LLC.
+88:5F:E8:80:00:00/28	Changsha	Changsha Xiangji-Haidun Technology Co., Ltd
+88:5F:E8:90:00:00/28	Sowee
+88:5F:E8:A0:00:00/28	LisleDes	Lisle Design Ltd
+88:5F:E8:B0:00:00/28	Shenzhen	Shenzhen ORVIBO Technology Co., Ltd
+88:5F:E8:C0:00:00/28	InorProc	Inor Process AB
+88:5F:E8:D0:00:00/28	Zhejiang	zhejiang yuanwang communication technolgy co.,ltd
+88:5F:E8:E0:00:00/28	UnicomGl	Unicom Global, Inc.
 88:61:5A	SianoMob	Siano Mobile Silicon Ltd.
 88:63:DF	Apple	Apple, Inc.
 88:66:39	HuaweiTe	Huawei Technologies Co.,Ltd
@@ -27604,6 +27647,7 @@
 90:3C:92	Apple	Apple, Inc.
 90:3C:AE	YunnanKs	Yunnan KSEC Digital Technology Co.,Ltd.
 90:3D:5A	Shenzhen	Shenzhen Wision Technology Holding Limited
+90:3D:68	G-Printe	G-Printec, Inc.
 90:3D:6B	ZiconTec	Zicon Technology Corp.
 90:3D:BD	SecureMe	Secure Meters Limited
 90:3E:AB	ArrisGro	ARRIS Group, Inc.
@@ -28005,6 +28049,7 @@
 98:29:1D	JaguarDe	Jaguar de Mexico, SA de CV
 98:29:3F	FujianSt	Fujian Start Computer Equipment Co.,Ltd
 98:29:A6	CompalIn	COMPAL INFORMATION (KUNSHAN) CO., LTD.
+98:2A:69	FriendsO	Friends of the electronic equipment (Shanghai) Co.
 98:2C:BE	2wire	2Wire Inc
 98:2D:56	Resoluti	Resolution Audio
 98:2D:68	SamsungE	Samsung Electronics Co., Ltd
@@ -28358,6 +28403,7 @@
 9C:E6:5E	Apple	Apple, Inc.
 9C:E6:E7	SamsungE	Samsung Electronics Co.,Ltd
 9C:E7:BD	Windusko	Winduskorea co., Ltd
+9C:E8:95	NewH3cTe	New H3C Technologies Co., Ltd
 9C:E9:51	Shenzhen	Shenzhen Sang Fei Consumer Communications Ltd., Co.
 9C:EB:E8	BizlinkK	BizLink (Kunshan) Co.,Ltd
 9C:EF:D5	PandaWir	Panda Wireless, Inc.
@@ -30830,6 +30876,7 @@ CC:BD:35	Steinel	Steinel GmbH
 CC:BD:D3	Ultimake	Ultimaker B.V.
 CC:BE:59	Calix	Calix Inc.
 CC:BE:71	Optilogi	OptiLogix BV
+CC:C0:79	MurataMa	Murata Manufacturing Co., Ltd.
 CC:C1:04	AppliedT	Applied Technical Systems
 CC:C3:EA	Motorola	Motorola Mobility LLC, a Lenovo Company
 CC:C5:0A	Shenzhen	Shenzhen Dajiahao Technology Co.,Ltd
@@ -31525,6 +31572,7 @@ DC:1D:D4	Microste	Microstep-MIS spol. s r.o.
 DC:1E:A3	Accensus	Accensus LLC
 DC:20:08	AsdElect	ASD Electronics Ltd
 DC:28:34	Hakko	HAKKO Corporation
+DC:29:19	Altobeam	AltoBeam (Xiamen) Technology Ltd, Co.
 DC:29:3A	Shenzhen	Shenzhen Nuoshi Technology Co., LTD.
 DC:2A:14	Shanghai	Shanghai Longjing Technology Co.
 DC:2B:2A	Apple	Apple, Inc.
@@ -32196,7 +32244,7 @@ E8:98:6D	PaloAlto	Palo Alto Networks
 E8:99:5A	PiigabPr	PiiGAB, Processinformation i Goteborg AB
 E8:99:C4	Htc	HTC Corporation
 E8:9A:8F	QuantaCo	Quanta Computer Inc.
-E8:9A:FF	FujianLa	Fujian Landi Commercial Equipment Co.,Ltd
+E8:9A:FF	FujianLa	Fujian LANDI Commercial Equipment Co.,Ltd
 E8:9D:87	Toshiba
 E8:9E:0C	Private
 E8:9E:B4	HonHaiPr	Hon Hai Precision Ind. Co.,Ltd.
@@ -32461,6 +32509,7 @@ F0:03:8C	Azurewav	AzureWave Technology Inc.
 F0:07:86	Shandong	Shandong Bittel Electronics Co., Ltd
 F0:08:F1	SamsungE	Samsung Electronics Co.,Ltd
 F0:0D:5C	Jinqianm	JinQianMao  Technology Co.,Ltd.
+F0:0E:1D	Megafone	Megafone Limited
 F0:0F:EC	HuaweiTe	Huawei Technologies Co.,Ltd
 F0:13:C3	Shenzhen	Shenzhen Fenda Technology Co., Ltd
 F0:15:A0	Kyungdon	KyungDong One Co., Ltd.
@@ -32520,15 +32569,20 @@ F0:3F:F8	RLDrake	R L Drake
 F0:40:7B	Fiberhom	Fiberhome Telecommunication Technologies Co.,LTD
 F0:41:C8	IeeeRegi	IEEE Registration Authority
 F0:41:C8:00:00:00/28	LinpaAco	Linpa Acoustic Technology Co.,Ltd
+F0:41:C8:10:00:00/28	Dongguan	DongGuan Siyoto Electronics Co., Ltd
 F0:41:C8:20:00:00/28	Shenzhen	Shenzhen Medica Technology Development Co., Ltd.
 F0:41:C8:30:00:00/28	Shenzhen	Shenzhen Wisewing Internet Technology Co.,Ltd
+F0:41:C8:40:00:00/28	Candelic	Candelic Limited
 F0:41:C8:50:00:00/28	XiAnMeiS	XI'AN MEI SHANG MEI WIRELESS TECHNOLOGY.Co., Ltd.
 F0:41:C8:60:00:00/28	AedEngin	AED Engineering GmbH
 F0:41:C8:70:00:00/28	Nanchang	Nanchang BlackShark Co.,Ltd.
+F0:41:C8:80:00:00/28	PostiumK	Postium Korea Co., Ltd.
 F0:41:C8:90:00:00/28	Shenzhen	Shenzhen  Nufilo Electronic Technology Co., Ltd.
+F0:41:C8:A0:00:00/28	Telstra
 F0:41:C8:B0:00:00/28	Powervau	Powervault Ltd
 F0:41:C8:C0:00:00/28	Shanghai	Shanghai Think-Force Electronic Technology Co. Ltd
 F0:41:C8:D0:00:00/28	AtnMedia	ATN Media Group FZ LLC
+F0:41:C8:E0:00:00/28	Shenzhen	Shenzhen Umind Technology Co., Ltd.
 F0:42:1C	IntelCor	Intel Corporate
 F0:43:35	DvnShang	DVN(Shanghai)Ltd.
 F0:43:47	HuaweiTe	Huawei Technologies Co.,Ltd
@@ -32592,6 +32646,7 @@ F0:99:B6	Apple	Apple, Inc.
 F0:99:BF	Apple	Apple, Inc.
 F0:9A:51	Shanghai	Shanghai Viroyal Electronic Technology Company Limited
 F0:9C:BB	Raonthin	RaonThink Inc.
+F0:9C:D7	Guangzho	Guangzhou Blue Cheetah Intelligent Technology Co., Ltd.
 F0:9C:E9	Aerohive	Aerohive Networks Inc.
 F0:9E:63	Cisco	Cisco Systems, Inc
 F0:9F:C2	Ubiquiti	Ubiquiti Networks Inc.
@@ -33257,6 +33312,7 @@ FC:94:6C	Ubivelox
 FC:94:E3	Technico	Technicolor CH USA Inc.
 FC:99:47	Cisco	Cisco Systems, Inc
 FC:9A:FA	MotusGlo	Motus Global Inc.
+FC:9B:C6	Sumavisi	Sumavision Technologies Co.,Ltd
 FC:9D:D8	BeijingT	Beijing TongTongYiLian Science and Technology Ltd.
 FC:9F:AE	Fidus	Fidus Systems Inc
 FC:9F:E1	ConwinTe	CONWIN.Tech. Ltd