[Automatic update for 2015-05-03]

Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I4d5f34d1b803d478101ba4a1388ac3d71c641918 Reviewed-on: https://code.wireshark.org/review/8273 Reviewed-by: Gerald Combs <gerald@wireshark.org>
author: Gerald Combs <gerald@wireshark.org> 2015-05-03 08:07:17 -0700
committer: Gerald Combs <gerald@wireshark.org> 2015-05-03 15:07:25 +0000
commit: 3d4646e978b5a3719236495272d4ed3d51d9e5b9 (patch)
tree: ac69bff8f04a322bf0b41cdac240ed6cbc240b06
parent: cd204b5bdb7c960b59c8eaba4f3645cd93cb9a83 (diff)
11 files changed, 381 insertions, 105 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index cf25d246d9..6d1ce06e90 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -2820,6 +2820,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x20df, "Simtec Electronics" },
     { 0x20f4, "TRENDnet" },
     { 0x2101, "ActionStar" },
+    { 0x2109, "VIA Labs, Inc." },
     { 0x2149, "Advanced Silicon S.A." },
     { 0x2162, "Creative (?)" },
     { 0x2184, "GW Instek" },
@@ -17524,6 +17525,15 @@ static const value_string usb_products_vals[] = {
     { 0x20df0001, "Entropy Key [UDEKEY01]" },
     { 0x20f4648b, "TEW-648UBM 802.11n 150Mbps Micro Wireless N Adapter [Realtek RTL8188CUS]" },
     { 0x21010201, "SIIG 4-to-2 Printer Switch" },
+    { 0x21090700, "VL700 SATA 3Gb/s bridge" },
+    { 0x21090701, "VL701 SATA 3Gb/s bridge" },
+    { 0x21090810, "VL81x Hub" },
+    { 0x21090811, "Hub" },
+    { 0x21090812, "VL812 Hub" },
+    { 0x21092811, "Hub" },
+    { 0x21092812, "VL812 Hub" },
+    { 0x21093431, "Hub" },
+    { 0x21098110, "Hub" },
     { 0x2149211b, "Touchscreen Controller" },
     { 0x21492703, "TS58xxA/TC56xxA [CoolTouch]" },
     { 0x21622031, "Network Blaster Wireless Adapter" },
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 02a60cb022..7806e0b0df 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2015-04-24)
+(last updated 2015-05-01)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -70839,9 +70839,9 @@ da Faculdade de Ciências e Tecnologia da Universidade Nova de Lisboa
     Ing. Peter Magdina
       peter_magdina&tempest.sk
 17822
-  EASYTOUCH Robert Divoky KEG
-    Robert Divoky
-      r.divoky&easytouch.at
+  Easytouch Robert Redl KG (formerly "EASYTOUCH Robert Divoky KEG")
+    Robert Redl
+      robert&robertredl.com
 17823
   Arnes - Academic and Research Network of Slovenia
     Rok Pape¾
@@ -81391,9 +81391,9 @@ Nancy - FRANCE
     Rezaul Abid
       abidr&schneider.com
 20459
-  OF Networks Co., Ltd.
+  Oki Electric Industry Co., Ltd. (formerly "OF Networks Co., Ltd.")
     Hajime Kawauchi
-      info&ofnet.jp
+      kawauchi654&oki.com
 20460
   goldenfile ltd
     John Harrison
@@ -166598,7 +166598,7 @@ Decentralization / Helenic Public Administra
 41754
   Daniel Sage
     Daniel Sage
-      daniel&sterksoft.com
+      hi&dansage.co
 41755
   Lastline, Inc.
     Ludovico Cavedon
@@ -181428,9 +181428,9 @@ Decentralization / Helenic Public Administra
     JordI Smits
       jordi&pocos.nl
 45462
-  Koch-IT
-    Martin Koch
-      post&koch-it.de
+  Delvag Luftfahrtversicherungs-AG
+    Peter Berghaus
+      servicedesk&delvag.de
 45463
   Federal Public Service Justice, Belgium
     David Roskams
@@ -182443,6 +182443,186 @@ Decentralization / Helenic Public Administra
   Empresa Municipal de Informática S.A. - IPLANRIO
     Bruno Furtado
       bruno.furtado&rio.rj.gov.br
