From 194fcdcd8047f3e3f3da5912138c5e68b3d973e0 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Sun, 22 Apr 2018 08:20:36 +0000 Subject: [PATCH] [Automatic update for 2018-04-22] Update manuf, services enterprise numbers, translations, and other items. Change-Id: I0769900c468b88eb19304e697d2faecddaeb4b11 Reviewed-on: https://code.wireshark.org/review/27072 Reviewed-by: Gerald Combs --- AUTHORS | 2 + enterprises.tsv | 51 +++++++++++++++++++++--- manuf | 83 +++++++++++++++++++++++++++++++++------- services | 1 - ui/qt/wireshark_zh_CN.ts | 20 +++++----- 5 files changed, 127 insertions(+), 30 deletions(-) diff --git a/AUTHORS b/AUTHORS index c9d8bc8833..f9aa9b5142 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4153,6 +4153,7 @@ Gabriel Ganne Ganesh Nawsupe Garming Sam Gene Cumm +Georg Brandl Gerard Garcia Gergely Nagy Gerhard KHUENY @@ -4207,6 +4208,7 @@ Jeff Layton Jeff Widman Jeffrey Smith Jens Kilian +Jeremy Browne Jeremy Hitt Jeroen Roovers Jeroen Sack diff --git a/enterprises.tsv b/enterprises.tsv index 7fa1b90ee4..d4d88913d5 100644 --- a/enterprises.tsv +++ b/enterprises.tsv @@ -5,7 +5,7 @@ # The format used here is: # Where SPACE can be any sequence of spaces and tabs. # -# (last updated 2018-04-15) +# (last updated 2018-04-20) 0 Reserved 1 NxNetworks @@ -35320,7 +35320,7 @@ 35486 Television New Zealand Ltd 35487 The Salvation Army USA Western Territory 35488 The Corosync Cluster Engine Project -35489 Radiofid Ltd +35489 IRZ AUTOMATION TECHNOLOGIES LTD # formerly 'Radiofid Ltd' 35490 AGEPS - APHP 35491 M.S. Projekt Management + Vertrieb GmbH 35492 RheinLand Versicherungen @@ -43562,7 +43562,7 @@ 43737 MedAllies 43738 Doshisha University 43739 Concept Smoke screen Ltd -43740 ASB-Technology Sp. z o.o. +43740 ASB-Security 43741 Cerqueira & Marcos, Lda 43742 Microx Computer GmbH 43743 Open Systems Technology, Pty. @@ -47059,7 +47059,7 @@ 47237 SYSTEMES INFORMATION HARMONIE MUTUELLE SIHM GIE 47238 AIS Advanced Info Service 47239 Braincarta -47240 Vision Solutions, Inc. +47240 Syncsort Inc. 47241 DZIECIECY SWIAT Krzysztof Pytko 47242 CoreOS, Inc 47243 Steelcase, Inc. @@ -51611,7 +51611,7 @@ 51796 Citadel LLC 51797 Bachmann electronic GmbH 51798 Norgine Limited -51799 Excera +51799 Excera Technology Co., Ltd 51800 Virgin Global Media 51801 Quick Heal Technologies Limited 51802 Semperis Ltd. @@ -51622,3 +51622,44 @@ 51807 regio[.NET] GmbH&Co. KG 51808 Andreas Kloska 51809 Xunde Energie +51810 Cloud Portfolio And Trading Analytics +51811 Pearl TV +51812 Shenzhen Kstar Science & Technology Co.,Ltd +51813 Thomas Gebhardt +51814 Solid Optics EU N.V. +51815 Dominanz s.r.o. +51816 euNetworks Managed Services GmbH +51817 KAP IT +51818 Westland Gummiwerke GmbH & Co. KG +51819 Serg Oskin +51820 deepthink AG +51821 SAFARI Montage +51822 iTechTool Incorporated +51823 Hacking & Coffee, LLC +51824 QuEST Global Engineering Services Private Limited +51825 Astronaut, LLC +51826 Atmosphere Architects +51827 Gillerfors Åkeri AB +51828 StructureIT +51829 High-End Media Kft. +51830 Athora Corporation +51831 Gratika +51832 EnableIT Technologies Ltd +51833 Macadam +51834 Atam Id +51835 French-Road +51836 SUNY College of Optometry +51837 INVEST - M, Ltd. +51838 ProHealth Care +51839 ddrs.de +51840 Express Scripts Canada Inc. +51841 FullCore +51842 Adven Sweden Ab +51843 Delta Systems Group +51844 Carnegie Technologies +51845 SureFire LLC. +51846 Security Demon LLC +51847 GUARANA +51848 NetMeister, Inc. +51849 MunichCamper +51850 Inspur Power Commercial Systems Co.,Ltd. diff --git a/manuf b/manuf index 3f174466d8..d88611673e 100644 --- a/manuf +++ b/manuf @@ -1646,7 +1646,7 @@ 00:06:41 Itcn 00:06:42 Genetel Genetel Systems Inc. 00:06:43 SonoComp SONO Computer Co., Ltd. -00:06:44 Neix neix,Inc +00:06:44 NextgenB NextGen Business Solutions, Inc 00:06:45 MeiseiEl Meisei Electric Co. Ltd. 00:06:46 Shenzhen ShenZhen XunBao Network Technology Co Ltd 00:06:47 EtraliSA Etrali S.A. @@ -9602,7 +9602,7 @@ 00:24:AB A7Engine A7 Engineering, Inc. 00:24:AC Hangzhou Hangzhou DPtech Technologies Co., Ltd. 00:24:AD AdolfThi Adolf Thies Gmbh & Co. KG -00:24:AE Morpho +00:24:AE Idemia 00:24:AF DishTech Dish Technologies Corp 00:24:B0 Esab Esab Ab 00:24:B1 CoulombT Coulomb Technologies @@ -12438,7 +12438,7 @@ 00:50:C2:5B:30:00/36 HitecomS HITECOM System 00:50:C2:5B:40:00/36 Terrasci Terrascience Systems Ltd. 00:50:C2:5B:50:00/36 Rafael -00:50:C2:5B:60:00/36 KontronB Kontron (Beijing) Technology Co.,Ltd. +00:50:C2:5B:60:00/36 KontronB Kontron (BeiJing) Technology Co.,Ltd 00:50:C2:5B:70:00/36 Avermedi AVerMedia Technologies, Inc. 00:50:C2:5B:80:00/36 Westfali WestfaliaSurge GmbH 00:50:C2:5B:90:00/36 TaiwanVi Taiwan Video & Monitor @@ -12791,7 +12791,7 @@ 00:50:C2:71:40:00/36 TEAmSA T.E.Am., S. A. 00:50:C2:71:50:00/36 Riexinge RIEXINGER Elektronik 00:50:C2:71:60:00/36 MitrolSR Mitrol S.R.L. -00:50:C2:71:70:00/36 MbConnec MB Connect Line GmbH +00:50:C2:71:70:00/36 MbConnec MB connect line GmbH Fernwartungssysteme 00:50:C2:71:80:00/36 IllunisL illunis LLC 00:50:C2:71:90:00/36 Ennovati ennovatis GmbH 00:50:C2:71:A0:00/36 LogusBro Logus Broadband Wireless Solutions Inc. @@ -14723,7 +14723,7 @@ 00:50:C2:EA:50:00/36 Aerodata Aerodata AG 00:50:C2:EA:60:00/36 Powersen Powersense A/S 00:50:C2:EA:70:00/36 Saia-Bur Saia-Burgess Controls AG -00:50:C2:EA:80:00/36 MbConnec MB Connect Line GmbH +00:50:C2:EA:80:00/36 MbConnec MB connect line GmbH Fernwartungssysteme 00:50:C2:EA:90:00/36 MettlerT Mettler Toledo Hi Speed 00:50:C2:EA:A0:00/36 Bae BAE Systems 00:50:C2:EA:B0:00/36 Warp9Tec Warp9 Tech Design, Inc. @@ -15043,7 +15043,7 @@ 00:50:C2:FE:60:00/36 Exibea Exibea AB 00:50:C2:FE:70:00/36 Erhardt+ Erhardt+Leimer GmbH 00:50:C2:FE:80:00/36 MangoDsp Mango DSP, Inc. -00:50:C2:FE:90:00/36 MbConnec MB Connect Line GmbH +00:50:C2:FE:90:00/36 MbConnec MB connect line GmbH Fernwartungssysteme 00:50:C2:FE:A0:00/36 BrunelSe Brunel GmbH Section Communications 00:50:C2:FE:B0:00/36 AxibleTe Axible Technologies 00:50:C2:FE:C0:00/36 FirstSys First System Technology Co., Ltd. @@ -16311,11 +16311,12 @@ 00:B0:EE Ajile Ajile Systems, Inc. 00:B0:F0 CalyNetw Caly Networks 00:B0:F5 Networth NetWorth Technologies, Inc. -00:B3:38 KontronD Kontron Design Manufacturing Services (M) Sdn. Bhd +00:B3:38 KontronA Kontron Asia Pacific Design Sdn. Bhd 00:B3:42 Macrosan MacroSAN Technologies Co., Ltd. 00:B3:62 Apple Apple, Inc. 00:B5:6D DavidEle David Electronics Co., LTD. 00:B5:D6 Omnibit Omnibit Inc. +00:B6:70 Cisco Cisco Systems, Inc 00:B6:9F Latch 00:B7:8D NanjingS Nanjing Shining Electric Automation Co., Ltd 00:B8:C2 HeightsT Heights Telecom T ltd @@ -16323,6 +16324,7 @@ 00:BA:C0 Biometri Biometric Access Company 00:BB:01 Octothor Octothorpe Corp. 00:BB:3A AmazonTe Amazon Technologies Inc. +00:BB:60 IntelCor Intel Corporate 00:BB:8E Hme HME Co., Ltd. 00:BB:C1 Canon Canon Inc. 00:BB:F0 Ungerman UNGERMANN-BASS INC. @@ -17361,11 +17363,21 @@ 04:C2:3E Htc HTC Corporation 04:C2:41 Nokia 04:C3:E6 IeeeRegi IEEE Registration Authority +04:C3:E6:00:00:00/28 Dreamkas Dreamkas Llc 04:C3:E6:10:00:00/28 Guangdon Guangdong New Pulse Electric Co., Ltd. 04:C3:E6:20:00:00/28 SisTechn SiS Technology +04:C3:E6:30:00:00/28 ExtechEl Extech Electronics Co., LTD. +04:C3:E6:40:00:00/28 Innovusi Innovusion Inc. +04:C3:E6:50:00:00/28 Invasys +04:C3:E6:60:00:00/28 Shenzhen Shenzhen Shuotian Information Technology Co., LTD 04:C3:E6:70:00:00/28 Advanced Advanced Digital Technologies, s.r.o. +04:C3:E6:80:00:00/28 Sloc SLOC GmbH 04:C3:E6:90:00:00/28 EkinTekn Ekin Teknoloji San ve Tic A.S. +04:C3:E6:A0:00:00/28 SealedUn Sealed Unit Parts Co., Inc. +04:C3:E6:B0:00:00/28 FlintecU Flintec UK Ltd. 04:C3:E6:C0:00:00/28 ShantouY SHANTOU YINGSHENG IMPORT & EXPORT TRADING CO.,LTD. +04:C3:E6:D0:00:00/28 Amiosec Amiosec Ltd +04:C3:E6:E0:00:00/28 Teleepoc Teleepoch Ltd 04:C5:A4 Cisco Cisco Systems, Inc 04:C8:80 Samtec Samtec Inc 04:C9:91 Phistek Phistek INC. @@ -17703,6 +17715,7 @@ 08:D4:0C IntelCor Intel Corporate 08:D4:2B SamsungE Samsung Electronics Co.,Ltd 08:D4:6A LgElectr LG Electronics (Mobile Communications) +08:D5:9D Sagemcom Sagemcom Broadband SAS 08:D5:C0 SeersTec Seers Technology Co., Ltd 08:D8:33 Shenzhen Shenzhen RF Technology Co., Ltd 08:DF:1F Bose Bose Corporation @@ -17912,6 +17925,7 @@ 0C:C7:31 Currant Currant, Inc. 0C:C8:1F SummerIn Summer Infant, Inc. 0C:C9:C6 SamwinHo Samwin Hong Kong Limited +0C:CB:85 Motorola Motorola Mobility LLC, a Lenovo Company 0C:CB:8D AscoNuma ASCO Numatics GmbH 0C:CC:26 Airenetw Airenetworks 0C:CD:D3 Eastrive Eastriver Technology Co., Ltd. @@ -18357,6 +18371,7 @@ 14:CF:92 Tp-LinkT TP-LINK TECHNOLOGIES CO.,LTD. 14:CF:E2 ArrisGro ARRIS Group, Inc. 14:D1:1F HuaweiTe Huawei Technologies Co.,Ltd +14:D1:69 HuaweiTe Huawei Technologies Co.,Ltd 14:D4:FE ArrisGro ARRIS Group, Inc. 14:D6:4D D-LinkIn D-Link International 14:D7:6E ConchEle CONCH ELECTRONIC Co.,Ltd @@ -19363,7 +19378,7 @@ 28:5F:DB HuaweiTe Huawei Technologies Co.,Ltd 28:60:46 LantechC Lantech Communications Global, Inc. 28:60:94 Capelec -28:63:36 Siemens- Siemens AG - Industrial Automation - EWA +28:63:36 Siemens Siemens AG 28:65:6B Keystone Keystone Microtech Corporation 28:66:E3 Azurewav AzureWave Technology Inc. 28:6A:B8 Apple Apple, Inc. @@ -19860,6 +19875,7 @@ 30:45:96 HuaweiTe Huawei Technologies Co.,Ltd 30:46:9A Netgear 30:49:3B NanjingZ Nanjing Z-Com Wireless Co.,Ltd +30:4B:07 Motorola Motorola Mobility LLC, a Lenovo Company 30:4C:7E Panasoni Panasonic Electric Works Automation Controls Techno Co.,Ltd. 30:4E:C3 TianjinT Tianjin Techua Technology Co., Ltd. 30:51:F8 Byk-Gard BYK-Gardner GmbH @@ -19942,6 +19958,7 @@ 30:C8:2A Wi-BizSr WI-BIZ srl 30:CB:F8 SamsungE Samsung Electronics Co.,Ltd 30:CD:A7 SamsungE Samsung Electronics Co.,Ltd +30:D1:6B LiteonTe Liteon Technology Corporation 30:D1:7E HuaweiTe Huawei Technologies Co.,Ltd 30:D3:2D Devolo devolo AG 30:D3:57 Logosol Logosol, Inc. @@ -20025,6 +20042,7 @@ 34:0C:ED Moduel Moduel AB 34:12:90 Treeview Treeview Co.,Ltd. 34:12:98 Apple Apple, Inc. +34:12:F9 HuaweiTe Huawei Technologies Co.,Ltd 34:13:A8 Mediplan Mediplan Limited 34:13:E8 IntelCor Intel Corporate 34:14:5F SamsungE Samsung Electronics Co.,Ltd @@ -20062,6 +20080,7 @@ 34:29:EA McdElect Mcd Electronics Sp. Z O.O. 34:2A:F1 TexasIns Texas Instruments 34:2D:0D SamsungE Samsung Electronics Co.,Ltd +34:2E:B6 HuaweiTe Huawei Technologies Co.,Ltd 34:2F:6E Anywire Anywire corporation 34:31:11 SamsungE Samsung Electronics Co.,Ltd 34:31:C4 Avm AVM GmbH @@ -20090,6 +20109,7 @@ 34:56:FE CiscoMer Cisco Meraki 34:57:60 Mitrasta MitraStar Technology Corp. 34:5A:06 Sharp SHARP Corporation +34:5A:BA TcloudIn tcloud intelligence 34:5B:11 EviHeat Evi Heat Ab 34:5B:BB GdMideaA GD Midea Air-Conditioning Equipment Co.,Ltd. 34:5C:40 CargtHol Cargt Holdings LLC @@ -20114,6 +20134,7 @@ 34:76:C5 I-ODataD I-O DATA DEVICE, INC. 34:78:77 O-NetCom O-Net Communications (Shenzhen) Limited 34:78:D7 GioneeCo Gionee Communication Equipment Co.,Ltd. +34:79:16 HuaweiTe Huawei Technologies Co.,Ltd 34:7A:60 ArrisGro ARRIS Group, Inc. 34:7C:25 Apple Apple, Inc. 34:7E:39 NokiaDan Nokia Danmark A/S @@ -20642,6 +20663,7 @@ 3C:6F:EA Panasoni Panasonic India Pvt. Ltd. 3C:6F:F7 Entek EnTek Systems, Inc. 3C:70:59 Makerbot MakerBot Industries +3C:71:BF Espressi Espressif Inc. 3C:74:37 Rim 3C:75:4A ArrisGro ARRIS Group, Inc. 3C:77:E6 HonHaiPr Hon Hai Precision Ind. Co.,Ltd. @@ -21197,7 +21219,7 @@ 40:D8:55:0F:10:00/36 Grossenb Grossenbacher Systeme AG 40:D8:55:0F:20:00/36 Sigmaphi SigmaPhi Electronics 40:D8:55:0F:30:00/36 Econ ECON Systems Inc. -40:D8:55:0F:40:00/36 MbConnec MB Connect Line GmbH +40:D8:55:0F:40:00/36 MbConnec MB connect line GmbH Fernwartungssysteme 40:D8:55:0F:50:00/36 CstGroup CST Group 40:D8:55:0F:60:00/36 Private 40:D8:55:0F:70:00/36 ComlineE Comline Elektronik Elektrotechnik GmbH @@ -21711,6 +21733,7 @@ 48:27:EA SamsungE Samsung Electronics Co.,Ltd 48:28:2F Zte zte corporation 48:2A:E3 WistronI Wistron InfoComm(Kunshan)Co.,Ltd. +48:2C:A0 XiaomiCo Xiaomi Communications Co Ltd 48:2C:EA Motorola Motorola Inc Business Light Radios 48:33:DD ZennioAv Zennio Avance Y Tecnologia, S.L. 48:34:3D Iep IEP GmbH @@ -22032,6 +22055,7 @@ 4C:CC:6A Micro-St Micro-Star INTL CO., LTD. 4C:D0:8A Humax HUMAX Co., Ltd. 4C:D0:CB HuaweiTe Huawei Technologies Co.,Ltd +4C:D1:A1 HuaweiTe Huawei Technologies Co.,Ltd 4C:D6:37 QsonoEle Qsono Electronics Co., Ltd 4C:D7:B6 HelmerSc Helmer Scientific 4C:D9:C4 MagnetiM Magneti Marelli Automotive Electronics (Guangzhou) Co. Ltd @@ -22126,6 +22150,7 @@ 50:2D:F4 PhytecMe Phytec Messtechnik GmbH 50:2E:5C Htc HTC Corporation 50:2E:CE AsahiEle Asahi Electronics Co.,Ltd +50:2F:A8 Cisco Cisco Systems, Inc 50:31:AD AbbGloba ABB Global Industries and Services Private Limited 50:32:37 Apple Apple, Inc. 50:32:75 SamsungE Samsung Electronics Co.,Ltd @@ -22277,6 +22302,7 @@ 50:D7:53 Conelcom CONELCOM GmbH 50:DA:00 Hangzhou Hangzhou H3C Technologies Co., Limited 50:DC:E7 AmazonTe Amazon Technologies Inc. +50:DC:FC Ecocom 50:DD:4F Automati Automation Components, Inc 50:DF:95 Lytx 50:E0:C7 Turcontr TurControlSystme AG @@ -22745,6 +22771,7 @@ 5C:24:79 Baltech Baltech AG 5C:25:4C AvireGlo Avire Global Pte Ltd 5C:26:0A Dell Dell Inc. +5C:26:23 Wavelynx WaveLynx Technologies Corporation 5C:2A:EF OpenAcce Open Access Pty Ltd 5C:2B:F5 VivintWi Vivint Wireless Inc. 5C:2E:59 SamsungE Samsung Electronics Co.,Ltd @@ -23702,6 +23729,7 @@ 70:02:58 01db-Met 01DB-METRAVIB 70:05:14 LgElectr LG Electronics (Mobile Communications) 70:06:AC Eastcomp Eastcompeace Technology Co., Ltd +70:0B:01 Sagemcom Sagemcom Broadband SAS 70:0B:C0 DewavTec Dewav Technology Company 70:0F:6A Cisco Cisco Systems, Inc 70:0F:C7 Shenzhen Shenzhen Ikinloop Technology Co.,Ltd. @@ -24102,7 +24130,8 @@ 70:B3:D5:15:C0:00/36 WoodsHol Woods Hole Oceanographic Institution 70:B3:D5:15:D0:00/36 VtronPty Vtron Pty Ltd 70:B3:D5:15:F0:00/36 Savroni̇ SAVRONİK ELEKTRONİK -70:B3:D5:16:10:00/36 MbConnec MB Connect Line GmbH +70:B3:D5:16:10:00/36 MbConnec MB connect line GmbH Fernwartungssysteme +70:B3:D5:16:20:00/36 EspaiDeP ESPAI DE PRODUCCIÓ I ELECTRÓNI 70:B3:D5:16:30:00/36 BharatHe Bharat Heavy Electricals Limited 70:B3:D5:16:40:00/36 TokyoDra Tokyo Drawing Ltd. 70:B3:D5:16:60:00/36 SerialIm Serial Image Inc. @@ -24123,7 +24152,7 @@ 70:B3:D5:17:B0:00/36 VistecEl Vistec Electron Beam GmbH 70:B3:D5:17:D0:00/36 EntechEl Entech Electronics 70:B3:D5:17:E0:00/36 OculiVis Oculi Vision -70:B3:D5:17:F0:00/36 MbConnec MB Connect Line GmbH +70:B3:D5:17:F0:00/36 MbConnec MB connect line GmbH Fernwartungssysteme 70:B3:D5:18:00:00/36 LhaPty LHA Systems (Pty) Ltd 70:B3:D5:18:10:00/36 TaskSist Task Sistemas 70:B3:D5:18:20:00/36 KitronUa Kitron UAB @@ -24325,7 +24354,7 @@ 70:B3:D5:2C:C0:00/36 WeworkCo WeWork Companies, Inc. 70:B3:D5:2C:D0:00/36 KoreaAir Korea Airports Corporation 70:B3:D5:2C:E0:00/36 Kdt -70:B3:D5:2C:F0:00/36 MbConnec MB Connect Line GmbH +70:B3:D5:2C:F0:00/36 MbConnec MB connect line GmbH Fernwartungssysteme 70:B3:D5:2D:00:00/36 Ijin ijin co.,ltd. 70:B3:D5:2D:20:00/36 Shanghai Shanghai Irisian Optronics Technology Co.,Ltd. 70:B3:D5:2D:40:00/36 Ct CT Company @@ -24377,6 +24406,7 @@ 70:B3:D5:32:70:00/36 Seneco Seneco A/S 70:B3:D5:32:80:00/36 Hipodrom Hipodromo De Agua Caliente Sa Cv 70:B3:D5:32:A0:00/36 WuhanXin Wuhan Xingtuxinke ELectronic Co.,Ltd +70:B3:D5:32:D0:00/36 HanwellT Hanwell Technology Co., Ltd. 70:B3:D5:32:F0:00/36 Movidius Movidius SRL 70:B3:D5:33:20:00/36 Innosent 70:B3:D5:33:60:00/36 Synacces Synaccess Networks Inc. @@ -24468,6 +24498,7 @@ 70:B3:D5:3C:00:00/36 Dk-Techn DK-Technologies A/S 70:B3:D5:3C:20:00/36 Cellular Cellular Specialties, Inc. 70:B3:D5:3C:30:00/36 Aimco +70:B3:D5:3C:40:00/36 Hagiwara Hagiwara Solutions Co., Ltd. 70:B3:D5:3C:50:00/36 P4qElect P4Q ELECTRONICS, S.L. 70:B3:D5:3C:60:00/36 AcdElekr ACD Elekronik GmbH 70:B3:D5:3C:70:00/36 Softcrea Softcreate Corp. @@ -24677,6 +24708,7 @@ 70:B3:D5:53:C0:00/36 Airthing Airthings 70:B3:D5:54:20:00/36 RtdsTech RTDS Technologies Inc. 70:B3:D5:54:40:00/36 SiliconS Silicon Safe Ltd +70:B3:D5:54:60:00/36 Sensefar Sensefarm AB 70:B3:D5:54:70:00/36 CeLink Ce Link Limited 70:B3:D5:54:80:00/36 Digiverv Digiverv Inc 70:B3:D5:54:90:00/36 ProconAu Procon automatic systems GmbH @@ -24778,6 +24810,7 @@ 70:B3:D5:5F:30:00/36 Rtone 70:B3:D5:5F:40:00/36 Fdstimin FDSTiming 70:B3:D5:5F:60:00/36 Freeflig FreeFlight Systems +70:B3:D5:5F:90:00/36 MbConnec MB connect line GmbH Fernwartungssysteme 70:B3:D5:5F:A0:00/36 TexCompu Tex Computer Srl 70:B3:D5:5F:B0:00/36 Teleplat Teleplatforms 70:B3:D5:5F:C0:00/36 Surtec @@ -25144,6 +25177,7 @@ 70:B3:D5:84:70:00/36 Ai-Lynx 70:B3:D5:84:90:00/36 Rf-Tuote RF-Tuote Oy 70:B3:D5:84:A0:00/36 MogLabor MOG Laboratories Pty Ltd +70:B3:D5:84:C0:00/36 Corekine CoreKinect 70:B3:D5:84:D0:00/36 QuantumD Quantum Design Inc. 70:B3:D5:84:E0:00/36 Chromalo Chromalox, Inc. 70:B3:D5:85:00:00/36 Reo Reo Ag @@ -25592,7 +25626,7 @@ 70:B3:D5:B3:40:00/36 Medtroni Medtronic 70:B3:D5:B3:50:00/36 Rexxam Rexxam Co.,Ltd. 70:B3:D5:B3:70:00/36 Codec CODEC Co., Ltd. -70:B3:D5:B3:90:00/36 MbConnec MB Connect Line GmbH +70:B3:D5:B3:90:00/36 MbConnec MB connect line GmbH Fernwartungssysteme 70:B3:D5:B3:A0:00/36 Adigital Adigitalmedia 70:B3:D5:B3:B0:00/36 Insitu Insitu, Inc 70:B3:D5:B3:C0:00/36 DorletSa Dorlet Sau @@ -25642,6 +25676,7 @@ 70:B3:D5:B9:80:00/36 GsfPte GSF Corporation Pte Ltd 70:B3:D5:B9:90:00/36 Domosafe DomoSafety S.A. 70:B3:D5:B9:B0:00/36 Elektron Elektronik Art +70:B3:D5:B9:C0:00/36 EdcoTech EDCO Technology 1993 ltd 70:B3:D5:B9:E0:00/36 Polsyste Polsystem Si Sp. Z O.O., S.K.A. 70:B3:D5:BA:10:00/36 Cathwell Cathwell AS 70:B3:D5:BA:20:00/36 Mamac MAMAC Systems, Inc. @@ -25701,6 +25736,7 @@ 70:B3:D5:C0:60:00/36 Xotonics XotonicsMED GmbH 70:B3:D5:C0:70:00/36 Areco 70:B3:D5:C0:A0:00/36 Infosock Infosocket Co., Ltd. +70:B3:D5:C0:B0:00/36 Fstudio Fstudio Co Ltd 70:B3:D5:C0:C0:00/36 Tech4rac Tech4Race 70:B3:D5:C0:E0:00/36 SysdevSr SYSDEV Srl 70:B3:D5:C0:F0:00/36 Honeywel Honeywell Safety Products USA, Inc @@ -25828,6 +25864,7 @@ 70:B3:D5:CD:90:00/36 PeterHub Peter Huber Kaeltemaschinenbau GmbH 70:B3:D5:CD:A0:00/36 Vitec 70:B3:D5:CD:E0:00/36 Multipur Multipure International +70:B3:D5:CD:F0:00/36 3dPrinti 3D Printing Specialists 70:B3:D5:CE:10:00/36 EaElektr EA Elektroautomatik GmbH & Co. KG 70:B3:D5:CE:20:00/36 Centero 70:B3:D5:CE:30:00/36 DalcnetS Dalcnet srl @@ -25914,6 +25951,7 @@ 70:B3:D5:D6:E0:00/36 ArdSa ard sa 70:B3:D5:D6:F0:00/36 X-Spex X-SPEX GmbH 70:B3:D5:D7:00:00/36 Rational Rational Production srl Unipersonale +70:B3:D5:D7:10:00/36 RzbRudol RZB Rudolf Zimmermann, Bamberg GmbH 70:B3:D5:D7:20:00/36 Onyield OnYield Inc Ltd 70:B3:D5:D7:30:00/36 Ermine ERMINE Corporation 70:B3:D5:D7:40:00/36 SandiaNa Sandia National Laboratories @@ -26032,6 +26070,7 @@ 70:B3:D5:E3:D0:00/36 LeoBodna Leo Bodnar Electronics Ltd 70:B3:D5:E3:E0:00/36 SolWeldi Sol Welding srl 70:B3:D5:E3:F0:00/36 Bestcode Bestcode Llc +70:B3:D5:E4:30:00/36 SlAudio SL Audio A/S 70:B3:D5:E4:50:00/36 Momentum Momentum Data Systems 70:B3:D5:E4:80:00/36 Tdi TDI. Co., LTD 70:B3:D5:E4:90:00/36 Kendrion Kendrion Mechatronics Center GmbH @@ -26088,6 +26127,7 @@ 70:B3:D5:EA:40:00/36 GrupoEpe Grupo Epelsa S.L. 70:B3:D5:EA:60:00/36 Galios 70:B3:D5:EA:70:00/36 SICESSrl S.I.C.E.S. srl +70:B3:D5:EA:80:00/36 Dia-Stro Dia-Stron Limited 70:B3:D5:EA:B0:00/36 ApenGrou APEN GROUP SpA (VAT IT08767740155) 70:B3:D5:EA:C0:00/36 KentechI Kentech Instruments Limited 70:B3:D5:EA:E0:00/36 OrlacoPr Orlaco Products B.V. @@ -26995,6 +27035,7 @@ 7C:6C:39 PixsysSr Pixsys Srl 7C:6C:8F AmsNeve Ams Neve Ltd 7C:6D:62 Apple Apple, Inc. +7C:6D:A6 Superwav Superwave Group LLC 7C:6D:F8 Apple Apple, Inc. 7C:6F:06 Caterpil Caterpillar Trimble Control Technologies 7C:6F:F8 Shenzhen ShenZhen ACTO Digital Video Technology Co.,Ltd. @@ -27790,6 +27831,7 @@ 88:BD:45 SamsungE Samsung Electronics Co.,Ltd 88:BD:78 Flaircom Flaircomm Microelectronics,Inc. 88:BF:D5 SimpleAu Simple Audio Ltd +88:BF:E4 HuaweiTe Huawei Technologies Co.,Ltd 88:C2:42 Poynt Poynt Co. 88:C2:55 TexasIns Texas Instruments 88:C3:6E BeijingE Beijing Ereneben lnformation Technology Limited @@ -28114,6 +28156,7 @@ 90:23:EC Availink Availink, Inc. 90:27:E4 Apple Apple, Inc. 90:2B:34 Giga-Byt GIGA-BYTE TECHNOLOGY CO.,LTD. +90:2B:D2 HuaweiTe Huawei Technologies Co.,Ltd 90:2C:C7 C-MaxAsi C-MAX Asia Limited 90:2E:1C IntelCor Intel Corporate 90:2E:87 Labjack @@ -29445,6 +29488,7 @@ A4:E3:2E SiliconS Silicon & Software Systems Ltd. A4:E3:91 DenyFont Deny Fontaine A4:E4:B8 Blackber BlackBerry RTS A4:E5:97 Gessler Gessler GmbH +A4:E6:15 Shenzhen SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LTD A4:E6:B1 Shanghai Shanghai Joindata Technology Co.,Ltd. A4:E7:31 Nokia Nokia Corporation A4:E7:E4 Connex Connex GmbH @@ -29719,7 +29763,7 @@ AC:61:75 HuaweiTe Huawei Technologies Co.,Ltd AC:61:EA Apple Apple, Inc. AC:62:0D JabilCir Jabil Circuit(Wuxi) Co.,Ltd AC:63:BE AmazonTe Amazon Technologies Inc. -AC:64:17 Siemens- Siemens AG - Industrial Automation - EWA +AC:64:17 Siemens Siemens AG AC:64:62 Zte zte corporation AC:64:DD IeeeRegi IEEE Registration Authority AC:64:DD:00:00:00/28 Jia-Teng @@ -29769,6 +29813,7 @@ AC:87:A3 Apple Apple, Inc. AC:89:95 Azurewav AzureWave Technology Inc. AC:8A:CD RogerDWe ROGER D.Wensker, G.Wensker sp.j. AC:8D:14 Smartrov Smartrove Inc +AC:92:32 HuaweiTe Huawei Technologies Co.,Ltd AC:93:2F Nokia Nokia Corporation AC:94:03 Envision Envision Peripherals Inc AC:9A:22 NxpSemic NXP Semiconductors @@ -30168,6 +30213,7 @@ B4:62:93 SamsungE Samsung Electronics Co.,Ltd B4:62:AD ElysiaGe Elysia Germany GmbH B4:66:98 ZealabsS Zealabs srl B4:67:E9 QingdaoG Qingdao GoerTek Technology Co., Ltd. +B4:69:21 IntelCor Intel Corporate B4:6B:FC IntelCor Intel Corporate B4:6D:35 DalianSe Dalian Seasky Automation Co;Ltd B4:6D:83 IntelCor Intel Corporate @@ -30342,6 +30388,7 @@ B8:63:BC Robotis ROBOTIS, Co, Ltd B8:64:91 CkTeleco CK Telecom Ltd B8:65:3B Bolymin Bolymin, Inc. B8:69:C2 SunitecE Sunitec Enterprise Co., Ltd. +B8:69:F4 Routerbo Routerboard.com B8:6B:23 Toshiba B8:6C:E8 SamsungE Samsung Electronics Co.,Ltd B8:70:F4 CompalIn COMPAL INFORMATION (KUNSHAN) CO., LTD. @@ -30679,6 +30726,7 @@ BC:D9:40 Asr ASR Co,.Ltd. BC:DD:C2 Espressi Espressif Inc. BC:E0:9D Eoslink BC:E1:43 Apple Apple, Inc. +BC:E2:65 HuaweiTe Huawei Technologies Co.,Ltd BC:E5:9F Waterwor WATERWORLD Technology Co.,LTD BC:E6:3F SamsungE Samsung Electronics Co.,Ltd BC:E7:67 Quanzhou Quanzhou TDX Electronics Co., Ltd @@ -30771,6 +30819,11 @@ C0:7E:40 Shenzhen Shenzhen Xdk Communication Equipment Co.,Ltd C0:81:35 NingboFo Ningbo Forfan technology Co., LTD C0:81:70 EffigisG Effigis GeoSolutions C0:83:0A 2wire 2Wire Inc +C0:83:59 IeeeRegi IEEE Registration Authority +C0:83:59:20:00:00/28 HuaxinSm Huaxin SM Optics Co. LTD. +C0:83:59:50:00:00/28 ViperDes Viper Design, LLC +C0:83:59:70:00:00/28 FuzhouFd Fuzhou Fdlinker Technology Co.,LTD +C0:83:59:80:00:00/28 IstaInte ista International GmbH C0:84:7A Apple Apple, Inc. C0:84:88 Finis Finis Inc C0:85:4C Ragentek Ragentek Technology Group @@ -31549,6 +31602,7 @@ D0:12:42 Bios BIOS Corporation D0:13:1E SunrexTe Sunrex Technology Corp D0:13:FD LgElectr LG Electronics (Mobile Communications) D0:15:4A Zte zte corporation +D0:16:B4 HuaweiTe Huawei Technologies Co.,Ltd D0:17:6A SamsungE Samsung Electronics Co.,Ltd D0:17:C2 AsustekC ASUSTek COMPUTER INC. D0:1A:A7 Uniprint @@ -32287,6 +32341,7 @@ DC:82:5B JanusSpo JANUS, spol. s r.o. DC:82:F6 Iport DC:85:DE Azurewav AzureWave Technology Inc. DC:86:D8 Apple Apple, Inc. +DC:8B:28 IntelCor Intel Corporate DC:99:14 HuaweiTe Huawei Technologies Co.,Ltd DC:9A:8E NanjingC Nanjing Cocomm electronics co., LTD DC:9B:1E Intercom Intercom, Inc. diff --git a/services b/services index 232e0996bb..c552d144e6 100644 --- a/services +++ b/services @@ -4333,7 +4333,6 @@ social-alarm 5146/tcp # Social Alarm Service atmp 5150/tcp/udp # Ascend Tunnel Management Protocol esri-sde 5151/tcp/udp # ESRI SDE Instance sde-discovery 5152/tcp/udp # ESRI SDE Instance Discovery -toruxserver 5153/tcp # ToruX Game Server bzflag 5154/tcp/udp # BZFlag game server asctrl-agent 5155/tcp/udp # Oracle asControl Agent rugameonline 5156/tcp # Russian Online Game diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts index 27cc68ab08..0395d76b45 100644 --- a/ui/qt/wireshark_zh_CN.ts +++ b/ui/qt/wireshark_zh_CN.ts @@ -37,7 +37,7 @@ Filter by path - + 按路径过滤 Plugins @@ -45,15 +45,15 @@ No plugins found. - + 未找到插件。 Search Plugins - + 搜索插件 Filter by type: - + 按类型过滤： Keyboard Shortcuts @@ -61,11 +61,11 @@ Search Shortcuts - + 搜索快捷方式 Acknowledgments - + 致谢 License @@ -73,11 +73,11 @@ Copy - 复制 + 复制 Copy Row(s) - + 复制行 @@ -108,11 +108,11 @@ AdvancedPrefsModel Name - 名称 + 名称 Status - 状态 + 状态 Type