diff --git a/AUTHORS b/AUTHORS index c33354374e..b207023430 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4321,6 +4321,7 @@ John A. Thacker John Bankier John Keeping John Miner +John Serock John Tapparo John Viklund Jon DeVree @@ -4561,6 +4562,7 @@ Rainer Keller Ralf Nasilowski Ralph Boehme Ray Gomez +Rediet Remi Gacogne Remous-Aris Koutsiamanis Ricardo Cristian Ramirez diff --git a/NEWS b/NEWS index 5eb3338039..621218c47e 100644 --- a/NEWS +++ b/NEWS @@ -137,7 +137,7 @@ Wireshark 3.1.1 Release Notes A complete FAQ is available on the Wireshark web site[10]. - Last updated 2019-10-27 08:08:19 UTC + Last updated 2019-11-03 08:10:04 UTC References diff --git a/enterprises.tsv b/enterprises.tsv index 371c749bd5..4dac6f5720 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 2019-10-26) +# (last updated 2019-11-02) 0 Reserved 1 NxNetworks @@ -4942,7 +4942,7 @@ 4945 Logicon, Inc. 4946 Psychedelic Illuminations Magazine 4947 Grass Valley USA, LLC -4948 MIGROS +4948 Migros 4949 Fortress Technologies 4950 Luxor Software Inc. 4951 State Farm Insurance @@ -41880,7 +41880,7 @@ 42054 Stadler Bussnang AG 42055 West Lothian Council 42056 MultiToll Solutions SAS -42057 cegedim +42057 Cegedim 42058 Lomnido, s.r.o. 42059 MED2020 Health Care Software Inc. 42060 Egon Braun @@ -52583,7 +52583,7 @@ 52772 Salfer GmbH 52773 Erzurum Teknik Üniversitesi 52774 Computerservice U.Zeysing -52775 Workz Media +52775 Workz Media FZ LLC 52776 Stiftung Mathias-Spital Rheine 52777 Versiant 52778 Allergy and Asthma Associates @@ -54163,7 +54163,7 @@ 54354 The Home Depot Mexico 54355 Badge Inc. 54356 Shandong Huachentel Information Technology Co., Ltd. -54357 Cancon Information Industry Co.,Ltd +54357 Suma Technology Co.，Ltd. 54358 TESCOM corp. 54359 Hillsboro School District 54360 PPMnet AG @@ -54605,3 +54605,33 @@ 54796 Department of Public Instruction - State of Wisconsin 54797 New England Hernia Center LLC 54798 Dalian Neusoft University of Information +54799 SVD Gmbh +54800 Apparent Inc. +54801 County of Kern +54802 Software Colombia S.A.S. +54803 LLC Sphera Telecom +54804 Robot Industries +54805 Moshk co Ltd +54806 spy.de +54807 Truepic, Inc. +54808 NICE +54809 Linkomnia Limited +54810 Mike Bressem +54811 Virgil Security, Inc. +54812 Keramist Ltd +54813 Thales Defense & Security, Inc. +54814 GuaranteeWise Technology Corp. +54815 Model Obaly a.s. +54816 TPC Group, LLC +54817 netUP Pty Ltd +54818 NanoTrix +54819 Confluera, Inc. +54820 Precision Test Systems +54821 EX4 Tech +54822 NewVac, LLC +54823 NeiMengGu Shipeng Technology +54824 Khwahish Technologies private limited +54825 Frimley Health NHS Foundation Trust +54826 Cayonyx, LLC +54827 Noblesse +54828 KCON IT Consulting diff --git a/manuf b/manuf index 1a9d358348..681794125f 100644 --- a/manuf +++ b/manuf @@ -45,23 +45,23 @@ # http://standards-oui.ieee.org/cid/cid.csv: # Content-Length: 7994 -# Last-Modified: Sun, 27 Oct 2019 08:00:37 GMT +# Last-Modified: Sun, 03 Nov 2019 08:00:28 GMT # http://standards-oui.ieee.org/iab/iab.csv: -# Content-Length: 381262 -# Last-Modified: Sun, 27 Oct 2019 08:00:49 GMT +# Content-Length: 381260 +# Last-Modified: Sun, 03 Nov 2019 08:00:40 GMT # http://standards-oui.ieee.org/oui/oui.csv: -# Content-Length: 2432486 -# Last-Modified: Sun, 27 Oct 2019 08:01:20 GMT +# Content-Length: 2435563 +# Last-Modified: Sun, 03 Nov 2019 08:01:11 GMT # http://standards-oui.ieee.org/oui28/mam.csv: -# Content-Length: 302521 -# Last-Modified: Sun, 27 Oct 2019 08:00:56 GMT +# Content-Length: 303318 +# Last-Modified: Sun, 03 Nov 2019 08:00:47 GMT # http://standards-oui.ieee.org/oui36/oui36.csv: -# Content-Length: 312590 -# Last-Modified: Sun, 27 Oct 2019 08:01:13 GMT +# Content-Length: 313479 +# Last-Modified: Sun, 03 Nov 2019 08:01:05 GMT 00:00:00 00:00:00 Officially Xerox, but 0:0:0:0:0:0 is more common 00:00:01 Xerox Xerox Corporation @@ -18648,6 +18648,7 @@ 14:A7:8B Zhejiang Zhejiang Dahua Technology Co., Ltd. 14:A8:6B Shenzhen ShenZhen Telacom Science&Technology Co., Ltd 14:A9:E3 Mst Mst Corporation +14:AB:56 WuxiFuni Wuxi Funide Digital Co.,Ltd 14:AB:C5 IntelCor Intel Corporate 14:AB:F0 ArrisGro ARRIS Group, Inc. 14:AD:CA ChinaMob China Mobile Iot Limited company @@ -20615,6 +20616,7 @@ 30:A8:DB SonyMobi Sony Mobile Communications Inc 30:A9:DE LgInnote LG Innotek 30:AA:BD Shanghai Shanghai Reallytek Information Technology Co.,Ltd +30:AA:E4 HuaweiDe Huawei Device Co., Ltd. 30:AE:7B DeqingDu Deqing Dusun Electron CO., LTD 30:AE:A4 Espressi Espressif Inc. 30:AE:F6 RadioMob Radio Mobile Access @@ -21651,8 +21653,11 @@ 40:2B:A1 SonyMobi Sony Mobile Communications Inc 40:2C:76 IeeeRegi IEEE Registration Authority 40:2C:76:00:00:00/28 Lista Lista AG +40:2C:76:10:00:00/28 Shanghai Shanghai Dahua Scale Factory +40:2C:76:20:00:00/28 Annapurn Annapurna labs 40:2C:76:40:00:00/28 BeijingS Beijing Smarot Technology Co., Ltd. 40:2C:76:50:00:00/28 BaumerBo Baumer Bourdon-Haenni +40:2C:76:60:00:00/28 Guangzho Guangzhou LANGO Electronics Technology Co., Ltd. 40:2C:76:70:00:00/28 Zhejiang Zhejiang Guoli Security Technology Co., Ltd. 40:2C:76:80:00:00/28 SutengIn Suteng Innovation Technology Co., Ltd. 40:2C:76:90:00:00/28 Annapurn Annapurna labs @@ -21660,6 +21665,7 @@ 40:2C:76:B0:00:00/28 BeijingK Beijing Kuaiyu Electronic Co., Ltd. 40:2C:76:C0:00:00/28 Gridx gridX GmbH 40:2C:76:D0:00:00/28 Guangzho Guangzhou Qi'an Technology Co., Ltd. +40:2C:76:E0:00:00/28 LsEnergy LS Energy Solutions 40:2C:F4 Universa Universal Global Scientific Industrial Co., Ltd. 40:2E:28 Mixtelem MiXTelematics 40:30:04 Apple Apple, Inc. @@ -22574,6 +22580,7 @@ 44:C4:A9 OpticomC Opticom Communication, LLC 44:C5:6F NgnEasyS NGN Easy Satfinder (Tianjin) Electronic Co., Ltd 44:C6:9B WuhanFen Wuhan Feng Tian Information Network CO.,LTD +44:C7:FC HuaweiDe Huawei Device Co., Ltd. 44:C8:74 ChinaMob China Mobile Group Device Co.,Ltd. 44:C9:A2 Greenwal Greenwald Industries 44:CB:8B LgInnote LG Innotek @@ -22863,6 +22870,7 @@ 48:E9:F1 Apple Apple, Inc. 48:EA:63 Zhejiang Zhejiang Uniview Technologies Co., Ltd. 48:EB:30 EternaTe Eterna Technology, Inc. +48:EB:62 MurataMa Murata Manufacturing Co., Ltd. 48:EC:5B Nokia 48:ED:80 DaesungE daesung eltec 48:EE:07 SilverPa Silver Palm Technologies LLC @@ -23443,6 +23451,8 @@ 50:DC:FC Ecocom 50:DD:4F Automati Automation Components, Inc 50:DE:06 Apple Apple, Inc. +50:DE:19:70:00:00/28 TianjinN Tianjin Natianal Health Technology Co.,Ltd +50:DE:19:B0:00:00/28 Brainwar Brainware Teraherta Information Technology Co.,Ltd. 50:DF:95 Lytx 50:E0:85 IntelCor Intel Corporate 50:E0:C7 Turcontr TurControlSystme AG @@ -24054,6 +24064,7 @@ 5C:76:95 Technico Technicolor CH USA Inc. 5C:77:57 Haivisio Haivision Network Video 5C:77:76 TctMobil TCT mobile ltd +5C:78:F8 HuaweiDe Huawei Device Co., Ltd. 5C:7D:5E HuaweiTe Huawei Technologies Co.,Ltd 5C:80:B6 IntelCor Intel Corporate 5C:81:A7 NetworkD Network Devices Pty Ltd @@ -24468,6 +24479,7 @@ 64:0F:28 2Wire 2Wire Inc 64:10:84 HexiumTe HEXIUM Technical Development Co., Ltd. 64:12:25 Cisco Cisco Systems, Inc +64:12:36 Technico Technicolor CH USA Inc. 64:12:69 ArrisGro ARRIS Group, Inc. 64:13:31 BoschCar Bosch Car Multimedia (Wuhu) Co. Ltd. 64:13:6C Zte zte corporation @@ -24729,6 +24741,7 @@ 68:1E:8B Infosigh InfoSight Corporation 68:1F:40 BluWirel Blu Wireless Technology Ltd 68:1F:D8 SiemensI Siemens Industry, Inc. +68:21:5F Edgecore Edgecore Networks Corporation 68:23:4B NihonDen Nihon Dengyo Kousaku 68:26:2A SichuanT Sichuan Tianyi Comheart Telecomco., Ltd 68:27:19 Microchi Microchip Technology Inc. @@ -25453,6 +25466,7 @@ 70:B3:D5:05:D0:00/36 Koms KOMS Co.,Ltd. 70:B3:D5:05:E0:00/36 Vitec 70:B3:D5:05:F0:00/36 UnisorMu Unisor Multisystems Ltd +70:B3:D5:06:00:00/36 RchVietn RCH Vietnam Limited Liability Company 70:B3:D5:06:10:00/36 Intellid IntelliDesign Pty Ltd 70:B3:D5:06:20:00/36 RmMichae RM Michaelides Software & Elektronik GmbH 70:B3:D5:06:30:00/36 Pooldigi PoolDigital GmbH & Co. KG @@ -25542,6 +25556,7 @@ 70:B3:D5:0C:00:00/36 MoluTech Molu Technology Inc., LTD. 70:B3:D5:0C:10:00/36 NexusTec Nexus Technologies Pty Ltd 70:B3:D5:0C:20:00/36 LookEasy Look Easy International Limited +70:B3:D5:0C:30:00/36 AugWinkh Aug. Winkhaus GmbH & Co. KG 70:B3:D5:0C:40:00/36 Tiama 70:B3:D5:0C:50:00/36 Precitec Precitec Optronik GmbH 70:B3:D5:0C:60:00/36 Embedded Embedded Arts Co., Ltd. @@ -26018,6 +26033,7 @@ 70:B3:D5:30:30:00/36 FuchuGik Fuchu Giken, Inc. 70:B3:D5:30:40:00/36 Wartsila Wartsila Voyage Limited 70:B3:D5:30:50:00/36 CaitronI CAITRON Industrial Solutions GmbH +70:B3:D5:30:60:00/36 Lemz-TLl Lemz-T, Llc 70:B3:D5:30:70:00/36 EnergiIn Energi innovation Aps 70:B3:D5:30:80:00/36 DsdMicro Dsd Microtechnology,Inc. 70:B3:D5:30:B0:00/36 AshTechn Ash Technologies @@ -26241,6 +26257,7 @@ 70:B3:D5:42:00:00/36 Ecoinet 70:B3:D5:42:10:00/36 NorthSta North Star Bestech Co., 70:B3:D5:42:20:00/36 Sus SUS Corporation +70:B3:D5:42:50:00/36 Sinterca SinterCast 70:B3:D5:42:60:00/36 ZehnderG Zehnder Group Nederland 70:B3:D5:42:70:00/36 KeyChemi Key Chemical & Equipment Company 70:B3:D5:42:80:00/36 Presenta Presentation Switchers, Inc. @@ -26425,6 +26442,7 @@ 70:B3:D5:50:70:00/36 HumanOri Human Oriented Technology, Inc. 70:B3:D5:50:80:00/36 Insevis INSEVIS GmbH 70:B3:D5:50:A0:00/36 AmedtecM AMEDTEC Medizintechnik Aue GmbH +70:B3:D5:50:C0:00/36 Hangzhou Hangzhou landesker digital technology co. LTD 70:B3:D5:50:D0:00/36 Ct CT Company 70:B3:D5:50:E0:00/36 MicroTre Micro Trend Automation Co., LTD 70:B3:D5:51:00:00/36 PslElekt Psl Elektroni̇k Sanayi̇ Ve Ti̇caret A.S. @@ -27128,6 +27146,7 @@ 70:B3:D5:86:C0:00/36 Eeas eeas gmbh 70:B3:D5:86:D0:00/36 CensusDi Census Digital Incorporated 70:B3:D5:86:E0:00/36 Profcon Profcon AB +70:B3:D5:86:F0:00/36 Llc"NtcA Llc "Ntc Actor" 70:B3:D5:87:00:00/36 BentrupI bentrup Industriesteuerungen 70:B3:D5:87:10:00/36 OsoTechn Oso Technologies 70:B3:D5:87:30:00/36 VishayNo Vishay Nobel AB @@ -27191,6 +27210,7 @@ 70:B3:D5:8B:C0:00/36 GsiGeoso GSI GeoSolutions International Ltd 70:B3:D5:8B:E0:00/36 Connoise Connoiseur Electronics Private Limited 70:B3:D5:8B:F0:00/36 Hangzhou Hangzhou Leaper Technology Co. Ltd. +70:B3:D5:8C:00:00/36 Sensenl 70:B3:D5:8C:10:00/36 Rievtech Rievtech Electronic Co.,Ltd 70:B3:D5:8C:20:00/36 F-Domain F-domain corporation 70:B3:D5:8C:30:00/36 Wyebot Wyebot, Inc. @@ -27915,6 +27935,7 @@ 70:B3:D5:C3:70:00/36 Keycom Keycom Corp. 70:B3:D5:C3:80:00/36 Cresprit Cresprit Inc. 70:B3:D5:C3:90:00/36 Meshwork MeshWorks Wireless Oy +70:B3:D5:C3:A0:00/36 HanChang Han Chang 70:B3:D5:C3:B0:00/36 Vironova Vironova AB 70:B3:D5:C3:C0:00/36 PeekTraf Peek Traffic 70:B3:D5:C3:D0:00/36 CistechS CISTECH Solutions @@ -28288,6 +28309,7 @@ 70:B3:D5:E0:70:00/36 BaaderPl Baader Planetarium GmbH 70:B3:D5:E0:80:00/36 Olssen 70:B3:D5:E0:90:00/36 L-3Commu L-3 communications ComCept Division +70:B3:D5:E0:A0:00/36 Acouva Acouva, Inc. 70:B3:D5:E0:B0:00/36 EntecEle ENTEC Electric & Electronic Co., LTD. 70:B3:D5:E0:C0:00/36 Communic Communication Systems Solutions 70:B3:D5:E0:D0:00/36 SigmaCon Sigma Connectivity AB @@ -29197,11 +29219,13 @@ 78:81:8F ServerRa Server Racks Australia Pty Ltd 78:84:3C Sony Sony Corporation 78:84:EE IndraEsp Indra Espacio S.A. +78:85:F4 HuaweiDe Huawei Device Co., Ltd. 78:87:0D Unifiedg Unifiedgateways India Private Limited 78:88:6D Apple Apple, Inc. 78:88:8A CdrSpZOO CDR Sp. z o.o. Sp. k. 78:89:73 Cmc 78:8A:20 Ubiquiti Ubiquiti Networks Inc. +78:8B:2A ZhenShiI Zhen Shi Information Technology (Shanghai) Co., Ltd. 78:8B:77 StandarT Standar Telecom 78:8C:4D IndymeSo Indyme Solutions, LLC 78:8C:54 PingComm Ping Communication @@ -29284,6 +29308,7 @@ 78:C4:0E H&DWirel H&D Wireless 78:C4:AB Shenzhen Shenzhen Runsil Technology Co.,Ltd 78:C5:E5 TexasIns Texas Instruments +78:C5:F8 HuaweiDe Huawei Device Co., Ltd. 78:C6:BB Innovasi Innovasic, Inc. 78:C8:81 SonyInte Sony Interactive Entertainment Inc. 78:CA:04 Nokia Nokia Corporation @@ -30245,6 +30270,7 @@ 84:F4:93 OmsSpolS OMS spol. s.r.o. 84:F6:4C CrossPoi Cross Point BV 84:F6:FA Miovisio Miovision Technologies Incorporated +84:F8:83 LuminarT Luminar Technologies 84:FC:AC Apple Apple, Inc. 84:FC:FE Apple Apple, Inc. 84:FD:D1 IntelCor Intel Corporate @@ -30321,6 +30347,7 @@ 88:53:2E IntelCor Intel Corporate 88:53:95 Apple Apple, Inc. 88:53:D4 HuaweiTe Huawei Technologies Co.,Ltd +88:54:1F Google Google, Inc. 88:57:1D SeongjiI Seongji Industry Company 88:57:6D XtaElect XTA Electronics Ltd 88:57:EE Buffalo Buffalo.Inc @@ -30672,6 +30699,7 @@ 8C:59:73 ZyxelCom Zyxel Communications Corporation 8C:59:8B CTechnol C Technologies AB 8C:59:C3 AdbItali ADB Italia +8C:5A:C1 HuaweiDe Huawei Device Co., Ltd. 8C:5A:F0 Exeltech Exeltech Solar Products 8C:5A:F8 BeijingX Beijing Xiaomi Electronics Co., Ltd. 8C:5B:F0 ArrisGro ARRIS Group, Inc. @@ -30844,6 +30872,7 @@ 90:0A:3A PsgPlast PSG Plastic Service GmbH 90:0B:C1 Sprocomm Sprocomm Technologies CO.,Ltd 90:0C:B4 AlinketE Alinket Electronic Technology Co., Ltd +90:0C:C8 Google Google, Inc. 90:0D:66 Digimore Digimore Electronics Co., Ltd 90:0D:CB ArrisGro ARRIS Group, Inc. 90:0E:83 MonicoMo Monico Monitoring, Inc. @@ -30928,6 +30957,7 @@ 90:51:3F Elettron Elettronica Santerno SpA 90:54:46 TesElect Tes Electronic Solutions 90:55:AE Ericsson Ericsson, EAB/RWI/K +90:55:DE Fiberhom Fiberhome Telecommunication Technologies Co.,LTD 90:56:82 Lenbrook Lenbrook Industries Limited 90:56:92 Autotalk Autotalks Ltd. 90:58:51 Technico Technicolor CH USA Inc. @@ -32420,6 +32450,7 @@ A4:B2:A7 AdaxysSo Adaxys Solutions AG A4:B3:6A JscSdoCh JSC SDO Chromatec A4:B4:39 Cisco Cisco Systems, Inc A4:B5:2E Integrat Integrated Device Technology (Malaysia) Sdn. Bhd. +A4:B6:1E HuaweiDe Huawei Device Co., Ltd. A4:B8:05 Apple Apple, Inc. A4:B8:18 PentaGes PENTA Gesellschaft für elektronische Industriedatenverarbeitung mbH A4:B9:80 ParkingB Parking BOXX Inc. @@ -32594,6 +32625,7 @@ A8:54:B2 WistronN Wistron Neweb Corporation A8:55:6A Pocketne Pocketnet Technology Inc. A8:57:4E Tp-LinkT Tp-Link Technologies Co.,Ltd. A8:58:40 Cambridg Cambridge Industries(Group) Co.,Ltd. +A8:5A:E0 HuaweiDe Huawei Device Co., Ltd. A8:5A:F3 Shanghai Shanghai Siflower Communication Technology Co., Ltd A8:5B:6C RobertBo Robert Bosch Gmbh, CM-CI2 A8:5B:78 Apple Apple, Inc. @@ -32841,6 +32873,7 @@ AC:62:0D JabilCir Jabil Circuit(Wuxi) Co.,Ltd AC:63:BE AmazonTe Amazon Technologies Inc. AC:64:17 Siemens Siemens AG AC:64:62 Zte zte corporation +AC:64:CF Fn-LinkT Fn-Link Technology Limited AC:64:DD IeeeRegi IEEE Registration Authority AC:64:DD:00:00:00/28 Jia-Teng AC:64:DD:10:00:00/28 JscInfot JSC InfoTeCS @@ -33351,6 +33384,7 @@ B4:4B:D6:B0:00:00/28 Dongyoun DongYoung media B4:4B:D6:C0:00:00/28 ImpaktSA Impakt S.A. B4:4B:D6:D0:00:00/28 ElletaSo Elleta Solutions Ltd B4:4B:D6:E0:00:00/28 Chunghsi Chunghsin International Electronics Co.,Ltd. +B4:4C:3B Zhejiang Zhejiang Dahua Technology Co., Ltd. B4:4C:C2 NrElectr Nr Electric Co., Ltd B4:4F:96 Zhejiang Zhejiang Xinzailing Technology co., ltd B4:50:62 Embestor EmBestor Technology Inc. @@ -33554,6 +33588,7 @@ B8:24:F0 SoyoTech SOYO Technology Development Co., Ltd. B8:25:9A ThalmicL Thalmic Labs B8:26:6C AnovFran ANOV France B8:26:D4 Furukawa Furukawa Industrial S.A. Produtos Elétricos +B8:27:C5 HuaweiDe Huawei Device Co., Ltd. B8:27:EB Raspberr Raspberry Pi Foundation B8:28:8B ParkerHa Parker Hannifin Manufacturing (UK) Ltd B8:29:F7 BlasterT Blaster Tech @@ -34516,6 +34551,7 @@ C4:F7:D5 Cisco Cisco Systems, Inc C4:F8:39 ActiaAut Actia Automotive C4:FC:E4 DishtvNz DishTV NZ Ltd C4:FD:E6 Drtech +C4:FE:5B Guangdon Guangdong Oppo Mobile Telecommunications Corp.,Ltd C4:FE:E2 AmiccomE AMICCOM Electronics Corporation C4:FF:1F HuaweiTe Huawei Technologies Co.,Ltd C4:FF:BC IeeeRegi IEEE Registration Authority @@ -35101,6 +35137,7 @@ D0:03:DF SamsungE Samsung Electronics Co.,Ltd D0:04:01 Motorola Motorola Mobility LLC, a Lenovo Company D0:04:92 Fiberhom Fiberhome Telecommunication Technologies Co.,LTD D0:05:2A Arcadyan Arcadyan Corporation +D0:05:E4 HuaweiDe Huawei Device Co., Ltd. D0:07:90 TexasIns Texas Instruments D0:07:CA JuniperN Juniper Networks D0:0A:AB Yokogawa Yokogawa Digital Computer Corporation @@ -35481,6 +35518,7 @@ D4:5C:70 Wi-FiAll Wi-Fi Alliance D4:5D:42 Nokia Nokia Corporation D4:5D:DF Pegatron Pegatron Corporation D4:5F:25 Shenzhen Shenzhen YOUHUA Technology Co., Ltd +D4:60:75 BaiduOnl Baidu Online Network Technology (Beijing) Co., Ltd D4:60:E3 Sercomm Sercomm Corporation. D4:61:2E HuaweiTe Huawei Technologies Co.,Ltd D4:61:32 ProConce Pro Concept Manufacturer Co.,Ltd. @@ -36192,6 +36230,7 @@ E0:27:1A TtcNext- TTC Next-generation Home Network System WG E0:28:61 HuaweiTe Huawei Technologies Co.,Ltd E0:28:6D AvmAudio AVM Audiovisuelles Marketing und Computersysteme GmbH E0:2A:82 Universa Universal Global Scientific Industrial Co., Ltd. +E0:2A:E6 Fiberhom Fiberhome Telecommunication Technologies Co.,LTD E0:2C:B2 LenovoMo Lenovo Mobile Communication (Wuhan) Company Limited E0:2C:F3 MrsElect MRS Electronic GmbH E0:2F:6D Cisco Cisco Systems, Inc @@ -36788,6 +36827,7 @@ E8:89:2C ArrisGro ARRIS Group, Inc. E8:8D:28 Apple Apple, Inc. E8:8D:F5 ZnyxNetw ZNYX Networks, Inc. E8:8E:60 Nsd NSD Corporation +E8:91:0F Fiberhom Fiberhome Telecommunication Technologies Co.,LTD E8:91:20 Motorola Motorola Mobility LLC, a Lenovo Company E8:92:18 Arcontia Arcontia International AB E8:92:A4 LgElectr LG Electronics (Mobile Communications) @@ -36847,6 +36887,7 @@ E8:D1:1B AskeyCom Askey Computer Corp E8:D4:83 Ultimate ULTIMATE Europe Transportation Equipment GmbH E8:D4:E0 BeijingB Beijing BenyWave Technology Co., Ltd. E8:D8:19 Azurewav AzureWave Technology Inc. +E8:D8:D1 Hp HP Inc. E8:DA:96 ZhuhaiTi Zhuhai Tianrui Electrical Power Tech. Co., Ltd. E8:DA:AA Videohom VideoHome Technology Corp. E8:DE:00 Chongqin ChongQing GuanFang Technology Co.,LTD @@ -37216,6 +37257,7 @@ F0:62:81 Procurve ProCurve Networking by HP F0:63:F9 HuaweiTe Huawei Technologies Co.,Ltd F0:65:C2 YanfengV Yanfeng Visteon Electronics Technology (Shanghai) Co.,Ltd. F0:65:DD PrimaxEl Primax Electronics Ltd. +F0:67:28 Guangdon Guangdong Oppo Mobile Telecommunications Corp.,Ltd F0:68:53 Integrat Integrated Corporation F0:68:65 TaicangT Taicang T&W Electronics F0:6B:CA SamsungE Samsung Electronics Co.,Ltd @@ -38059,6 +38101,7 @@ FC:85:96 Axonne Axonne Inc. FC:87:43 HuaweiTe Huawei Technologies Co.,Ltd FC:8B:97 Shenzhen Shenzhen Gongjin Electronics Co.,Lt FC:8E:5B ChinaMob China Mobile Iot Limited company +FC:8E:6E Streamcc StreamCCTV, LLC FC:8E:7E ArrisGro ARRIS Group, Inc. FC:8F:7D Shenzhen Shenzhen Gongjin Electronics Co.,Lt FC:8F:90 SamsungE Samsung Electronics Co.,Ltd diff --git a/services b/services index a2ec8d7379..8aba320c22 100644 --- a/services +++ b/services @@ -996,8 +996,6 @@ sdproxy 1297/tcp/udp lpcp 1298/tcp/udp hp-sci 1299/tcp/udp h323hostcallsc 1300/tcp/udp # H.323 Secure Call Control Signalling -ci3-software-1 1301/tcp/udp # CI3-Software-1 -ci3-software-2 1302/tcp/udp # CI3-Software-2 sftsrv 1303/tcp/udp boomerang 1304/tcp/udp # Boomerang pe-mike 1305/tcp/udp diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts index 2ff4f11610..b63539512a 100644 --- a/ui/qt/wireshark_de.ts +++ b/ui/qt/wireshark_de.ts @@ -1691,27 +1691,27 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe ColumnListModel Displayed - Angezeigt + Angezeigt Title - Titel + Titel Type - Typ + Typ Fields - Feldname + Feldname Field Occurence - + Feldhäufigkeit New Column - + Neue Spalte @@ -1722,41 +1722,19 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe Add a new column - + Neue Spalte hinzufügen Delete selected column - + Ausgewählte Spalte löschen Show displayed columns only - - - - Displayed - Angezeigt - - - Title - Titel - - - Type - Typ - - - Fields - Field Name - Feldname - - - Field Occurrence - Field occurrence - Feldhäufigkeit + Nur aufgelistete Spalten anzeigen Reset all changes - + Alle Änderungen zurücksetzen @@ -2217,6 +2195,10 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe Only Description Nur Beschreibungen + + Only enabled protocols + + any protocol alle Protokolle @@ -2229,6 +2211,10 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe heuristic protocols Protokolle die Heuristik verwenden + + Only disabled protocols + + EnabledProtocolsModel @@ -2694,11 +2680,11 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe Name - Name + Name Filter - Filter + Filter Create a new filter. @@ -2728,7 +2714,7 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe New filter - Neuer Filter + Neuer Filter New capture filter @@ -2807,6 +2793,17 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe Entfernen + + FilterListModel + + Filter Name + + + + Filter Expression + + + FindLineEdit diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts index 4d1610e7c3..715d74c54a 100644 --- a/ui/qt/wireshark_en.ts +++ b/ui/qt/wireshark_en.ts @@ -2190,6 +2190,14 @@ For example, use 1 hour to have a new file created every hour on the hour.Only Description + + Only enabled protocols + + + + Only disabled protocols + + any protocol @@ -2665,14 +2673,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Dialog - - Name - - - - Filter - - Create a new filter. @@ -2699,10 +2699,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Open - - New filter - - New capture filter This text is automatically filled in when a new filter is created @@ -2780,6 +2776,17 @@ For example, use 1 hour to have a new file created every hour on the hour. + + FilterListModel + + Filter Name + + + + Filter Expression + + + FindLineEdit diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts index 9fa86969f3..3fc5c64b9a 100644 --- a/ui/qt/wireshark_fr.ts +++ b/ui/qt/wireshark_fr.ts @@ -1671,7 +1671,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Title - Titre + Type @@ -1708,23 +1708,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Show displayed columns only - - Displayed - Affichés - - - Title - Titre - - - Type - Type - - - Field Occurrence - Field occurrence - Occurrence d'un champ - Reset all changes @@ -2186,6 +2169,10 @@ For example, use 1 hour to have a new file created every hour on the hour.Only Description + + Only enabled protocols + + any protocol @@ -2198,6 +2185,10 @@ For example, use 1 hour to have a new file created every hour on the hour.heuristic protocols + + Only disabled protocols + + EnabledProtocolsModel @@ -2663,11 +2654,11 @@ For example, use 1 hour to have a new file created every hour on the hour. Name - Nom + Nom Filter - Filtre + Filtre Create a new filter. @@ -2697,7 +2688,7 @@ For example, use 1 hour to have a new file created every hour on the hour. New filter - Nouveau filtre + Nouveau filtre New capture filter @@ -2776,6 +2767,17 @@ For example, use 1 hour to have a new file created every hour on the hour. + + FilterListModel + + Filter Name + + + + Filter Expression + + + FindLineEdit @@ -3449,13 +3451,13 @@ For example, use 1 hour to have a new file created every hour on the hour. JPEG File Interchange Format (*.jpeg *.jpg) - Format d'échange de Fichier JPEG (*.jpeg *jpg) + Fichier JPEG (*.jpeg *.jpg) Comma Separated Values (*.csv) @@ -4013,7 +4015,7 @@ For example, use 1 hour to have a new file created every hour on the hour. JPEG File Interchange Format (*.jpeg *.jpg) - Format d'2change de Fichier JPEG + Fichier JPEG (*.jpeg *.jpg) Save Graph As @@ -5410,25 +5412,25 @@ For example, use 1 hour to have a new file created every hour on the hour. - <html><head/><body> + <html><head/><body> <h3>Raccourcis-clavier précieux pour gains de temps surprenants</h3> -<table><tbody> +<table><tbody> <tr><th>+</th><td>Zoom avant</td></th> <tr><th>-</th><td>Zoom arrière</td></th> -<tr><th>0</th><td>Réinitialise le graphique à son état initial</td></th> +<tr><th>0</th><td>Réinitialise le graphique à son état initial</td></th> -<tr><th>→</th><td>Droite 10 pixels</td></th> -<tr><th>←</th><td>Gauche 10 pixels</td></th> -<tr><th>↑</th><td>Haut 10 pixels</td></th> -<tr><th>↓</th><td>Bas 10 pixels</td></th> -<tr><th><i>Shift+</i>→</th><td>Droite 1 pixel</td></th> -<tr><th><i>Shift+</i>←</th><td>Gauche 1 pixel</td></th> -<tr><th><i>Shift+</i>↑</th><td>Haut 1 pixel</td></th> +<tr><th>→</th><td>Droite 10 pixels</td></th> +<tr><th>←</th><td>Gauche 10 pixels</td></th> +<tr><th>↑</th><td>Haut 10 pixels</td></th> +<tr><th>↓</th><td>Bas 10 pixels</td></th> +<tr><th><i>Shift+</i>→</th><td>Droite 1 pixel</td></th> +<tr><th><i>Shift+</i>←</th><td>Gauche 1 pixel</td></th> +<tr><th><i>Shift+</i>↑</th><td>Haut 1 pixel</td></th> <tr><th><i>Shift+</i>↓</th><td>Bas1 pixel</td></th> - <tr><th>g</th><td>Aller (go) au paquet sous le curseur</td></th> + <tr><th>g</th><td>Aller (go) au paquet sous le curseur</td></th> <tr><th>z</th><td>Bascule trainée souris / zoom</td></th> <tr><th>t</th><td>Bascule origine du temps capture / session</td></th> @@ -5703,19 +5705,19 @@ Changer la direction de la connexion (voir le flux inverse).</p></body& Portable Document Format (*.pdf) - Portable Document Format (*.pdf) + Portable Document Format (*.pdf) Portable Network Graphics (*.png) - Portable Network Graphics (*.png) + Portable Network Graphics (*.png) Windows Bitmap (*.bmp) - Windows Bitmap (*.bmp) + Windows Bitmap (*.bmp) JPEG File Interchange Format (*.jpeg *.jpg) - Format d'2change de Fichier JPEG + Fichier JPEG (*.jpeg *.jpg) Save Graph As @@ -10217,7 +10219,7 @@ Changer la direction de la connexion (voir le flux inverse).</p></body& JPEG File Interchange Format (*.jpeg *.jpg) - Format d'2change de Fichier JPEG + Fichier JPEG (*.jpeg *.jpg) Save Graph As @@ -10389,10 +10391,10 @@ Changer la direction de la connexion (voir le flux inverse).</p></body& <tr><th>-</th><td>Zoom arrière</td></th> <tr><th>0</th><td>Réinitialise le graphique à son état initial</td></th> -<tr><th>→</th><td>Droite 10 pixels</td></th> -<tr><th>←</th><td>Gauche 10 pixels</td></th> -<tr><th><i>Shift+</i>→</th><td>Droite 1 pixel</td></th> -<tr><th><i>Shift+</i>←</th><td>Gauche 1 pixel</td></th> +<tr><th>→</th><td>Droite 10 pixels</td></th> +<tr><th>←</th><td>Gauche 10 pixels</td></th> +<tr><th><i>Shift+</i>→</th><td>Droite 1 pixel</td></th> +<tr><th><i>Shift+</i>←</th><td>Gauche 1 pixel</td></th> <tr><th>g</th><td>Aller (go) au paquet sous le curseur</td></th> @@ -11456,7 +11458,7 @@ Changer la direction de la connexion (voir le flux inverse).</p></body& JPEG File Interchange Format (*.jpeg *.jpg) - Format d'2change de Fichier JPEG + Fichier JPEG (*.jpeg *.jpg) Save Graph As @@ -11649,7 +11651,7 @@ Changer la direction de la connexion (voir le flux inverse).</p></body& JPEG File Interchange Format (*.jpeg *.jpg) - Format d'2change de Fichier JPEG + Fichier JPEG (*.jpeg *.jpg) ASCII (*.txt) @@ -12263,13 +12265,13 @@ Changer la direction de la connexion (voir le flux inverse).</p></body& <tr><th>Y</th><td>Zoom arrière axe Y</td></th> <tr><th>0</th><td>Réinitialise le graphique à son état initial</td></th> -<tr><th>→</th><td>Droite 10 pixels</td></th> -<tr><th>←</th><td>Gauche 10 pixels</td></th> -<tr><th>↑</th><td>Haut 10 pixels</td></th> -<tr><th>↓</th><td>Bas 10 pixels</td></th> -<tr><th><i>Maj+</i>→</th><td>Droite 1 pixel</td></th> -<tr><th><i>Maj+</i>←</th><td>Gauche 1 pixel</td></th> -<tr><th><i>Maj+</i>↑</th><td>Haut 1 pixel</td></th> +<tr><th>→</th><td>Droite 10 pixels</td></th> +<tr><th>←</th><td>Gauche 10 pixels</td></th> +<tr><th>↑</th><td>Haut 10 pixels</td></th> +<tr><th>↓</th><td>Bas 10 pixels</td></th> +<tr><th><i>Maj+</i>→</th><td>Droite 1 pixel</td></th> +<tr><th><i>Maj+</i>←</th><td>Gauche 1 pixel</td></th> +<tr><th><i>Maj+</i>↑</th><td>Haut 1 pixel</td></th> <tr><th><i>Maj+</i>↓</th><td>Bas 1 pixel</td></th> </th> @@ -12750,7 +12752,7 @@ Changer la direction de la connexion (voir le flux inverse).</p></body& JPEG File Interchange Format (*.jpeg *.jpg) - Format d'2change de Fichier JPEG + Fichier JPEG (*.jpeg *.jpg) Save Graph As diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts index 44558b134c..f00b1ebfda 100644 --- a/ui/qt/wireshark_it.ts +++ b/ui/qt/wireshark_it.ts @@ -1691,27 +1691,27 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.ColumnListModel Displayed - Visualizzati + Visualizzati Title - Titolo + Titolo Type - Tipo + Tipo Fields - Campi + Campi Field Occurence - + Occorrenza del campo New Column - + Nuova colonna @@ -1722,41 +1722,19 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora. Add a new column - + Aggiungi una nuova colonna Delete selected column - + Elimina colonna selezionata Show displayed columns only - - - - Displayed - Visualizzati - - - Title - Titolo - - - Type - Tipo - - - Fields - Field Name - Campi - - - Field Occurrence - Field occurrence - Occorrenze del campo + Mostra solo le colonne visualizzate Reset all changes - + Ripristina tutte le modifiche @@ -2217,6 +2195,10 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.Only Description Solo descrizione + + Only enabled protocols + + any protocol qualsiasi protocollo @@ -2229,6 +2211,10 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.heuristic protocols protocolli euristici + + Only disabled protocols + + EnabledProtocolsModel @@ -2694,11 +2680,11 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora. Name - Nome + Nome Filter - Filtro + Filtro Create a new filter. @@ -2728,7 +2714,7 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora. New filter - Nuovo filtro + Nuovo filtro New capture filter @@ -2807,6 +2793,17 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.Rimuovi + + FilterListModel + + Filter Name + + + + Filter Expression + + + FindLineEdit diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts index d4bd5e5d67..78a932c3af 100644 --- a/ui/qt/wireshark_ja_JP.ts +++ b/ui/qt/wireshark_ja_JP.ts @@ -1687,7 +1687,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Title - 題名 + Type @@ -1695,7 +1695,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Fields - フィールド名 + Field Occurence @@ -1724,28 +1724,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Show displayed columns only - - Displayed - 表示 - - - Title - 題名 - - - Type - 種別 - - - Fields - Field Name - フィールド名 - - - Field Occurrence - Field occurrence - フィールド出現位置 - Reset all changes @@ -2209,6 +2187,10 @@ For example, use 1 hour to have a new file created every hour on the hour.Only Description + + Only enabled protocols + + any protocol @@ -2221,6 +2203,10 @@ For example, use 1 hour to have a new file created every hour on the hour.heuristic protocols + + Only disabled protocols + + EnabledProtocolsModel @@ -2685,11 +2671,11 @@ For example, use 1 hour to have a new file created every hour on the hour. Name - 名前 + 名前 Filter - フィルタ + フィルタ Create a new filter. @@ -2719,7 +2705,7 @@ For example, use 1 hour to have a new file created every hour on the hour. New filter - 新規フィルタ + 新規フィルタ New capture filter @@ -2798,6 +2784,17 @@ For example, use 1 hour to have a new file created every hour on the hour. + + FilterListModel + + Filter Name + + + + Filter Expression + + + FindLineEdit diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts index ed25fcbfdf..10db8f9d23 100644 --- a/ui/qt/wireshark_pl.ts +++ b/ui/qt/wireshark_pl.ts @@ -1699,7 +1699,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Title - Tytuł + Type @@ -1707,7 +1707,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Fields - Pola + Field Occurence @@ -1736,28 +1736,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Show displayed columns only - - Displayed - Wyświetlane - - - Title - Tytuł - - - Type - Typ - - - Fields - Field Name - Pola - - - Field Occurrence - Field occurrence - Wystąpienie pola - Reset all changes @@ -2221,6 +2199,10 @@ For example, use 1 hour to have a new file created every hour on the hour.Only Description + + Only enabled protocols + + any protocol @@ -2233,6 +2215,10 @@ For example, use 1 hour to have a new file created every hour on the hour.heuristic protocols + + Only disabled protocols + + EnabledProtocolsModel @@ -2699,11 +2685,11 @@ For example, use 1 hour to have a new file created every hour on the hour. Name - Nazwa + Nazwa Filter - Filtr + Filtr Create a new filter. @@ -2733,7 +2719,7 @@ For example, use 1 hour to have a new file created every hour on the hour. New filter - Nowy filtr + Nowy filtr New capture filter @@ -2812,6 +2798,17 @@ For example, use 1 hour to have a new file created every hour on the hour. + + FilterListModel + + Filter Name + + + + Filter Expression + + + FindLineEdit diff --git a/ui/qt/wireshark_ru.ts b/ui/qt/wireshark_ru.ts index 42810d813b..6dbd4c717d 100644 --- a/ui/qt/wireshark_ru.ts +++ b/ui/qt/wireshark_ru.ts @@ -1702,7 +1702,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Title - Заголовок + Type @@ -1710,7 +1710,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Fields - Поля + Field Occurence @@ -1739,28 +1739,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Show displayed columns only - - Displayed - Показано - - - Title - Заголовок - - - Type - Тип - - - Fields - Field Name - Поля - - - Field Occurrence - Field occurrence - Вхождение Поля - Reset all changes @@ -2224,6 +2202,10 @@ For example, use 1 hour to have a new file created every hour on the hour.Only Description + + Only enabled protocols + + any protocol @@ -2236,6 +2218,10 @@ For example, use 1 hour to have a new file created every hour on the hour.heuristic protocols + + Only disabled protocols + + EnabledProtocolsModel @@ -2702,11 +2688,11 @@ For example, use 1 hour to have a new file created every hour on the hour. Name - Имя + Имя Filter - Фильтр + Фильтр Create a new filter. @@ -2736,7 +2722,7 @@ For example, use 1 hour to have a new file created every hour on the hour. New filter - Новый фильтр + Новый фильтр New capture filter @@ -2815,6 +2801,17 @@ For example, use 1 hour to have a new file created every hour on the hour.Удалить + + FilterListModel + + Filter Name + + + + Filter Expression + + + FindLineEdit diff --git a/ui/qt/wireshark_sv.ts b/ui/qt/wireshark_sv.ts index 3d0e4decf4..b92622b892 100644 --- a/ui/qt/wireshark_sv.ts +++ b/ui/qt/wireshark_sv.ts @@ -1695,7 +1695,7 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he Title - Titel + Type @@ -1703,7 +1703,7 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he Fields - Fält + Field Occurence @@ -1732,28 +1732,6 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he Show displayed columns only - - Displayed - Visat - - - Title - Titel - - - Type - Typ - - - Fields - Field Name - Fält - - - Field Occurrence - Field occurrence - Fältförekomst - Reset all changes @@ -2217,6 +2195,10 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he Only Description Endast beskrivning + + Only enabled protocols + + any protocol alla protokoll @@ -2229,6 +2211,10 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he heuristic protocols heuristiska protokoll + + Only disabled protocols + + EnabledProtocolsModel @@ -2694,11 +2680,11 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he Name - Namn + Namn Filter - Filter + Filter Create a new filter. @@ -2728,7 +2714,7 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he New filter - Nytt filter + Nytt filter New capture filter @@ -2807,6 +2793,17 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he Ta bort + + FilterListModel + + Filter Name + + + + Filter Expression + + + FindLineEdit diff --git a/ui/qt/wireshark_uk.ts b/ui/qt/wireshark_uk.ts index 3e476f5af2..86f8b2146b 100644 --- a/ui/qt/wireshark_uk.ts +++ b/ui/qt/wireshark_uk.ts @@ -144,7 +144,7 @@ Type - Тип + Value @@ -1675,11 +1675,11 @@ For example, use 1 hour to have a new file created every hour on the hour. Title - Заголовок + Type - Тип + Fields @@ -1712,23 +1712,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Show displayed columns only - - Displayed - Відображено - - - Title - Заголовок - - - Type - Тип - - - Field Occurrence - Field occurrence - Входження Поля - Reset all changes @@ -1944,7 +1927,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Type - Тип + Default @@ -2190,6 +2173,10 @@ For example, use 1 hour to have a new file created every hour on the hour.Only Description + + Only enabled protocols + + any protocol @@ -2202,6 +2189,10 @@ For example, use 1 hour to have a new file created every hour on the hour.heuristic protocols + + Only disabled protocols + + EnabledProtocolsModel @@ -2257,7 +2248,7 @@ For example, use 1 hour to have a new file created every hour on the hour.EthernetAddressModel Type - Тип + Mac Address @@ -2666,14 +2657,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Dialog - - Name - - - - Filter - - Create a new filter. @@ -2700,10 +2683,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Open - - New filter - - New capture filter This text is automatically filled in when a new filter is created @@ -2781,6 +2760,17 @@ For example, use 1 hour to have a new file created every hour on the hour. + + FilterListModel + + Filter Name + + + + Filter Expression + + + FindLineEdit @@ -8476,7 +8466,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Type - Тип + Path @@ -8515,7 +8505,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Type - Тип + @@ -8892,7 +8882,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Type - Тип + @@ -9298,7 +9288,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Type - Тип + UEId @@ -9724,7 +9714,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Type - Тип + Messages @@ -12096,7 +12086,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Type - Тип + Description @@ -12201,7 +12191,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Type - Тип + MA Window (s) diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts index 829d135ca3..4f0dfc8c8c 100644 --- a/ui/qt/wireshark_zh_CN.ts +++ b/ui/qt/wireshark_zh_CN.ts @@ -1685,7 +1685,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Title - 标题 + Type @@ -1693,7 +1693,7 @@ For example, use 1 hour to have a new file created every hour on the hour. Fields - 字段 + Field Occurence @@ -1722,28 +1722,6 @@ For example, use 1 hour to have a new file created every hour on the hour.Show displayed columns only - - Displayed - 已显示 - - - Title - 标题 - - - Type - 类型 - - - Fields - Field Name - 字段 - - - Field Occurrence - Field occurrence - 字段发生 - Reset all changes @@ -2205,6 +2183,10 @@ For example, use 1 hour to have a new file created every hour on the hour.Only Description + + Only enabled protocols + + any protocol @@ -2217,6 +2199,10 @@ For example, use 1 hour to have a new file created every hour on the hour.heuristic protocols + + Only disabled protocols + + EnabledProtocolsModel @@ -2681,11 +2667,11 @@ For example, use 1 hour to have a new file created every hour on the hour. Name - 名称 + 名称 Filter - 过滤器 + 过滤器 Create a new filter. @@ -2715,7 +2701,7 @@ For example, use 1 hour to have a new file created every hour on the hour. New filter - 新建过滤器 + 新建过滤器 New capture filter @@ -2794,6 +2780,17 @@ For example, use 1 hour to have a new file created every hour on the hour.移除 + + FilterListModel + + Filter Name + + + + Filter Expression + + + FindLineEdit