+45716
+  ARGE Rundfunk-Betriebstechnik
+    Christian Pohle
+      christian.pohle&rbt-nbg.de
+45717
+  Sensu Enterprise
+    Sean Porter
+      support&heavywater.io
+45718
+  TJH Systems Pty Limited
+    Trevor Harwood
+      trevor&tjhsystems.com.au
+45719
+  inQool a.s.
+    Matus Zamborsky
+      zamborsky&inqool.cz
+45720
+  Chaos Computer Club Mainz e.V.
+    Christian Felsing
+      kernelpanic&cccmz.de
+45721
+  Shenzhen SONTU Medical Imaging Equipment Co.,LTD
+    qiuhongfa
+      qiuhongfa&sontu.com.cn
+45722
+  Hamburg Port Authority AoeR
+    Sean Crane
+      pen&hpa.hamburg.de
+45723
+  Cirrent
+    Robert Conant
+      Rob&cirrent.co
+45724
+  FIDO Alliance, Inc.
+    Debbie Mac
+      debbie&fidoalliance.org
+45725
+  ABB Xiamen Low Voltage Equipment Co.,Ltd
+    Mike-Wulin Weng
+      mike-wulin.weng&cn.abb.com
+45726
+  ecava sdn bhd
+    Ti Tiau Kiem
+      tkti&ecava.com
+45727
+  HDWIFI TECHNOLOGIES
+    Byron del Castillo
+      byron&hdwifitech.com
+45728
+  JunoTele Solutions Pvt. Ltd
+    Sudhir Nayak
+      sudhir&junotele.com
+45729
+  Roedl IT Operation GmbH
+    Adam Bielak
+      adam.bielak&roedl.com
+45730
+  Geneberg
+    Holger Geneberg
+      pki&geneberg.net
+45731
+  WOOBE s.a.s.
+    bernard HAUZEUR (Woobe CTO)
+      bhauzeur&woobe.fr
+45732
+  TIM AG
+    Nico Rathke
+      Nicor&tim.de
+45733
+  Frank Wagner Holding Hanseatische Management GmbH
+    Arne Quante
+      arne.quante&fw-holding.de
+45734
+  STARNET s.r.o.
+    Milan Cizek
+      milan.cizek&mail.starnet.cz
+45735
+  easyset 
+    Jin Young Kim
+      skyblue&easyset.co.kr
+45736
+  Utilisoft Ltd
+    Philip Littler
+      philip.littler&utilisoft.com
+45737
+  shah-network.com
+    Shahrad Rezaei
+      shahrad.rezaei&shah-network.com
+45738
+  Aspirational Cognition LLC
+    Greg Gaskill
+      aboron&aspirationalcognition.com
+45739
+  winfonet.eu
+    Nils Guenther
+      n.guenther&winfonet.eu
+45740
+  Cirrus Identity, Inc
+    Ian Tegebo
+      ian.tegebo&cirrusidentity.com
+45741
+  Entensys
+    Alexander Kistanov
+      akistanov&entensys.com
+45742
+  ImageWare Components GmbH
+    Guido Albers
+      albers&imageware.de
+45743
+  FIBERLAB
+    Hyuck Keun Choi
+      hifiberlab&daum.net
+45744
+  GGExo
+    Gergely Pollak
+      shuzirra&gmail.com
+45745
+  Care Zone Inc.
+    Walter Smith
+      walter&carezone.com
+45746
+  University of Rochester Medical Center
+    Mario Sbrocco
+      oidadmins&urmc.rochester.edu
+45747
+  Wuhan Rui Ying Tong Network Technology Co., Ltd(China)
+    pitao
+      ptao&whyktx.com
+45748
+  Thüga MeteringService GmbH
+    Jörg Stelzle
+      it&meteringservice.de
+45749
+  Evolving Models
+    Konstantin Schaefer
+      ks&kschaefer.eu
+45750
+  gerthoux
+    Luca Gerthoux
+      luca&gerthoux.net
+45751
+  Hibernating Rhinos
+    Oren Eini
+      ayende&ayende.com
+45752
+  connecT EDV-Vertriebs GmbH
+    Jens Dimter
+      info&connect-edv.de
+45753
+  winterdrache.de
+    Matthias S. Benkmann
+      msb&winterdrache.de
+45754
+  VoipOtago Ltd
+    Kieren Black
+      kieren&voipotago.co.nz
+45755
+  2memory LTD
+    Alexey Tsareov
+      a.tsareov&2memory.com
+45756
+  MicroLAB Systems
+    Pavel Semyonov
+      pavel.td.amc&mlabsys.com
+45757
+  FUCOM
+    Shahzad Haider
+      shahzad.haider&fucom.com
+45758
+  IPCOMM GmbH
+    Edgar Zaiser
+      Edgar.Zaiser&ipcomm.de
+45759
+  Signicat AS
+    Harald Stendal
+      harald.stendal&signicat.com
+45760
+  Kove IO Inc.
+    Andy Poling
+      logistics&kove.com
 
 
 End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index d65c5f2bfc..94298b3c41 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -17842,7 +17842,7 @@ const value_string sminmpec_values[] = {
     { 17819, "GIP RENATER" },
     { 17820, "Foresttek Networks Limited" },
     { 17821, "Tempest spol. s r.o." },
-    { 17822, "EASYTOUCH Robert Divoky KEG" },
+    { 17822, "Easytouch Robert Redl KG (formerly \"EASYTOUCH Robert Divoky KEG\")" },
     { 17823, "Arnes - Academic and Research Network of Slovenia" },
     { 17824, "Hisense Information Technology Ltd." },
     { 17825, "BEconnectIT GmbH" },
@@ -20479,7 +20479,7 @@ const value_string sminmpec_values[] = {
     { 20456, "Omnis Network, LLC" },
     { 20457, "Incipient, Inc." },
     { 20458, "Schneider National, Inc." },
-    { 20459, "OF Networks Co., Ltd." },
+    { 20459, "Oki Electric Industry Co., Ltd. (formerly \"OF Networks Co., Ltd.\")" },
     { 20460, "goldenfile ltd" },
     { 20461, "Organika-Kuznetsk" },
     { 20462, "Multimedia Project Srl" },
@@ -45482,7 +45482,7 @@ const value_string sminmpec_values[] = {
     { 45459, "Lonix Oy" },
     { 45460, "Comfact AB" },
     { 45461, "Pocos bv" },
-    { 45462, "Koch-IT" },
+    { 45462, "Delvag Luftfahrtversicherungs-AG" },
     { 45463, "Federal Public Service Justice, Belgium" },
     { 45464, "Verband Christlicher Pfadfinderinnen und Pfadfinder in W\0303\0274rttemberg " },
     { 45465, "Clear2Pay NV/SA" },
@@ -45736,6 +45736,51 @@ const value_string sminmpec_values[] = {
     { 45713, "CONSULDATA Advisors di Massimo Del Barba" },
     { 45714, "Logitravel SL" },
     { 45715, "Empresa Municipal de Inform\0303\0241tica S.A. - IPLANRIO" },
+    { 45716, "ARGE Rundfunk-Betriebstechnik" },
+    { 45717, "Sensu Enterprise" },
+    { 45718, "TJH Systems Pty Limited" },
+    { 45719, "inQool a.s." },
+    { 45720, "Chaos Computer Club Mainz e.V." },
+    { 45721, "Shenzhen SONTU Medical Imaging Equipment Co.,LTD" },
+    { 45722, "Hamburg Port Authority AoeR" },
+    { 45723, "Cirrent" },
+    { 45724, "FIDO Alliance, Inc." },
+    { 45725, "ABB Xiamen Low Voltage Equipment Co.,Ltd" },
+    { 45726, "ecava sdn bhd" },
+    { 45727, "HDWIFI TECHNOLOGIES" },
+    { 45728, "JunoTele Solutions Pvt. Ltd" },
+    { 45729, "Roedl IT Operation GmbH" },
+    { 45730, "Geneberg" },
+    { 45731, "WOOBE s.a.s." },
+    { 45732, "TIM AG" },
+    { 45733, "Frank Wagner Holding Hanseatische Management GmbH" },
+    { 45734, "STARNET s.r.o." },
+    { 45735, "easyset " },
+    { 45736, "Utilisoft Ltd" },
+    { 45737, "shah-network.com" },
+    { 45738, "Aspirational Cognition LLC" },
+    { 45739, "winfonet.eu" },
+    { 45740, "Cirrus Identity, Inc" },
+    { 45741, "Entensys" },
+    { 45742, "ImageWare Components GmbH" },
+    { 45743, "FIBERLAB" },
+    { 45744, "GGExo" },
+    { 45745, "Care Zone Inc." },
+    { 45746, "University of Rochester Medical Center" },
+    { 45747, "Wuhan Rui Ying Tong Network Technology Co., Ltd(China)" },
+    { 45748, "Th\0303\0274ga MeteringService GmbH" },
+    { 45749, "Evolving Models" },
+    { 45750, "gerthoux" },
+    { 45751, "Hibernating Rhinos" },
+    { 45752, "connecT EDV-Vertriebs GmbH" },
+    { 45753, "winterdrache.de" },
+    { 45754, "VoipOtago Ltd" },
+    { 45755, "2memory LTD" },
+    { 45756, "MicroLAB Systems" },
+    { 45757, "FUCOM" },
+    { 45758, "IPCOMM GmbH" },
+    { 45759, "Signicat AS" },
+    { 45760, "Kove IO Inc." },
     {    0, NULL}
 };
 
diff --git a/manuf b/manuf
index 552c81ba08..fb688dcf75 100644
--- a/manuf
+++ b/manuf
@@ -17381,6 +17381,7 @@
 08:8D:C8	RyowaEle               # Ryowa Electronics Co.,Ltd
 08:8E:4F	SfSoftwa               # SF Software Solutions
 08:8F:2C	HillsSou               # Hills Sound Vision & Lighting
+08:94:EF	WistronI               # Wistron Infocomm (Zhongshan) Corporation
 08:95:2A	Technico               # Technicolor CH USA Inc
 08:96:D7	Avm                    # AVM GmbH
 08:97:58	Shenzhen               # Shenzhen Strong Rising Electronics Co.,Ltd DongGuan Subsidiary
@@ -17859,6 +17860,7 @@
 18:59:36	Xiaomi                 # XIAOMI INC
 18:5A:E8	Zenotech               # Zenotech.Co.,Ltd
 18:5D:9A	Bobjgear               # BobjGear LLC
+18:5E:0F	IntelCor               # Intel Corporate
 18:62:2C	Sagemcom               # SAGEMCOM SAS
 18:64:72	ArubaNet               # Aruba Networks
 18:65:71	TopVicto               # Top Victory Electronics (Taiwan) Co., Ltd.
@@ -18212,6 +18214,7 @@
 24:4B:03	SamsungE               # Samsung Electronics Co.,Ltd
 24:4B:81	SamsungE               # Samsung Electronics Co.,Ltd
 24:4F:1D	IruleLlc               # iRule LLC
+24:5B:F0	Liteon                 # Liteon, Inc.
 24:5F:DF	Kyocera                # KYOCERA Corporation
 24:62:78	Sysmocom               # sysmocom - systems for mobile communications GmbH
 24:64:EF	CygSunri               # CYG SUNRI CO.,LTD.
@@ -18220,7 +18223,9 @@
 24:69:4A	Jasmine                # Jasmine Systems Inc.
 24:69:A5	HuaweiTe               # Huawei Technologies Co., Ltd
 24:6A:AB	It-IsInt               # IT-IS International
+24:6E:96	Dell                   # Dell Inc.
 24:71:89	TexasIns               # Texas Instruments
+24:72:60	Iottech                # IOTTECH Corp
 24:76:56	Shanghai               # Shanghai Net Miles Fiber Optics Technology Co., LTD.
 24:76:7D	CiscoSpv               # Cisco SPVTG
 24:77:03	IntelCor               # Intel Corporate
@@ -18308,6 +18313,7 @@
 28:32:C5	Humax                  # Humax.co.,ltd
 28:34:10	EnigmaDi               # Enigma Diagnostics Limited
 28:34:A2	Cisco
+28:37:13	Shenzhen               # Shenzhen 3Nod Digital Technology Co., Ltd.
 28:37:37	Apple
 28:38:CF	Gen2wave
 28:39:E7	PrecenoT               # Preceno Technology Pte.Ltd.
@@ -18364,6 +18370,7 @@
 28:B0:CC	XenyaDOO               # Xenya d.o.o.
 28:B2:BD	IntelCor               # Intel Corporate
 28:B3:AB	GenmarkA               # Genmark Automation
+28:B9:D9	Radisys                # Radisys Corporation
 28:BA:18	NextnavL               # NextNav, LLC
 28:BA:B5	SamsungE               # Samsung Electronics Co.,Ltd
 28:BB:59	RnetTech               # RNET Technologies, Inc.
@@ -18562,6 +18569,7 @@
 30:41:74	AltecLan               # ALTEC LANSING LLC
 30:42:25	Burg-Wäc               # BURG-WÄCHTER KG
 30:44:49	Plath                  # PLATH GmbH
+30:44:87	HefeiRad               # Hefei Radio Communication Technology Co., Ltd
 30:46:9A	Netgear
 30:49:3B	NanjingZ               # Nanjing Z-Com Wireless Co.,Ltd
 30:4C:7E	Panasoni               # Panasonic Electric Works Automation Controls Techno Co.,Ltd.
@@ -18771,6 +18779,7 @@
 34:FA:40	Guangzho               # Guangzhou Robustel Technologies Co., Limited
 34:FC:6F	Alcea
 34:FC:EF	LgElectr               # LG Electronics
+38:01:95	SamsungE               # Samsung Electronics Co.,Ltd
 38:01:97	ToshibaS               # Toshiba Samsung Storage Technolgoy Korea Corporation
 38:06:B4	ADC                    # A.D.C. GmbH
 38:08:FD	Silca                  # Silca Spa
@@ -19694,6 +19703,7 @@
 44:94:FC	Netgear                # NETGEAR INC.,
 44:95:FA	QingdaoS               # Qingdao Santong Digital Technology Co.Ltd
 44:96:2B	AidonOy                # Aidon Oy
+44:97:5A	Shenzhen               # SHENZHEN FAST TECHNOLOGIES CO.,LTD
 44:9B:78	NowFacto               # The Now Factory
 44:9C:B5	Alcomp                 # Alcomp, Inc
 44:A4:2D	TctMobil               # TCT Mobile Limited
@@ -19739,6 +19749,7 @@
 44:F4:77	JuniperN               # Juniper Networks
 44:F8:49	UnionPac               # Union Pacific Railroad
 44:FB:42	Apple
+44:FD:A3	Everysig               # Everysight LTD.
 47:54:43	GtcNotRe               # GTC (Not registered!)		(This number is a multicast!)
 48:02:2A	B-LinkEl               # B-Link Electronic Limited
 48:03:62	DesayEle               # DESAY ELECTRONICS(HUIZHOU)CO.,LTD
@@ -19938,6 +19949,7 @@
 4C:BC:A5	SamsungE               # Samsung Electronics Co.,Ltd
 4C:C4:52	ShangHai               # Shang Hai Tyd. Electon Technology Ltd.
 4C:C6:02	Radios                 # Radios, Inc.
+4C:C6:81	Shenzhen               # Shenzhen Aisat Electronic Co., Ltd.
 4C:C9:4F	Alcatel-               # Alcatel-Lucent
 4C:CA:53	Skyera                 # Skyera, Inc.
 4C:CB:F5	Zte                    # zte corporation
@@ -20567,6 +20579,7 @@
 64:09:4C	BeijingS               # Beijing Superbee Wireless Technology Co.,Ltd
 64:09:80	XiaomiEl               # XIAOMI Electronics,CO.,LTD
 64:0B:4A	DigitalT               # Digital Telecom Technology Limited
+64:0D:E6	Petra                  # Petra Systems
 64:0E:36	Taztag
 64:0E:94	Pluribus               # Pluribus Networks, Inc.
 64:0F:28	2wire
@@ -20769,6 +20782,7 @@
 68:97:4B	Shenzhen               # Shenzhen Costar Electronics Co. Ltd.
 68:97:E8	SocietyO               # Society of Motion Picture &amp; Television Engineers
 68:99:CD	Cisco
+68:9A:B7	AtelierV               # Atelier Vision Corporation
 68:9C:5E	AcsipTec               # AcSiP Technology Corp.
 68:9C:70	Apple
 68:9C:E2	Cisco
@@ -21091,6 +21105,7 @@
 70:B3:D5:0E:C0:00/36	AcsMotio               # ACS MOTION CONTROL
 70:B3:D5:0F:00:00/36	Avionica
 70:B3:D5:0F:B0:00/36	CygnusLl               # Cygnus LLC
+70:B3:D5:0F:C0:00/36	Vitalcar               # vitalcare
 70:B3:D5:0F:F0:00/36	Internet               # INTERNET PROTOCOLO LOGICA SL
 70:B3:D5:10:40:00/36	PlumSpZO               # Plum sp. z o.o
 70:B3:D5:10:90:00/36	DitestFa               # DiTEST Fahrzeugdiagnose GmbH
@@ -21128,6 +21143,7 @@
 70:B3:D5:20:C0:00/36	SiemensH               # Siemens Healthcare Diagnostics
 70:B3:D5:20:E0:00/36	AmrehnPa               # Amrehn & Partner EDV-Service GmbH
 70:B3:D5:22:B0:00/36	Vitec
+70:B3:D5:23:00:00/36	Ct                     # CT Company
 70:B3:D5:23:10:00/36	DeltaTau               # DELTA TAU DATA SYSTEMS, INC.
 70:B3:D5:23:C0:00/36	Quasonix               # Quasonix, LLC
 70:B3:D5:24:30:00/36	Rohde&Sc               # Rohde&Schwarz Topex SA
@@ -21233,8 +21249,10 @@
 70:B3:D5:4C:80:00/36	Hosokawa               # Hosokawa Micron Powder Systems
 70:B3:D5:4C:D0:00/36	PowerEle               # Power Electronics Espana, S.L.
 70:B3:D5:4D:80:00/36	Versilis               # Versilis Inc.
+70:B3:D5:4D:B0:00/36	Temperat               # Temperature@lert
 70:B3:D5:4D:C0:00/36	JkDevice               # JK DEVICE CORPORATION
 70:B3:D5:4D:D0:00/36	Road-IqL               # Road-iQ, LLC
+70:B3:D5:4D:E0:00/36	OsoTechn               # Oso Technologies, Inc.
 70:B3:D5:4D:F0:00/36	NidecAvt               # Nidec Avtron Automation Corp
 70:B3:D5:4F:00:00/36	LiSengTe               # Li Seng Technology Ltd.,
 70:B3:D5:4F:40:00/36	Witagg                 # WiTagg, Inc
@@ -21368,6 +21386,7 @@
 70:B3:D5:82:70:00/36	Metromat               # Metromatics Pty Ltd
 70:B3:D5:82:C0:00/36	Nels                   # NELS Ltd.
 70:B3:D5:82:E0:00/36	Playaliv               # PlayAlive A/S
+70:B3:D5:83:50:00/36	CommboxP               # CommBox P/L
 70:B3:D5:83:80:00/36	Tofino
 70:B3:D5:83:B0:00/36	Telefoni               # Telefonix Incorporated
 70:B3:D5:83:F0:00/36	LumineLi               # Lumine Lighting Solutions Oy
@@ -21380,6 +21399,7 @@
 70:B3:D5:87:50:00/36	PeekTraf               # PEEK TRAFFIC
 70:B3:D5:87:B0:00/36	LiquidIn               # Liquid Instruments Pty Ltd
 70:B3:D5:88:20:00/36	SimonTec               # SIMON TECH, S.L.
+70:B3:D5:88:F0:00/36	QuaestaI               # Quaesta Instruments, LLC
 70:B3:D5:8A:B0:00/36	Emac                   # EMAC, Inc.
 70:B3:D5:8A:D0:00/36	GlobalCo               # Global Communications Technology LLC
 70:B3:D5:8B:10:00/36	M-TechIn               # M-Tech Innovations Ltd
@@ -21412,6 +21432,7 @@
 70:B3:D5:99:F0:00/36	ConfedBV               # Confed Holding B.V.
 70:B3:D5:9A:70:00/36	Honeywel               # Honeywell
 70:B3:D5:9B:D0:00/36	SignalPr               # Signal Processing Devices Sweden AB
+70:B3:D5:9C:80:00/36	AppliedE               # Applied Systems Engineering, Inc.
 70:B3:D5:9C:A0:00/36	KomsisEl               # KOMSIS ELEKTRONIK SISTEMLERI SAN. TIC. LTD.STI
 70:B3:D5:9D:30:00/36	Communic               # Communication Technology Ltd.
 70:B3:D5:9D:B0:00/36	CasMedic               # CAS Medical Systems, Inc
@@ -21490,6 +21511,7 @@
 70:B3:D5:B8:C0:00/36	EpointEm               # ePOINT Embedded Computing Limited
 70:B3:D5:B8:D0:00/36	Jungwooe               # JungwooEng Co., Ltd
 70:B3:D5:B8:F0:00/36	Assembly               # Assembly Contracts Ltd
+70:B3:D5:B9:10:00/36	Dynetics               # Dynetics, Inc.
 70:B3:D5:B9:B0:00/36	Elektron               # Elektronik Art
 70:B3:D5:BA:40:00/36	EiwaGike               # EIWA GIKEN INC.
 70:B3:D5:BA:D0:00/36	TechnikD               # Technik & Design GmbH
@@ -21646,6 +21668,7 @@
 70:B3:D5:F3:80:00/36	Scanvaeg               # Scanvaegt Nordic A/S
 70:B3:D5:F3:90:00/36	ZenrosAp               # Zenros ApS
 70:B3:D5:F4:C0:00/36	GlobalLi               # Global Lightning Protection Services A(S
+70:B3:D5:F4:D0:00/36	Honeywel               # Honeywell International Inc.
 70:B3:D5:F5:40:00/36	Revoluti               # Revolution Retail Systems
 70:B3:D5:F5:A0:00/36	Hameg                  # HAMEG GmbH
 70:B3:D5:F6:10:00/36	PowerDia               # Power Diagnostic Service
@@ -21669,6 +21692,7 @@
 70:B3:D5:FB:B0:00/36	VenaEngi               # Vena Engineering Corporation
 70:B3:D5:FC:50:00/36	Eltwin                 # Eltwin A/S
 70:B3:D5:FC:60:00/36	TecnintH               # Tecnint HTE Srl
+70:B3:D5:FC:D0:00/36	EngageTe               # Engage Technologies
 70:B3:D5:FD:10:00/36	Redrat                 # RedRat Ltd
 70:B3:D5:FD:30:00/36	AkisTech               # AKIS technologies
 70:B3:D5:FD:A0:00/36	AcdElekt               # ACD Elektronik GmbH
@@ -22065,6 +22089,7 @@
 7C:A2:3E	HuaweiTe               # HUAWEI TECHNOLOGIES CO.,LTD
 7C:A2:9B	DSignt                 # D.SignT GmbH & Co. KG
 7C:A6:1D	MhlLlc                 # MHL, LLC
+7C:AB:25	MesmoTec               # MESMO TECHNOLOGY INC.
 7C:AC:B2	BoschSof               # Bosch Software Innovations GmbH
 7C:AD:74	Cisco
 7C:B0:3E	Osram                  # OSRAM GmbH
@@ -22237,6 +22262,7 @@
 80:DB:31	PowerQuo               # Power Quotient International Co., Ltd.
 80:E4:DA	IeeeRegi               # IEEE REGISTRATION AUTHORITY  - Please see MAM public listing for more information.
 80:E6:50	Apple
+80:EA:23	WistronN               # Wistron Neweb Corp.
 80:EA:96	Apple
 80:EA:CA	DialogSe               # Dialog Semiconductor Hellas SA
 80:EB:77	Wistron                # Wistron Corporation
@@ -22352,6 +22378,7 @@
 84:C9:B2	D-LinkIn               # D-Link International
 84:CF:BF	Fairphon               # Fairphone
 84:D3:2A	Ieee1905               # IEEE 1905.1
+84:D4:C8	Widex                  # Widex A/S
 84:D9:C8	Unipatte               # Unipattern Co.,
 84:DB:2F	SierraWi               # Sierra Wireless Inc
 84:DB:AC	HuaweiTe               # Huawei Technologies Co., Ltd
@@ -23036,6 +23063,7 @@
 9C:95:F8	Smartdoo               # SmartDoor Systems, LLC
 9C:97:26	Technico               # Technicolor
 9C:98:11	Guangzho               # Guangzhou Sunrise Electronics Development Co., Ltd
+9C:99:A0	Xiaomi                 # XIAOMI INC
 9C:9C:1D	StarkeyL               # Starkey Labs Inc.
 9C:A1:0A	ScleSfe                # SCLE SFE
 9C:A1:34	Nike                   # Nike, Inc.
@@ -23110,6 +23138,7 @@ A0:2E:F3	UnitedIn               # United Integrated Services Co., Led.
 A0:36:9F	IntelCor               # Intel Corporate
 A0:36:F0	Comprehe               # Comprehensive Power
 A0:36:FA	EttusRes               # Ettus Research LLC
+A0:39:F7	LgElectr               # LG Electronics (Mobile Communications)
 A0:3A:75	PssBelgi               # PSS Belgium N.V.
 A0:3B:1B	InspireT               # Inspire Tech
 A0:40:25	Actionca               # Actioncable, Inc.
@@ -23502,6 +23531,7 @@ AC:5E:8C	Utillink
 AC:61:23	Drivven                # Drivven, Inc.
 AC:62:0D	JabilCir               # Jabil Circuit (Wuxi) Co. LTD
 AC:67:06	RuckusWi               # Ruckus Wireless
+AC:67:6F	Electroc               # Electrocompaniet A.S.
 AC:6B:AC	JennySci               # Jenny Science AG
 AC:6E:1A	Shenzhen               # Shenzhen Gongjin Electronics Co.,Ltd
 AC:6F:4F	Enspert                # Enspert Inc
@@ -23732,6 +23762,7 @@ B4:34:6C	Matsunic               # MATSUNICHI DIGITAL TECHNOLOGY (HONG KONG) LIMI
 B4:35:64	FujianTi               # Fujian Tian Cheng Electron Science & Technical Development Co.,Ltd.
 B4:35:F7	Zhejiang               # Zhejiang Pearmain Electronics Co.ltd.
 B4:37:41	Consert                # Consert, Inc.
+B4:37:D1	IeeeRegi               # IEEE REGISTRATION AUTHORITY  - Please see MAM public listing for more information.
 B4:39:34	PenGener               # Pen Generations, Inc.
 B4:39:D6	Procurve               # ProCurve Networking by HP
 B4:3A:28	SamsungE               # Samsung Electronics Co.,Ltd
@@ -24006,6 +24037,7 @@ BC:52:B7	Apple
 BC:54:F9	DrogooTe               # Drogoo Technology Co., Ltd.
 BC:5C:4C	Elecom                 # ELECOM CO.,LTD.
 BC:5F:F4	AsrockIn               # ASRock Incorporation
+BC:5F:F6	Shenzhen               # SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.
 BC:60:10	QingdaoH               # Qingdao Hisense Communications Co.,Ltd
 BC:62:9F	TelenetP               # Telenet Systems P. Ltd.
 BC:66:41	IeeeRegi               # IEEE REGISTRATION AUTHORITY  - Please see MAM public listing for more information.
@@ -24963,6 +24995,7 @@ D8:E7:43	Wush                   # Wush, Inc
 D8:E9:52	Keopsys
 D8:EB:97	Trendnet               # TRENDnet, Inc.
 D8:EE:78	MoogProt               # Moog Protokraft
+D8:EF:CD	Nokia
 D8:F0:F2	Zeebo                  # Zeebo Inc
 D8:F7:10	LibreWir               # Libre Wireless Technologies Inc.
 D8:FB:11	Axacore
@@ -25096,6 +25129,7 @@ E0:2A:82	Universa               # Universal Global Scientific Industrial Co., Lt
 E0:2C:B2	LenovoMo               # Lenovo Mobile Communication (Wuhan) Company Limited
 E0:2F:6D	Cisco
 E0:30:05	Alcatel-               # Alcatel-Lucent Shanghai Bell Co., Ltd
+E0:31:9E	Valve                  # Valve Corporation
 E0:31:D0	SzTelsta               # SZ Telstar CO., LTD
 E0:35:60	Challeng               # Challenger Supply Holdings, LLC
 E0:36:E3	StageOne               # Stage One International Co., Ltd.
@@ -25108,6 +25142,7 @@ E0:3F:49	AsustekC               # ASUSTek COMPUTER INC.
 E0:41:36	Mitrasta               # MitraStar Technology Corp.
 E0:46:9A	Netgear
 E0:4B:45	Hi-PElec               # Hi-P Electronics Pte Ltd
+E0:55:3D	CiscoMer               # Cisco Meraki
 E0:55:97	Emergent               # Emergent Vision Technologies Inc.
 E0:56:F4	Axesnetw               # AxesNetwork Solutions inc.
 E0:58:9E	LaerdalM               # Laerdal Medical
@@ -25429,6 +25464,7 @@ E8:ED:F3	Cisco
 E8:EF:89	OpmexTec               # OPMEX Tech.
 E8:F1:B0	Sagemcom               # SAGEMCOM SAS
 E8:F2:26	MillsonC               # MILLSON CUSTOM SOLUTIONS INC.
+E8:F2:E2	LgInnote               # LG Innotek
 E8:F2:E3	StarcorB               # Starcor Beijing Co.,Limited
 E8:F9:28	RftechSr               # RFTECH SRL
 E8:FC:60	ElcomInn               # ELCOM Innovations Private Limited
@@ -25447,6 +25483,7 @@ EC:1A:59	BelkinIn               # Belkin International Inc.
 EC:1D:7F	Zte                    # zte corporation
 EC:1F:72	SamsungE               # Samsung Electro Mechanics co., LTD.
 EC:21:9F	VidaboxL               # VidaBox LLC
+EC:21:E5	Toshiba
 EC:22:57	JiangsuN               # JiangSu NanJing University Electronic Information Technology Co.,Ltd
 EC:22:80	D-LinkIn               # D-Link International
 EC:23:3D	HuaweiTe               # Huawei Technologies Co., Ltd
@@ -26013,7 +26050,7 @@ FC:A9:B0	Miartech               # MIARTECH (SHANGHAI),INC.
 FC:AA:14	Giga-Byt               # GIGA-BYTE TECHNOLOGY CO.,LTD.
 FC:AD:0F	QtsNetwo               # QTS NETWORKS
 FC:AF:6A	Qulsar                 # Qulsar Inc
-FC:AF:AC	Panasoni               # Panasonic System LSI
+FC:AF:AC	Socionex               # Socionext Inc.
 FC:B0:C4	Shanghai               # Shanghai DareGlobal Technologies Co., Ltd
 FC:B4:E6	AskeyCom               # ASKEY COMPUTER CORP.
 FC:B6:98	Cambridg               # Cambridge Industries(Group) Co.,Ltd.
@@ -26053,6 +26090,7 @@ FC:F8:B7	TronteqE               # TRONTEQ Electronic
 FC:FA:F7	Shanghai               # Shanghai Baud Data Communication Co.,Ltd.
 FC:FB:FB	Cisco                  # CISCO SYSTEMS, INC.
 FC:FE:77	HitachiR               # Hitachi Reftechno, Inc.
+FC:FE:C2	Invensys               # Invensys Controls UK Limited
 FC:FF:AA	IeeeRegi               # IEEE REGISTRATION AUTHORITY  - Please see MAL public listing for more information.
 
 #
@@ -26135,6 +26173,7 @@ FC:FF:AA	IeeeRegi               # IEEE REGISTRATION AUTHORITY  - Please see MAL
 01-11-1E-00-00-02	EPLv2_PRes
 01-11-1E-00-00-03	EPLv2_SoA
 01-11-1E-00-00-04	EPLv2_ASnd
+01-11-1E-00-00-05	EPLv2_AMNI
 01-20-25/25		Control-Technology-Inc's-Industrial-Ctrl-Proto.
 01-80-24-00-00-00	Kalpana-Etherswitch-every-60-seconds
 01-80-C2-00-00-00/44	Spanning-tree-(for-bridges)
diff --git a/services b/services
index 15d7120597..76282f89cb 100644
--- a/services
+++ b/services
@@ -9040,7 +9040,7 @@ nuxsl            5991/tcp # NUXSL [Kai_Kretschmann] [Kai_Kretschmann] 2002-03
 nuxsl            5991/udp # NUXSL [Kai_Kretschmann] [Kai_Kretschmann] 2002-03
 consul-insight   5992/tcp # Consul InSight Security [Arthur_Hillenaar] [Arthur_Hillenaar] 2006-01
 consul-insight   5992/udp # Consul InSight Security [Arthur_Hillenaar] [Arthur_Hillenaar] 2006-01
-cim-rs           5993/tcp # DMTF WEBM CIM REST [WS_Inc] [Jim_Davis_2] 2015-04-24
+cim-rs           5993/tcp # DMTF WBEM CIM REST [WS_Inc] [Jim_Davis_2] 2015-04-24
 cvsup            5999/tcp # CVSup [Randall_Atkinson_2] [Randall_Atkinson_2]
 cvsup            5999/udp # CVSup [Randall_Atkinson_2] [Randall_Atkinson_2]
 x11             6000-6063/tcp # X Window System [Stephen_Gildea] [Stephen_Gildea] Known Unauthorized Use on port 6003
@@ -9897,6 +9897,7 @@ senomix08        8059/tcp # Senomix Timesheets Client [1 year assignment] [Charl
 senomix08        8059/udp # Senomix Timesheets Client [1 year assignment] [Charles_O_Dale] [Charles_O_Dale] 2006-07
 aero             8060/udp # Asymmetric Extended Route Optimization (AERO) [IESG] [IETF_Chair] [RFC6706]
 toad-bi-appsrvr  8066/tcp # Toad BI Application Server [Quest_Software_2] [Greg_Cottman_3] 2013-04-19
+infi-async       8067/tcp # Infinidat async replication [INFINIDAT] [Eldar_Kleiner] 2015-05-01
 gadugadu         8074/tcp # Gadu-Gadu [Marcin_Gozdalik] [Marcin_Gozdalik] 2006-05
 gadugadu         8074/udp # Gadu-Gadu [Marcin_Gozdalik] [Marcin_Gozdalik] 2006-05
 http-alt         8080/tcp # HTTP Alternate (see port 80) [Stephen_Casner] [Stephen_Casner]
@@ -10823,6 +10824,7 @@ netserialext4   16368/tcp # Network Serial Extension Ports Four [Michael_J_Hoy]
 netserialext4   16368/udp # Network Serial Extension Ports Four [Michael_J_Hoy] [Michael_J_Hoy]
 connected       16384/tcp # Connected Corp [Nicole_C_Ouellette] [Nicole_C_Ouellette] 2004-02
 connected       16384/udp # Connected Corp [Nicole_C_Ouellette] [Nicole_C_Ouellette] 2004-02
+rdgs            16385/tcp # Reliable Datagram Sockets [Oracle_7] [Sowmini_Varadhan] 2015-04-30
 xoms            16619/tcp # X509 Objects Management Service [Francis_GASCHET] [Francis_GASCHET] 2008-09-08
 axon-tunnel     16665/tcp # Reliable multipath data transport for high latencies [Bridgeworks] [Paul_Burgess] 2014-09-26
 vtp             16666/udp # Vidder Tunnel Protocol [Vidder_Inc] [Ted_Schroeder_2] 2011-10-24
diff --git a/ui/qt/wireshark_de.qm b/ui/qt/wireshark_de.qm
index b4c40ce355..4b02e2fb66 100644
--- a/ui/qt/wireshark_de.qm
+++ b/ui/qt/wireshark_de.qm
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index b415365007..6681b0973c 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -137,12 +137,12 @@
     <message>
         <location filename="capture_file.cpp" line="129"/>
         <source> [closing]</source>
-        <translation type="unfinished"></translation>
+        <translation>[schließe]</translation>
     </message>
     <message>
         <location filename="capture_file.cpp" line="134"/>
         <source> [closed]</source>
-        <translation type="unfinished"></translation>
+        <translation>[geschlossen]</translation>
     </message>
 </context>
 <context>
diff --git a/ui/qt/wireshark_pl.qm b/ui/qt/wireshark_pl.qm
index 11794f75de..8ccfeb44dd 100644
--- a/ui/qt/wireshark_pl.qm
+++ b/ui/qt/wireshark_pl.qm
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index a64f48a113..a063a7adc1 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -4320,7 +4320,7 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
     <message>
         <location filename="main_status_bar.cpp" line="368"/>
         <source>Packets: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Pakiety: %1</translation>
     </message>
 </context>
 <context>
@@ -5283,12 +5283,12 @@ text-decoration: underline;
     <message>
         <location filename="main_window.ui" line="1068"/>
         <source>Copy All Visible Items</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj wszystkie widoczne pozycje</translation>
     </message>
     <message>
         <location filename="main_window.ui" line="1073"/>
         <source>Copy All Visible Selected Tree Items</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj wszystkie widoczne pozycje wybranego poddrzewa</translation>
     </message>
     <message>
         <location filename="main_window.ui" line="1211"/>
diff --git a/ui/qt/wireshark_zh_CN.qm b/ui/qt/wireshark_zh_CN.qm
index 344a81c3ee..c156d8d235 100644
--- a/ui/qt/wireshark_zh_CN.qm
+++ b/ui/qt/wireshark_zh_CN.qm
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 57534829c8..9b649a0e4c 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -558,12 +558,12 @@
     <message>
         <location filename="capture_file_properties_dialog.cpp" line="452"/>
         <source>Average bytes/s</source>
-        <translation>平均 bytes/s</translation>
+        <translation>平均 字节/秒</translation>
     </message>
     <message>
         <location filename="capture_file_properties_dialog.cpp" line="473"/>
         <source>Average bits/s</source>
-        <translation>平均 bits/s</translation>
+        <translation>平均 比特/秒</translation>
     </message>
     <message>
         <location filename="capture_file_properties_dialog.cpp" line="524"/>
@@ -720,12 +720,12 @@
     <message>
         <location filename="capture_interfaces_dialog.ui" line="63"/>
         <source>Snaplen (B)</source>
-        <translation>Snap长度(B)</translation>
+        <translation>Snap长度 (B)</translation>
     </message>
     <message>
         <location filename="capture_interfaces_dialog.ui" line="68"/>
         <source>Buffer (MB)</source>
-        <translation>缓存(MB)</translation>
+        <translation>缓存 (MB)</translation>
     </message>
     <message>
         <location filename="capture_interfaces_dialog.ui" line="73"/>
@@ -1132,7 +1132,7 @@ PLEASE NOTE: One option MUST be selected.</source>
     <message>
         <location filename="coloring_rules_dialog.cpp" line="113"/>
         <source>Save filters in a file.</source>
-        <translation>保存过滤器到文件。</translation>
+        <translation>保存筛选器到文件。</translation>
     </message>
     <message>
         <location filename="coloring_rules_dialog.cpp" line="178"/>
@@ -1271,7 +1271,7 @@ PLEASE NOTE: One option MUST be selected.</source>
     <message>
         <location filename="conversation_dialog.cpp" line="66"/>
         <source>Follow a TCP or UDP stream.</source>
-        <translation>追踪TCP或UDP流。</translation>
+        <translation>追踪 TCP 或 UDP 流。</translation>
     </message>
     <message>
         <location filename="conversation_dialog.cpp" line="69"/>
@@ -1281,7 +1281,7 @@ PLEASE NOTE: One option MUST be selected.</source>
     <message>
         <location filename="conversation_dialog.cpp" line="70"/>
         <source>Graph a TCP conversation.</source>
-        <translation>对TCP对话绘制图形。</translation>
+        <translation>绘制 TCP 对话图形。</translation>
     </message>
     <message>
         <location filename="conversation_dialog.cpp" line="182"/>
@@ -1663,7 +1663,7 @@ PLEASE NOTE: One option MUST be selected.</source>
     <message>
         <location filename="filter_expressions_preferences_frame.ui" line="34"/>
         <source>Filter Expression</source>
-        <translation>过滤表达式</translation>
+        <translation>筛选器表达式</translation>
     </message>
 </context>
 <context>
@@ -1900,7 +1900,7 @@ PLEASE NOTE: One option MUST be selected.</source>
     <message>
         <location filename="font_color_preferences_frame.ui" line="31"/>
         <source>Main window font:</source>
-        <translation>主窗口字体</translation>
+        <translation>主窗口字体:</translation>
     </message>
     <message>
         <location filename="font_color_preferences_frame.ui" line="38"/>
@@ -2352,7 +2352,7 @@ PLEASE NOTE: One option MUST be selected.</source>
     <message>
         <location filename="io_graph_dialog.cpp" line="253"/>
         <source>Time (s)</source>
-        <translation>时间(s)</translation>
+        <translation>时间 (秒)</translation>
     </message>
     <message>
         <location filename="io_graph_dialog.cpp" line="209"/>
@@ -2372,7 +2372,7 @@ PLEASE NOTE: One option MUST be selected.</source>
     <message>
         <location filename="io_graph_dialog.cpp" line="387"/>
         <source>TCP errors</source>
-        <translation>TCP错误</translation>
+        <translation>TCP 错误</translation>
     </message>
     <message>
         <location filename="io_graph_dialog.cpp" line="824"/>
@@ -2422,12 +2422,12 @@ PLEASE NOTE: One option MUST be selected.</source>
     <message>
         <location filename="io_graph_dialog.cpp" line="1472"/>
         <source>Portable Document Format (*.pdf)</source>
-        <translation>可移植文档格式 (*.pdf)</translation>
+        <translation>便携式文档格式 (*.pdf)</translation>
     </message>
     <message>
         <location filename="io_graph_dialog.cpp" line="1473"/>
         <source>Portable Network Graphics (*.png)</source>
-        <translation>可移植网络图形格式 (*.png)</translation>
+        <translation>便携式网络图形格式 (*.png)</translation>
     </message>
     <message>
         <location filename="io_graph_dialog.cpp" line="1474"/>
@@ -2437,7 +2437,7 @@ PLEASE NOTE: One option MUST be selected.</source>
     <message>
         <location filename="io_graph_dialog.cpp" line="1476"/>
         <source>JPEG File Interchange Format (*.jpeg *.jpg)</source>
-        <translation>JPEG JPEG文件交换格式 (*.jpeg *.jpg)</translation>
+        <translation>JPEG 文件交换格式 (*.jpeg *.jpg)</translation>
     </message>
     <message>
         <location filename="io_graph_dialog.cpp" line="1487"/>
@@ -2977,7 +2977,7 @@ PLEASE NOTE: One option MUST be selected.</source>
     <message>
         <location filename="lbm_lbtrm_transport_dialog.ui" line="419"/>
         <source>Regenerate statistics using this display filter</source>
-        <translation>使用显示过滤器重新生成统计</translation>
+        <translation>使用显示筛选器重新生成统计</translation>
     </message>
     <message>
         <location filename="lbm_lbtrm_transport_dialog.ui" line="422"/>
@@ -2987,12 +2987,12 @@ PLEASE NOTE: One option MUST be selected.</source>
     <message>
         <location filename="lbm_lbtrm_transport_dialog.ui" line="441"/>
         <source>Copy as CSV</source>
-        <translation>复制为CSV</translation>
+        <translation>复制为 CSV</translation>
     </message>
     <message>
         <location filename="lbm_lbtrm_transport_dialog.ui" line="444"/>
         <source>Copy the tree as CSV</source>
-        <translation>复制树为CSV</translation>
+        <translation>复制树为 CSV</translation>
     </message>
     <message>
         <location filename="lbm_lbtrm_transport_dialog.ui" line="447"/>
@@ -3498,7 +3498,7 @@ PLEASE NOTE: One option MUST be selected.</source>
     <message>
         <location filename="lbm_lbtru_transport_dialog.ui" line="623"/>
         <source>Regenerate statistics using this display filter</source>
-        <translation>使用显示过滤器重新生成统计</translation>
+        <translation>使用显示筛选器重新生成统计</translation>
     </message>
     <message>
         <location filename="lbm_lbtru_transport_dialog.ui" line="626"/>
@@ -3508,12 +3508,12 @@ PLEASE NOTE: One option MUST be selected.</source>
     <message>
         <location filename="lbm_lbtru_transport_dialog.ui" line="645"/>
         <source>Copy as CSV</source>
-        <translation>复制为CSV</translation>
+        <translation>复制为 CSV</translation>
     </message>
     <message>
         <location filename="lbm_lbtru_transport_dialog.ui" line="648"/>
         <source>Copy the tree as CSV</source>
-        <translation>复制树为CSV</translation>
+        <translation>复制树为 CSV</translation>
     </message>
     <message>
         <location filename="lbm_lbtru_transport_dialog.ui" line="651"/>
@@ -3750,7 +3750,7 @@ PLEASE NOTE: One option MUST be selected.</source>
     <message>
         <location filename="lbm_lbtru_transport_dialog.cpp" line="1735"/>
         <source>LBT-RU Statistics failed to attach to tap</source>
-        <translation>LBT-RU统计附加到tap失败</translation>
+        <translation>LBT-RU 统计附加到 tap 失败</translation>
     </message>
 </context>
 <context>
@@ -3803,7 +3803,7 @@ PLEASE NOTE: One option MUST be selected.</source>
     <message>
         <location filename="lbm_stream_dialog.ui" line="74"/>
         <source>Regenerate statistics using this display filter</source>
-        <translation>使用显示过滤器重新生成统计</translation>
+        <translation>使用显示筛选器重新生成统计</translation>
     </message>
     <message>
         <location filename="lbm_stream_dialog.ui" line="77"/>
@@ -3813,12 +3813,12 @@ PLEASE NOTE: One option MUST be selected.</source>
     <message>
         <location filename="lbm_stream_dialog.ui" line="96"/>
         <source>Copy as CSV</source>
-        <translation>复制为CSV</translation>
+        <translation>复制为 CSV</translation>
     </message>
     <message>
         <location filename="lbm_stream_dialog.ui" line="99"/>
         <source>Copy the tree as CSV</source>
-        <translation>复制树为CSV</translation>
+        <translation>复制树为 CSV</translation>
     </message>
     <message>
         <location filename="lbm_stream_dialog.ui" line="102"/>
@@ -4095,7 +4095,7 @@ PLEASE NOTE: One option MUST be selected.</source>
     <message>
         <location filename="lbm_uimflow_dialog.ui" line="276"/>
         <source>Show only TCP flow information</source>
-        <translation>只显示TCP流的信息</translation>
+        <translation>只显示 TCP 流的信息</translation>
     </message>
     <message>
         <location filename="lbm_uimflow_dialog.cpp" line="265"/>
@@ -4119,12 +4119,12 @@ PLEASE NOTE: One option MUST be selected.</source>
     <message>
         <location filename="lbm_uimflow_dialog.cpp" line="457"/>
         <source>Portable Document Format (*.pdf)</source>
-        <translation>可移植文档格式 (*.pdf)</translation>
+        <translation>便携式文档格式 (*.pdf)</translation>
     </message>
     <message>
         <location filename="lbm_uimflow_dialog.cpp" line="458"/>
         <source>Portable Network Graphics (*.png)</source>
-        <translation>可移植网络图形格式 (*.png)</translation>
+        <translation>便携式网络图形格式 (*.png)</translation>
     </message>
     <message>
         <location filename="lbm_uimflow_dialog.cpp" line="459"/>
@@ -4134,7 +4134,7 @@ PLEASE NOTE: One option MUST be selected.</source>
     <message>
         <location filename="lbm_uimflow_dialog.cpp" line="461"/>
         <source>JPEG File Interchange Format (*.jpeg *.jpg)</source>
-        <translation>JPEG JPEG文件交换格式 (*.jpeg *.jpg)</translation>
+        <translation>JPEG 文件交换格式 (*.jpeg *.jpg)</translation>
     </message>
     <message>
         <location filename="lbm_uimflow_dialog.cpp" line="462"/>
@@ -4552,7 +4552,7 @@ text-decoration: underline;
     <message>
         <location filename="main_window.ui" line="364"/>
         <source>TCP Stream Graphs</source>
-        <translation>TCP流图形</translation>
+        <translation>TCP 流图形</translation>
     </message>
     <message>
         <location filename="main_window.ui" line="374"/>
@@ -5602,7 +5602,7 @@ text-decoration: underline;
     <message>
         <location filename="main_window.ui" line="1475"/>
         <source>TCP time sequence graph (Stevens)</source>
-        <translation>TCP时间序列图 (Stevens)</translation>
+        <translation>TCP 时间序列图 (Stevens)</translation>
     </message>
     <message>
         <location filename="main_window.ui" line="1480"/>
@@ -5612,7 +5612,7 @@ text-decoration: underline;
     <message>
         <location filename="main_window.ui" line="1483"/>
         <source>TCP througput</source>
-        <translation>TCP吞吐量</translation>
+        <translation>TCP 吞吐量</translation>
     </message>
     <message>
         <location filename="main_window.ui" line="1488"/>
@@ -5622,7 +5622,7 @@ text-decoration: underline;
     <message>
         <location filename="main_window.ui" line="1491"/>
         <source>TCP round trip time</source>
-        <translation>TCP往返时间</translation>
+        <translation>TCP 往返时间</translation>
     </message>
     <message>
         <location filename="main_window.ui" line="1496"/>
@@ -5632,17 +5632,17 @@ text-decoration: underline;
     <message>
         <location filename="main_window.ui" line="1499"/>
         <source>TCP window scaling</source>
-        <translation>TCP窗口尺寸</translation>
+        <translation>TCP 窗口尺寸</translation>
     </message>
     <message>
         <location filename="main_window.ui" line="1507"/>
         <source>Follow TCP Stream</source>
-        <translation>追踪TCP流</translation>
+        <translation>追踪 TCP 流</translation>
     </message>
     <message>
         <location filename="main_window.ui" line="1515"/>
         <source>Follow UDP Stream</source>
-        <translation>追踪UDP流</translation>
+        <translation>追踪 UDP 流</translation>
     </message>
     <message>
         <location filename="main_window.ui" line="1523"/>
@@ -5657,7 +5657,7 @@ text-decoration: underline;
     <message>
         <location filename="main_window.ui" line="1531"/>
         <source>TCP time sequence graph (tcptrace)</source>
-        <translation>TCP时间序列图 (tcptrace)</translation>
+        <translation>TCP 时间序列图 (tcptrace)</translation>
     </message>
     <message>
         <location filename="main_window.ui" line="1536"/>
@@ -6113,7 +6113,7 @@ text-decoration: underline;
     <message>
         <location filename="main_window.ui" line="1958"/>
         <source>Show packet times as the seconds since the UNIX / POSIX epoch (1970-01-01).</source>
-        <translation>使用自 UNIX / POSIX 时间戳 (1970-01-01)以来的秒数来显示分组时间。</translation>
+        <translation>使用自 UNIX / POSIX 时间戳 (1970-01-01) 以来的秒数来显示分组时间。</translation>
     </message>
     <message>
         <location filename="main_window.ui" line="1961"/>
@@ -6203,7 +6203,7 @@ text-decoration: underline;
     <message>
         <location filename="main_window.ui" line="2050"/>
         <source>Automatic (from capture file)</source>
-        <translation>自动(根据捕获文件)</translation>
+        <translation>自动 (根据捕获文件)</translation>
     </message>
     <message>
         <location filename="main_window.ui" line="2053"/>
@@ -7358,7 +7358,7 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="protocol_hierarchy_dialog.ui" line="52"/>
         <source>Bits/s</source>
-        <translation>Bits/s</translation>
+        <translation>比特/秒</translation>
     </message>
     <message>
         <location filename="protocol_hierarchy_dialog.ui" line="57"/>
@@ -7383,12 +7383,12 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="protocol_hierarchy_dialog.ui" line="92"/>
         <source>Copy as CSV</source>
-        <translation>复制为CSV</translation>
+        <translation>复制为 CSV</translation>
     </message>
     <message>
         <location filename="protocol_hierarchy_dialog.ui" line="95"/>
         <source>Copy stream list as CSV.</source>
-        <translation>复制流列表为CSV。</translation>
+        <translation>复制流列表为 CSV。</translation>
     </message>
     <message>
         <location filename="protocol_hierarchy_dialog.ui" line="100"/>
@@ -7413,7 +7413,7 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="protocol_hierarchy_dialog.cpp" line="291"/>
         <source>as CSV</source>
-        <translation>作为CSV</translation>
+        <translation>作为 CSV</translation>
     </message>
     <message>
         <location filename="protocol_hierarchy_dialog.cpp" line="294"/>
@@ -7457,82 +7457,82 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
         <location filename="tcp_stream_dialog.cpp" line="76"/>
         <source>Average Througput (bits/s)</source>
         <oldsource>Avgerage Througput (bits/s)</oldsource>
-        <translation>平均吞吐量（bit/s）</translation>
+        <translation>平均吞吐量 (比特/秒)</translation>
     </message>
     <message>
         <location filename="tcp_stream_dialog.cpp" line="77"/>
         <source>Round Trip Time (ms)</source>
-        <translation>往返时间(ms)</translation>
+        <translation>往返时间 (毫秒)</translation>
     </message>
     <message>
         <location filename="tcp_stream_dialog.cpp" line="78"/>
         <source>Segment Length (B)</source>
-        <translation>段长度(B)</translation>
+        <translation>段长度 (B)</translation>
     </message>
     <message>
         <location filename="tcp_stream_dialog.cpp" line="79"/>
         <source>Sequence Number (B)</source>
-        <translation>序列号(B)</translation>
+        <translation>序列号 (B)</translation>
     </message>
     <message>
         <location filename="tcp_stream_dialog.cpp" line="80"/>
         <source>Time (s)</source>
-        <translation>时间(s)</translation>
+        <translation>时间 (秒)</translation>
     </message>
     <message>
         <location filename="tcp_stream_dialog.cpp" line="81"/>
         <source>Window Size (B)</source>
-        <translation>窗口大小(B)</translation>
+        <translation>窗口大小 (B)</translation>
     </message>
     <message>
         <location filename="io_graph_dialog.cpp" line="1804"/>
         <source>Packets/s</source>
-        <translation>Packets/s</translation>
+        <translation>包/秒</translation>
     </message>
     <message>
         <location filename="io_graph_dialog.cpp" line="1805"/>
         <source>Bytes/s</source>
-        <translation>Bytes/s</translation>
+        <translation>字节/秒</translation>
     </message>
     <message>
         <location filename="io_graph_dialog.cpp" line="1806"/>
         <source>Bits/s</source>
-        <translation>Bits/s</translation>
+        <translation>比特/秒</translation>
     </message>
     <message>
         <location filename="io_graph_dialog.cpp" line="1807"/>
         <source>SUM(Y Field)</source>
-        <translation>总和(Y 字段)</translation>
+        <translation>总和 (Y字段)</translation>
     </message>
     <message>
         <location filename="io_graph_dialog.cpp" line="1808"/>
         <source>COUNT FRAMES(Y Field)</source>
-        <translation>COUNT FRAMES(Y 字段)</translation>
+        <translation>COUNT FRAMES (Y字段)</translation>
     </message>
     <message>
         <location filename="io_graph_dialog.cpp" line="1809"/>
         <source>COUNT FIELDS(Y Field)</source>
-        <translation>COUNT FIELDS(Y 字段)</translation>
+        <translation>COUNT FIELDS (Y字段)</translation>
     </message>
     <message>
         <location filename="io_graph_dialog.cpp" line="1810"/>
         <source>MAX(Y Field)</source>
-        <translation>最大值(Y 字段)</translation>
+        <translation>最大值 (Y字段)</translation>
     </message>
     <message>
         <location filename="io_graph_dialog.cpp" line="1811"/>
         <source>MIN(Y Field)</source>
-        <translation>最小值(Y 字段)</translation>
+        <translation>最小值 (Y字段)</translation>
     </message>
     <message>
         <location filename="io_graph_dialog.cpp" line="1812"/>
         <source>AVG(Y Field)</source>
-        <translation>平均值(Y 字段)</translation>
+        <translation>平均值 (Y字段)</translation>
     </message>
     <message>
         <location filename="io_graph_dialog.cpp" line="1813"/>
         <source>LOAD(Y Field)</source>
-        <translation>星形</translation>
+        <translation>星形 (Y字段)</translation>
     </message>
     <message>
         <location filename="io_graph_dialog.cpp" line="1822"/>
@@ -7788,7 +7788,7 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="remote_settings_dialog.ui" line="45"/>
         <source>Use UDP for data transfer</source>
-        <translation>使用UDP进行数据传输</translation>
+        <translation>使用 UDP 进行数据传输</translation>
     </message>
     <message>
         <location filename="remote_settings_dialog.ui" line="52"/>
@@ -7871,7 +7871,7 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="rtp_stream_dialog.ui" line="85"/>
         <source>Max Delta (ms)</source>
-        <translation>最大Delta(ms)</translation>
+        <translation>最大Delta (ms)</translation>
     </message>
     <message>
         <location filename="rtp_stream_dialog.ui" line="90"/>
@@ -7991,12 +7991,12 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="rtp_stream_dialog.ui" line="196"/>
         <source>Copy as CSV</source>
-        <translation>复制为CSV</translation>
+        <translation>复制为 CSV</translation>
     </message>
     <message>
         <location filename="rtp_stream_dialog.ui" line="199"/>
         <source>Copy stream list as CSV.</source>
-        <translation>复制流列表为CSV。</translation>
+        <translation>复制流列表为 CSV。</translation>
     </message>
     <message>
         <location filename="rtp_stream_dialog.ui" line="204"/>
@@ -8026,7 +8026,7 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="rtp_stream_dialog.cpp" line="258"/>
         <source>as CSV</source>
-        <translation>作为CSV</translation>
+        <translation>作为 CSV</translation>
     </message>
     <message>
         <location filename="rtp_stream_dialog.cpp" line="261"/>
@@ -8409,7 +8409,7 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="sctp_all_assocs_dialog.ui" line="407"/>
         <source>Switch to the tcptrace-style Time / Sequence graph</source>
-        <translation>切换到tcptrace样式的时间/序列图</translation>
+        <translation>切换到 tcptrace 样式的时间/序列图</translation>
     </message>
     <message>
         <location filename="sctp_all_assocs_dialog.ui" line="410"/>
@@ -8742,12 +8742,12 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="sctp_graph_arwnd_dialog.cpp" line="121"/>
         <source>time [secs]</source>
-        <translation>时间[秒]</translation>
+        <translation>时间 [秒]</translation>
     </message>
     <message>
         <location filename="sctp_graph_arwnd_dialog.cpp" line="122"/>
         <source>Advertised Receiver Window [Bytes]</source>
-        <translation>通告的接受窗口[字节]</translation>
+        <translation>通告的接受窗口 [字节]</translation>
     </message>
     <message>
         <location filename="sctp_graph_arwnd_dialog.cpp" line="167"/>
@@ -8806,7 +8806,7 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="sctp_graph_byte_dialog.cpp" line="122"/>
         <source>time [secs]</source>
-        <translation>时间[秒]</translation>
+        <translation>时间 [秒]</translation>
     </message>
     <message>
         <location filename="sctp_graph_byte_dialog.cpp" line="123"/>
@@ -8904,7 +8904,7 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="sctp_graph_dialog.cpp" line="345"/>
         <source>time [secs]</source>
-        <translation>时间[秒]</translation>
+        <translation>时间 [秒]</translation>
     </message>
     <message>
         <location filename="sctp_graph_dialog.cpp" line="346"/>
@@ -8919,12 +8919,12 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="sctp_graph_dialog.cpp" line="437"/>
         <source>Portable Document Format (*.pdf)</source>
-        <translation>可移植文档格式 (*.pdf)</translation>
+        <translation>便携式文档格式 (*.pdf)</translation>
     </message>
     <message>
         <location filename="sctp_graph_dialog.cpp" line="438"/>
         <source>Portable Network Graphics (*.png)</source>
-        <translation>可移植网络图形格式 (*.png)</translation>
+        <translation>便携式网络图形格式 (*.png)</translation>
     </message>
     <message>
         <location filename="sctp_graph_dialog.cpp" line="439"/>
@@ -8934,7 +8934,7 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="sctp_graph_dialog.cpp" line="441"/>
         <source>JPEG File Interchange Format (*.jpeg *.jpg)</source>
-        <translation>JPEG JPEG文件交换格式 (*.jpeg *.jpg)</translation>
+        <translation>JPEG文件交换格式 (*.jpeg *.jpg)</translation>
     </message>
     <message>
         <location filename="sctp_graph_dialog.cpp" line="448"/>
@@ -9119,12 +9119,12 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="sequence_dialog.cpp" line="303"/>
         <source>Portable Document Format (*.pdf)</source>
-        <translation>可移植文档格式 (*.pdf)</translation>
+        <translation>便携式文档格式 (*.pdf)</translation>
     </message>
     <message>
         <location filename="sequence_dialog.cpp" line="304"/>
         <source>Portable Network Graphics (*.png)</source>
-        <translation>可移植网络图形格式 (*.png)</translation>
+        <translation>便携式网络图形格式 (*.png)</translation>
     </message>
     <message>
         <location filename="sequence_dialog.cpp" line="305"/>
@@ -9134,7 +9134,7 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="sequence_dialog.cpp" line="307"/>
         <source>JPEG File Interchange Format (*.jpeg *.jpg)</source>
-        <translation>JPEG文件交换格式 (*.jpeg *.jpg)</translation>
+        <translation>JPEG 文件交换格式 (*.jpeg *.jpg)</translation>
     </message>
     <message>
         <location filename="sequence_dialog.cpp" line="308"/>
@@ -9382,7 +9382,7 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="sequence_dialog.ui" line="344"/>
         <source>Show only TCP flow information</source>
-        <translation>只显示TCP流的信息</translation>
+        <translation>只显示 TCP 流的信息</translation>
     </message>
 </context>
 <context>
@@ -9467,7 +9467,7 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="stats_tree_dialog.ui" line="41"/>
         <source>Regenerate statistics using this display filter</source>
-        <translation>使用显示过滤器重新生成统计</translation>
+        <translation>使用显示筛选器重新生成统计</translation>
     </message>
     <message>
         <location filename="stats_tree_dialog.ui" line="44"/>
@@ -9529,12 +9529,12 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="stats_tree_dialog.cpp" line="270"/>
         <source>Plain text file (*.txt);;Comma separated values (*.csv);;XML document (*.xml);;YAML document (*.yaml)</source>
-        <translation>纯文本文件(*.txt);;逗号分隔值 (*.csv);;XML 文档 (*.xml);;YAML 文档 (*.yaml)</translation>
+        <translation>纯文本文件 (*.txt);;逗号分隔值 (*.csv);;XML 文档 (*.xml);;YAML 文档 (*.yaml)</translation>
     </message>
     <message>
         <location filename="stats_tree_dialog.cpp" line="274"/>
         <source>Plain text file (*.txt)</source>
-        <translation>纯文本文件(*.txt)</translation>
+        <translation>纯文本文件 (*.txt)</translation>
     </message>
     <message>
         <location filename="stats_tree_dialog.cpp" line="318"/>
@@ -10021,12 +10021,12 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="tcp_stream_dialog.cpp" line="496"/>
         <source>Sequence Numbers (Stevens)</source>
-        <translation>序列号(Stevens)</translation>
+        <translation>序列号 (Stevens)</translation>
     </message>
     <message>
         <location filename="tcp_stream_dialog.cpp" line="521"/>
         <source>Sequence Numbers (tcptrace)</source>
-        <translation>序列号(tcptrace)</translation>
+        <translation>序列号 (tcptrace)</translation>
     </message>
     <message>
         <location filename="tcp_stream_dialog.cpp" line="572"/>
@@ -10081,12 +10081,12 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="tcp_stream_dialog.cpp" line="980"/>
         <source>Portable Document Format (*.pdf)</source>
-        <translation>可移植文档格式 (*.pdf)</translation>
+        <translation>便携式文档格式 (*.pdf)</translation>
     </message>
     <message>
         <location filename="tcp_stream_dialog.cpp" line="981"/>
         <source>Portable Network Graphics (*.png)</source>
-        <translation>可移植网络图形格式 (*.png)</translation>
+        <translation>便携式网络图形格式 (*.png)</translation>
     </message>
     <message>
         <location filename="tcp_stream_dialog.cpp" line="982"/>
@@ -10096,7 +10096,7 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="tcp_stream_dialog.cpp" line="984"/>
         <source>JPEG File Interchange Format (*.jpeg *.jpg)</source>
-        <translation>JPEG文件交换格式 (*.jpeg *.jpg)</translation>
+        <translation>JPEG 文件交换格式 (*.jpeg *.jpg)</translation>
     </message>
     <message>
         <location filename="tcp_stream_dialog.cpp" line="991"/>
@@ -10208,12 +10208,12 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
     <message>
         <location filename="traffic_table_dialog.cpp" line="75"/>
         <source>as CSV</source>
-        <translation>作为CSV</translation>
+        <translation>作为 CSV</translation>
     </message>
     <message>
         <location filename="traffic_table_dialog.cpp" line="76"/>
         <source>Copy all values of this page to the clipboard in CSV (Comma Separated Values) format.</source>
-        <translation>复制此页的所有值到剪贴板，使用CSV（逗号分隔值）格式。</translation>
+        <translation>复制此页的所有值到剪贴板，使用 CSV（逗号分隔值）格式。</translation>
     </message>
     <message>
         <location filename="traffic_table_dialog.cpp" line="78"/>
author	Gerald Combs <gerald@wireshark.org>	2015-05-03 08:07:17 -0700
committer	Gerald Combs <gerald@wireshark.org>	2015-05-03 15:07:25 +0000
commit	3d4646e978b5a3719236495272d4ed3d51d9e5b9 (patch)
tree	ac69bff8f04a322bf0b41cdac240ed6cbc240b06
parent	cd204b5bdb7c960b59c8eaba4f3645cd93cb9a83 (diff)