diff options
| -rw-r--r-- | AUTHORS | 4 | ||||
| -rw-r--r-- | enterprises.tsv | 61 | ||||
| -rw-r--r-- | manuf | 57 | ||||
| -rw-r--r-- | services | 1 | ||||
| -rw-r--r-- | ui/qt/wireshark_de.ts | 30 | ||||
| -rw-r--r-- | ui/qt/wireshark_fr.ts | 18 | ||||
| -rw-r--r-- | ui/qt/wireshark_it.ts | 30 | ||||
| -rw-r--r-- | ui/qt/wireshark_ja_JP.ts | 22 | ||||
| -rw-r--r-- | ui/qt/wireshark_pl.ts | 22 | ||||
| -rw-r--r-- | ui/qt/wireshark_zh_CN.ts | 22 |
10 files changed, 117 insertions, 150 deletions
@@ -4114,6 +4114,7 @@ Dominic Chen <d.c.ddcc[AT]gmail.com> Doug Brown <doug[AT]downtowndougbrown.com> Dr. Lars Voelker <lars.voelker[AT]bmw.de> Ebben Aries <exa[AT]fb.com> +Ed Beroset <beroset[AT]ieee.org> Edward Dao <edmailbox[AT]gmail.com> Edward Smith <edward.smith[AT]nowlegent.com> Edwin Groothuis <edwin[AT]mavetju.org> @@ -4320,6 +4321,7 @@ Moraney Jalil <moraney.jalil[AT]outlook.com> Moshe Kaplan <me[AT]moshekaplan.com> Nathan Cole <nath[AT]thecoleresidence.co.uk> Nathaniel Clark <nathaniel.l.clark[AT]intel.com> +Neil Ostroff <neil[AT]mangosoup.com> Nick Bedbury <npbedbur[AT]syr.edu> Nick Carter <ncarter100[AT]gmail.com> Nick James <mookito[AT]tuta.io> @@ -4355,6 +4357,7 @@ Paul Emge <paul.emge[AT]digidescorp.com> Paul Offord <paul.offord[AT]advance7.com> Paul Thomas <pthomas8589[AT]gmail.com> Paul Williamson <paul[AT]mustbeart.com> +Paul Zander <p.j.zander[AT]lighting.com> Paulo Roberto Brandão <betobrandao[AT]gmail.com> Pavel Karneliuk <pavel_karneliuk[AT]epam.com> Pavel Moravec <mgr.pavel[AT]gmail.com> @@ -4465,6 +4468,7 @@ Ulf <ulf33286[AT]gmail.com> Uli Schlachter <psychon[AT]znc.in> Umberto Corponi <umberto.corponi[AT]athonet.com> Uri Simchoni <urisimchoni[AT]gmail.com> +Valentin Vidic <Valentin.Vidic[AT]CARNet.hr> Vasil Velichckov <vvvelichkov[AT]gmail.com> Victor Barratault <victor.barratault[AT]gmail.com> Victor Dodon <dodonvictor[AT]gmail.com> diff --git a/enterprises.tsv b/enterprises.tsv index 75a8f3fa49..38c1c19f89 100644 --- a/enterprises.tsv +++ b/enterprises.tsv @@ -5,7 +5,7 @@ # The format used here is: <NUMERICAL_ID><SPACE><NAME> # Where SPACE can be any sequence of spaces and tabs. # -# (last updated 2018-02-17) +# (last updated 2018-02-24) 0 Reserved 1 NxNetworks @@ -102,7 +102,7 @@ 92 Webster Computer Corporation 93 Frontier Technologies Corporation 94 Nokia -95 Allen-Bradely Company +95 Rockwell Automation, Inc. # formerly 'Allen-Bradley Company' 96 CERN 97 Sigma Network Systems, Inc. 98 Emerging Technologies, Inc. @@ -29745,7 +29745,7 @@ 29904 abacon products GmbH 29905 Perrit 29906 Dybala -29907 Webmedia AS +29907 Nortal AS 29908 IndigoVision Ltd 29909 Cicero Networks Limited 29910 Open Systems Management Ltd. @@ -30083,7 +30083,7 @@ 30242 Info Consultoria e Informatica Ltda. 30243 network.co.at GmbH 30244 Dazzle -30245 The Washington Post Company +30245 Graham Holdings Company 30246 Diventus GmbH 30247 Coopers Peele (France) SARL 30248 Webkuteer @@ -35614,7 +35614,7 @@ 35781 Matej Bel University Banska Bystrica 35782 Universidad de Extremadura 35783 Nika Ltd -35784 ECKD GmbH +35784 ECKD Service GmbH 35785 Xcira, Inc. 35786 Continuant Inc 35787 Computaris @@ -51266,3 +51266,54 @@ 51450 Nokia 51451 Beijing mission communication co.,Ltd 51452 Evolution Travel Network +51453 Lekkerland information systems GmbH +51454 Pionica Poland +51455 Ministry of Foreign Affairs of Estonia +51456 Dedon Inc +51457 Linkedin +51458 Empower Psychiatry & Sleep LLC +51459 DataEngrave S.L. +51460 ALEXIUS M BISHOP, MD PSC +51461 DIESEL-NETWORKS.COM +51462 Saudi Aramco +51463 Ortana Electronics Software Inc. +51464 Zehetner-Elektronik GmbH +51465 Synvina +51466 Avantium +51467 Chrisse Corporation +51468 Vertis Solutions +51469 CARDIOLOGY ASSOCIATES, INC. +51470 Hole kommune +51471 DR. WILLIAM STRAZZELLA +51472 Arkessa +51473 thyssenkrupp System Engineering GmbH +51474 Crayon Group AS +51475 tlacuache.us +51476 Rega +51477 XZS +51478 ITW Food Equipment Group +51479 VeChain +51480 Ace Supply Company, Inc. +51481 Curve Dental +51482 R2H Flavor Technology, LLC +51483 CTIA +51484 Exonar Ltd +51485 mm-lab GmbH +51486 Revi Comp. Network Technologies +51487 UnicusID, Inc. +51488 Netnod Internet Exchange i Sverige AB +51489 SliceOne +51490 Ashfords LLP +51491 SCRT SA +51492 SuitePad GmbH +51493 Smart Flows +51494 Alan N Yager MD +51495 Real-World-Systems, Inc. +51496 CC-Link Partner Association +51497 ChatVoice Corporation +51498 KeeeX SAS +51499 FLEXXIBLE INFORMATION TECHNOLOGY SL +51500 Milwaukee Foot and Ankle Specialists +51501 Nebraska Foot & Ankle, P.C. +51502 Cludo +51503 ARS Traffic & Transport Technology @@ -3484,7 +3484,7 @@ 00:0D:7F MidasCom MIDAS COMMUNICATION TECHNOLOGIES PTE LTD ( Foreign Branch) 00:0D:80 OnlineDe Online Development Inc 00:0D:81 Pepperl+ Pepperl+Fuchs GmbH -00:0D:82 PhsSrl PHS srl +00:0D:82 PhsnetSr Phsnet Srls 00:0D:83 Sanmina- Sanmina-SCI Hungary Ltd. 00:0D:84 Makus Makus Inc. 00:0D:85 Tapwave Tapwave, Inc. @@ -4408,7 +4408,7 @@ 00:11:1B TargaDiv Targa Systems Div L-3 Communications 00:11:1C PleoraTe Pleora Technologies Inc. 00:11:1D Hectrix Hectrix Limited -00:11:1E EpsgEthe EPSG (Ethernet Powerlink Standardization Group) +00:11:1E Ethernet ETHERNET Powerlink Standarization Group (EPSG) 00:11:1F DoremiLa Doremi Labs, Inc. 00:11:20 Cisco Cisco Systems, Inc 00:11:21 Cisco Cisco Systems, Inc @@ -5260,7 +5260,7 @@ 00:14:6F Kohler Kohler Co 00:14:70 ProkomSo Prokom Software SA 00:14:71 EasternA Eastern Asia Technology Limited -00:14:72 ChinaBro China Broadband Wireless IP Standard Group +00:14:72 ChinaBro China Broadband Wireless IP Standard group(ChinaBWIPS) 00:14:73 Bookham Bookham Inc 00:14:74 K40Elect K40 Electronics 00:14:75 WilineNe Wiline Networks, Inc. @@ -5432,7 +5432,7 @@ 00:15:1B Isilon Isilon Systems Inc. 00:15:1C Leneco 00:15:1D M2i M2I CORPORATION -00:15:1E Ethernet Ethernet Powerlink Standardization Group (EPSG) +00:15:1E Ethernet ETHERNET Powerlink Standarization Group (EPSG) 00:15:1F Multivis Multivision Intelligent Surveillance (Hong Kong) Ltd 00:15:20 Radiocra Radiocrafts AS 00:15:21 Horoquar Horoquartz @@ -10136,7 +10136,7 @@ 00:26:BA ArrisGro ARRIS Group, Inc. 00:26:BB Apple Apple, Inc. 00:26:BC GeneralJ General Jack Technology Ltd. -00:26:BD JtecCard JTEC Card & Communication Co., Ltd. +00:26:BD JtecCard JTEC Card & Communication Co., Ltd 00:26:BE Schoonde Schoonderbeek Elektronica Systemen B.V. 00:26:BF Shenzhen ShenZhen Temobi Science&Tech Development Co.,Ltd 00:26:C0 Energyhu EnergyHub @@ -11459,7 +11459,7 @@ 00:50:C2:1D:50:00/36 Redpoint Redpoint Controls 00:50:C2:1D:60:00/36 Shanghai shanghai trend intelligent systems CO.,LTD 00:50:C2:1D:70:00/36 PleoraTe Pleora Technologies Inc. -00:50:C2:1D:80:00/36 Guardian Guardian Controls International +00:50:C2:1D:80:00/36 Guardian Guardian Controls International Ltd 00:50:C2:1D:90:00/36 Edc 00:50:C2:1D:A0:00/36 GfiChron GFI Chrono Time 00:50:C2:1D:B0:00/36 AppliedE Applied Systems Engineering, Inc. @@ -11725,7 +11725,7 @@ 00:50:C2:2D:F0:00/36 Micrel-N MICREL-NKE 00:50:C2:2E:00:00/36 BaxterIn Baxter International Inc 00:50:C2:2E:10:00/36 AccessIs Access IS -00:50:C2:2E:20:00/36 BallardT Ballard Technology, Inc. +00:50:C2:2E:20:00/36 BallardT Ballard Technology, Inc, 00:50:C2:2E:30:00/36 MgIndust MG Industrieelektronik GmbH 00:50:C2:2E:40:00/36 Iamba iamba LTD. 00:50:C2:2E:50:00/36 Transtec Transtech DSP @@ -12094,7 +12094,7 @@ 00:50:C2:45:00:00/36 Enconair Enconair Ecological Chambers Inc. 00:50:C2:45:10:00/36 Hameg HAMEG GmbH 00:50:C2:45:20:00/36 ScameSis SCAME SISTEMI s.r.l. -00:50:C2:45:30:00/36 Erhardt+ Erhardt + Leimer GmbH +00:50:C2:45:30:00/36 Erhardt+ Erhardt+Leimer GmbH 00:50:C2:45:40:00/36 BrivoLlc Brivo Systems, LLC 00:50:C2:45:50:00/36 GogoBa Gogo BA 00:50:C2:45:60:00/36 DrdcValc DRDC Valcartier @@ -13329,7 +13329,7 @@ 00:50:C2:92:30:00/36 AmicusWi Amicus Wireless 00:50:C2:92:40:00/36 LinkElec Link Electric & Safety Control Co. 00:50:C2:92:50:00/36 PhbEletr PHB Eletronica Ltda. -00:50:C2:92:60:00/36 DitestFa Ditest Fahrzeugdiagnose Gmbh +00:50:C2:92:60:00/36 DitestFa DiTEST Fahrzeugdiagnose GmbH 00:50:C2:92:70:00/36 AtisGrou ATIS group s.r.o. 00:50:C2:92:80:00/36 Cinetix Cinetix GmbH 00:50:C2:92:90:00/36 FlightDe Flight Deck Resources @@ -14321,7 +14321,7 @@ 00:50:C2:D0:60:00/36 NckResea nCk Research LLC 00:50:C2:D0:70:00/36 Iaf IAF GmbH 00:50:C2:D0:80:00/36 Reimesch Reimesch Kommunikationssysteme GmbH -00:50:C2:D0:90:00/36 Guardtec Guardtec, Inc. +00:50:C2:D0:90:00/36 Guardtec Guardtec,Inc 00:50:C2:D0:A0:00/36 Airpoint Airpoint Co., Ltd. 00:50:C2:D0:B0:00/36 CodacoEl CODACO ELECTRONIC s.r.o. 00:50:C2:D0:C0:00/36 JvlIndus JVL Industri Elektronik @@ -15062,7 +15062,7 @@ 00:50:C2:FE:E0:00/36 SparksIn Sparks Instruments SA 00:50:C2:FE:F0:00/36 TaskSist Task Sistemas de Computacao 00:50:C2:FF:00:00/36 GdMissio GD Mission Systems -00:50:C2:FF:10:00/36 DitestFa DiTEST FAHRZEUGDIAGNOSE GMBH +00:50:C2:FF:10:00/36 DitestFa DiTEST Fahrzeugdiagnose GmbH 00:50:C2:FF:20:00/36 Globalco Globalcom Engineering Srl 00:50:C2:FF:30:00/36 ControlS CONTROL SYSTEMS Srl 00:50:C2:FF:40:00/36 BurkTech Burk Technology @@ -15863,7 +15863,7 @@ 00:90:7C Digitalc Digitalcast, Inc. 00:90:7D LakeComm Lake Communications 00:90:7E Vetronix Vetronix Corp. -00:90:7F Watchgua WatchGuard Technologies, Inc. +00:90:7F Watchgua Watchguard Technologies, Inc. 00:90:80 Not Not Limited, Inc. 00:90:81 AlohaNet Aloha Networks, Inc. 00:90:82 ForceIns Force Institute @@ -17346,6 +17346,7 @@ 04:A3:16 TexasIns Texas Instruments 04:A3:F3 Emicon 04:A8:2A Nokia Nokia Corporation +04:AB:18 Elecom Elecom Co.,Ltd. 04:AC:44 HoltekSe Holtek Semiconductor Inc. 04:B0:E7 HuaweiTe Huawei Technologies Co.,Ltd 04:B1:67 XiaomiCo Xiaomi Communications Co Ltd @@ -18985,6 +18986,7 @@ 20:9B:CD Apple Apple, Inc. 20:A2:E4 Apple Apple, Inc. 20:A2:E7 Lee-Dick Lee-Dickens Ltd +20:A6:0C XiaomiCo Xiaomi Communications Co Ltd 20:A6:80 HuaweiTe Huawei Technologies Co.,Ltd 20:A6:CD HewlettP Hewlett Packard Enterprise 20:A7:83 Micontro miControl GmbH @@ -19594,15 +19596,20 @@ 2C:44:01 SamsungE Samsung Electronics Co.,Ltd 2C:44:1B Spectrum Spectrum Medical Limited 2C:44:FD HewlettP Hewlett Packard +2C:47:59 BeijingM Beijing MEGA preponderance Science & Technology Co. Ltd 2C:48:35 IeeeRegi IEEE Registration Authority +2C:48:35:00:00:00/28 Progress Progress Rail Services, Inspection and Information Systems 2C:48:35:10:00:00/28 Advanced Advanced Electronics Company Ltd +2C:48:35:20:00:00/28 RheonikM Rheonik Messtechnik GmbH 2C:48:35:30:00:00/28 NewtraxT Newtrax Technologies Inc 2C:48:35:40:00:00/28 Geartech Geartech Ltd 2C:48:35:60:00:00/28 ExertusO Exertus Oy +2C:48:35:70:00:00/28 Fast 2C:48:35:80:00:00/28 DpsElect DPS Electronics 2C:48:35:90:00:00/28 Sureflap SureFlap Ltd 2C:48:35:A0:00:00/28 Collatz+ Collatz+Trojan GmbH 2C:48:35:B0:00:00/28 Shanghai Shanghai Visteon Automotive Electronics System CO. Ltd. +2C:48:35:C0:00:00/28 Santec Santec Corporation 2C:48:35:D0:00:00/28 PhasorSo Phasor Solutions Ltd 2C:4D:54 AsustekC ASUSTek COMPUTER INC. 2C:4D:79 WeifangG Weifang Goertek Electronics Co.,Ltd @@ -21810,7 +21817,7 @@ 4C:0B:BE Microsof Microsoft 4C:0D:EE JabilCir JABIL CIRCUIT (SHANGHAI) LTD. 4C:0F:6E HonHaiPr Hon Hai Precision Ind. Co.,Ltd. -4C:0F:C7 EardaEle Earda Electronics Co.,Ltd +4C:0F:C7 EardaTec Earda Technologies co Ltd 4C:11:BF Zhejiang Zhejiang Dahua Technology Co., Ltd. 4C:13:65 EmplusTe Emplus Technologies 4C:14:80 Noregon Noregon Systems, Inc @@ -22083,11 +22090,13 @@ 50:57:A8 Cisco Cisco Systems, Inc 50:58:00 WytecInt WyTec International, Inc. 50:58:4F Waytotec waytotec,Inc. +50:59:67 IntentSo Intent Solutions Inc 50:5A:C6 Guangdon Guangdong Super Telecom Co.,Ltd. 50:5B:C2 LiteonTe Liteon Technology Corporation 50:5D:AC HuaweiTe Huawei Technologies Co.,Ltd 50:60:28 Xirrus Xirrus Inc. 50:61:84 Avaya Avaya Inc +50:61:BF Cisco Cisco Systems, Inc 50:61:D6 Indu-Sol Indu-Sol GmbH 50:63:13 HonHaiPr Hon Hai Precision Ind. Co.,Ltd. 50:64:2B XiaomiEl XIAOMI Electronics,CO.,LTD @@ -22836,6 +22845,7 @@ 60:03:08 Apple Apple, Inc. 60:03:47 BillionE Billion Electric Co. Ltd. 60:04:17 Posbank Posbank Co.,Ltd +60:05:8A HitachiM Hitachi Metals, Ltd. 60:08:10 HuaweiTe Huawei Technologies Co.,Ltd 60:08:37 IvviScie ivvi Scientific(Nanchang)Co.Ltd 60:0B:03 Hangzhou Hangzhou H3C Technologies Co., Limited @@ -23610,6 +23620,7 @@ 70:05:14 LgElectr LG Electronics (Mobile Communications) 70:06:AC Eastcomp Eastcompeace Technology Co., Ltd 70:0B:C0 DewavTec Dewav Technology Company +70:0F:6A Cisco Cisco Systems, Inc 70:0F:C7 Shenzhen Shenzhen Ikinloop Technology Co.,Ltd. 70:0F:EC Poindus Poindus Systems Corp. 70:10:5C Cisco Cisco Systems, Inc @@ -23673,6 +23684,7 @@ 70:50:AF Bskyb BSkyB Ltd 70:52:C5 Avaya Avaya Inc 70:53:3F AlfaInst Alfa Instrumentos Eletronicos Ltda. +70:54:B4 VestelEl Vestel Elektronik San ve Tic. A.Ş. 70:54:D2 Pegatron Pegatron Corporation 70:54:F5 HuaweiTe Huawei Technologies Co.,Ltd 70:55:F8 Cerebras Cerebras Systems Inc @@ -23783,6 +23795,7 @@ 70:B3:D5:00:20:00/36 GogoBa Gogo BA 70:B3:D5:00:70:00/36 Sensoneo 70:B3:D5:00:90:00/36 Holidayc HolidayCoro +70:B3:D5:00:A0:00/36 Fujicom FUJICOM Co.,Ltd. 70:B3:D5:00:D0:00/36 Scrona Scrona AG 70:B3:D5:00:E0:00/36 Magosys Magosys Systems LTD 70:B3:D5:01:00:00/36 HanwaEle Hanwa Electronic Ind.Co.,Ltd. @@ -23833,6 +23846,7 @@ 70:B3:D5:05:90:00/36 Pro-Digi Pro-Digital Projetos Eletronicos Ltda 70:B3:D5:05:A0:00/36 UniContr Uni Control System Sp. z o. o. 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:10:00/36 Intellid IntelliDesign Pty Ltd 70:B3:D5:06:20:00/36 RmMichae RM Michaelides Software & Elektronik GmbH @@ -23903,6 +23917,7 @@ 70:B3:D5:0C:80:00/36 FinRobot Fin Robotics Inc 70:B3:D5:0C:D0:00/36 AmlOcean AML Oceanographic 70:B3:D5:0C:E0:00/36 Innomind Innominds Software Inc +70:B3:D5:0D:10:00/36 CommonSe Common Sense Monitoring Solutions Ltd. 70:B3:D5:0D:20:00/36 Unmanned Unmanned Spa 70:B3:D5:0D:30:00/36 TsatAs Tsat As 70:B3:D5:0D:40:00/36 Guangzho Guangzhou Male Industrial Animation Technology Co.,Ltd. @@ -23936,7 +23951,7 @@ 70:B3:D5:10:40:00/36 PlumSpZO Plum sp. z o.o 70:B3:D5:10:60:00/36 AplexTec Aplex Technology Inc. 70:B3:D5:10:80:00/36 TexCompu Tex Computer Srl -70:B3:D5:10:90:00/36 DitestFa Ditest Fahrzeugdiagnose Gmbh +70:B3:D5:10:90:00/36 DitestFa DiTEST Fahrzeugdiagnose GmbH 70:B3:D5:10:A0:00/36 SeasonDe Season Design Technology 70:B3:D5:10:C0:00/36 Vocality Vocality International Ltd 70:B3:D5:10:E0:00/36 Colorime Colorimetry Research, Inc @@ -24033,6 +24048,7 @@ 70:B3:D5:19:B0:00/36 GlobalTe Global Technical Systems 70:B3:D5:19:C0:00/36 Kubu Kubu, Inc. 70:B3:D5:19:E0:00/36 J-Factor J-Factor Embedded Technologies +70:B3:D5:19:F0:00/36 KoizumiL Koizumi Lighting Technology Corp. 70:B3:D5:1A:00:00/36 Ufatech Ufatech Ltd 70:B3:D5:1A:10:00/36 Hmicro HMicro Inc 70:B3:D5:1A:30:00/36 Telairit Telairity Semiconductor @@ -24168,6 +24184,7 @@ 70:B3:D5:28:D0:00/36 Technica Technica Engineering GmbH 70:B3:D5:28:E0:00/36 TexCompu Tex Computer Srl 70:B3:D5:28:F0:00/36 Overline Overline Systems +70:B3:D5:29:20:00/36 Private 70:B3:D5:29:50:00/36 CelloEle Cello Electronics (UK) Ltd 70:B3:D5:29:60:00/36 Rohde&Sc Rohde&Schwarz Topex SA 70:B3:D5:29:70:00/36 Grossenb Grossenbacher Systeme AG @@ -24311,6 +24328,7 @@ 70:B3:D5:37:D0:00/36 DxShop The DX Shop Limited 70:B3:D5:37:F0:00/36 IdsInnom IDS Innomic GmbH 70:B3:D5:38:10:00/36 Crde +70:B3:D5:38:20:00/36 NavalGro Naval Group 70:B3:D5:38:30:00/36 LpaExcil LPA Excil Electronics 70:B3:D5:38:40:00/36 Sensohiv Sensohive Technologies 70:B3:D5:38:70:00/36 GwfMesss GWF MessSysteme AG @@ -24436,6 +24454,7 @@ 70:B3:D5:47:20:00/36 QuadioDe Quadio Devices Private Limited 70:B3:D5:47:50:00/36 Ewattch 70:B3:D5:47:60:00/36 Fr-TeamI FR-Team International SA +70:B3:D5:47:80:00/36 Touchnet Touchnet/OneCard 70:B3:D5:47:90:00/36 LineageP Lineage Power Pvt Ltd., 70:B3:D5:47:C0:00/36 Par-Tech Par-Tech, Inc. 70:B3:D5:47:F0:00/36 Ase ASE GmbH @@ -25162,6 +25181,7 @@ 70:B3:D5:95:E0:00/36 BlocksiL Blocksi Llc 70:B3:D5:96:30:00/36 Triax Triax A/S 70:B3:D5:96:70:00/36 TattileS Tattile Srl +70:B3:D5:96:80:00/36 LgmIngén LGM Ingénierie 70:B3:D5:96:90:00/36 EmtelSys Emtel System Sp. z o.o. 70:B3:D5:96:B0:00/36 Focal-Jm FOCAL-JMLab 70:B3:D5:96:D0:00/36 MsbElekt MSB Elektronik und Gerätebau GmbH @@ -25325,6 +25345,7 @@ 70:B3:D5:A8:20:00/36 Telefran Telefrank GmbH 70:B3:D5:A8:50:00/36 ExceetEl exceet electronics GesmbH 70:B3:D5:A8:60:00/36 Divigrap Divigraph (Pty) LTD +70:B3:D5:A8:70:00/36 TornadoM Tornado Modular Systems 70:B3:D5:A8:80:00/36 Shangdon Shangdong Bosure Automation Technology Ltd 70:B3:D5:A8:90:00/36 GbsCommu Gbs Communications, Llc 70:B3:D5:A8:B0:00/36 GiantPow Giant Power Technology Biomedical Corporation @@ -25751,6 +25772,7 @@ 70:B3:D5:D7:90:00/36 GomaElet GOMA ELETTRONICA SpA 70:B3:D5:D7:A0:00/36 Speedifi Speedifi Inc 70:B3:D5:D7:B0:00/36 PeterHub Peter Huber Kaeltemaschinenbau AG +70:B3:D5:D7:C0:00/36 DTSIllum D.T.S Illuminazione Srl 70:B3:D5:D7:E0:00/36 Triax Triax A/S 70:B3:D5:D7:F0:00/36 Conectai ConectaIP Tecnologia S.L. 70:B3:D5:D8:00:00/36 Ammt AMMT GmbH @@ -26329,6 +26351,7 @@ 74:B0:0C NetworkV Network Video Technologies, Inc 74:B4:72 Ciesse 74:B5:7E Zte zte corporation +74:B9:1E NanjingB Nanjing Bestway Automation System Co., Ltd 74:B9:EB Jinqianm JinQianMao Technology Co.,Ltd. 74:BA:DB Longconn Longconn Electornics(shenzhen)Co.,Ltd 74:BB:D3 Shenzhen Shenzhen xeme Communication Co., Ltd. @@ -26419,7 +26442,7 @@ 74:F8:DB:70:00:00/28 WuhanTia Wuhan Tianyu Information Industry Co., Ltd. 74:F8:DB:80:00:00/28 SongamSy Songam Syscom Co. LTD. 74:F8:DB:90:00:00/28 Avantree Avantree Corporation -74:F8:DB:A0:00:00/28 BallardT Ballard Technology Inc. +74:F8:DB:A0:00:00/28 BallardT Ballard Technology, Inc, 74:F8:DB:B0:00:00/28 CapwaveT Capwave Technologies Inc 74:F8:DB:C0:00:00/28 Tbm Tbm Co., Ltd. 74:F8:DB:D0:00:00/28 SimonEle Simon Electric (China) Co.,ltd @@ -30227,6 +30250,7 @@ BC:1A:67 YfTechno YF Technology Co., Ltd BC:1C:81 SichuanI Sichuan iLink Technology Co., Ltd. BC:20:A4 SamsungE Samsung Electronics Co.,Ltd BC:20:BA InspurSh Inspur (Shandong) Electronic Information Co., Ltd +BC:22:FB RfIndust RF Industries BC:25:E0 HuaweiTe Huawei Technologies Co.,Ltd BC:25:F0 3dDispla 3D Display Technologies Co., Ltd. BC:26:1D HongKong Hong Kong Tecon Technology @@ -31423,6 +31447,7 @@ D0:C1:B1 SamsungE Samsung Electronics Co.,Ltd D0:C2:82 Cisco Cisco Systems, Inc D0:C4:2F Tamagawa Tamagawa Seiki Co.,Ltd. D0:C5:D3 Azurewav AzureWave Technology Inc. +D0:C5:D8 Latecoer Latecoere D0:C5:F3 Apple Apple, Inc. D0:C7:89 Cisco Cisco Systems, Inc D0:C7:C0 Tp-LinkT TP-LINK TECHNOLOGIES CO.,LTD. @@ -31694,6 +31719,7 @@ D8:1E:DE B&WGroup B&W Group Ltd D8:1F:CC BrocadeC Brocade Communications Systems, Inc. D8:20:9F CubroAcr Cubro Acronet GesmbH D8:22:F4 AvnetSil Avnet Silica +D8:24:77 Universa Universal Electric Corporation D8:24:BD Cisco Cisco Systems, Inc D8:25:22 ArrisGro ARRIS Group, Inc. D8:25:B0 Rockeete Rockeetech Systems Co.,Ltd. @@ -32036,6 +32062,7 @@ DC:DD:24 Energica Energica Motor Company SpA DC:DE:4F GioneeCo Gionee Communication Equipment Co Ltd DC:DE:CA Akyllor DC:E0:26 PatrolTa Patrol Tag, Inc +DC:E0:EB NanjingA Nanjing Aozheng Information Technology Co.Ltd DC:E1:AD Shenzhen Shenzhen Wintop Photoelectric Technology Co., Ltd DC:E2:AC LumensDi Lumens Digital Optics Inc. DC:E5:33 IeeeRegi IEEE Registration Authority @@ -4937,6 +4937,7 @@ ctdp 7022/tcp/udp # CT Discovery Protocol ct2nmcs 7023/tcp/udp # Comtech T2 NMCS vmsvc 7024/tcp/udp # Vormetric service vmsvc-2 7025/tcp/udp # Vormetric Service II +loreji-panel 7026/tcp # Loreji Webhosting Panel op-probe 7030/tcp/udp # ObjectPlanet probe iposplanet 7031/tcp # IPOSPLANET retailing multi devices protocol quest-disc 7040/udp # Quest application level network service discovery diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts index 836d396a22..eb9869cafc 100644 --- a/ui/qt/wireshark_de.ts +++ b/ui/qt/wireshark_de.ts @@ -1457,7 +1457,7 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation> <name>ColoringRulesDelegate</name> <message> <source>the "@" symbol will be ignored.</source> - <translation type="unfinished">das "@" Symbol wird ignoriert.</translation> + <translation>das "@" Symbol wird ignoriert.</translation> </message> </context> <context> @@ -1467,14 +1467,6 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation> <translation>Dialog</translation> </message> <message> - <source>Name</source> - <translation type="vanished">Name</translation> - </message> - <message> - <source>Filter</source> - <translation type="vanished">Filter</translation> - </message> - <message> <source><small><i>A hint.</i></small></source> <translation><small><i>Hinweis</i></small></translation> </message> @@ -1515,10 +1507,6 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation> <translation>Als Filter anwenden</translation> </message> <message> - <source>Coloring Rules</source> - <translation type="vanished">Einfärbungsregeln</translation> - </message> - <message> <source>Import</source> <translation>Importieren</translation> </message> @@ -1535,12 +1523,8 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation> <translation>Filter in eine Datei sichern.</translation> </message> <message> - <source>the "@" symbol will be ignored.</source> - <translation type="vanished">das "@" Symbol wird ignoriert.</translation> - </message> - <message> <source>Coloring Rules %1</source> - <translation type="unfinished"></translation> + <translation>Einfärbungsregeln %1</translation> </message> <message> <source>Double click to edit. Drag to move. Rules are processed in order until a match is found.</source> @@ -1562,24 +1546,20 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation> <source>Wireshark doesn't recognize one or more of your coloring rules. They have been disabled.</source> <translation>Wireshark erkennt eine oder mehrere der Einfärbungsregeln nicht. Diese wurden deaktiviert.</translation> </message> - <message> - <source>Unable to save coloring rules: %s</source> - <translation type="vanished">Einfärbungsregeln können nicht gespeichert werden: %s</translation> - </message> </context> <context> <name>ColoringRulesModel</name> <message> <source>Unable to save coloring rules: %1</source> - <translation type="unfinished"></translation> + <translation>Einfärbungsregeln können nicht gespeichert werden: %1</translation> </message> <message> <source>Name</source> - <translation type="unfinished">Name</translation> + <translation>Name</translation> </message> <message> <source>Filter</source> - <translation type="unfinished">Filter</translation> + <translation>Filter</translation> </message> </context> <context> diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts index cf0ecfe385..d049f0007e 100644 --- a/ui/qt/wireshark_fr.ts +++ b/ui/qt/wireshark_fr.ts @@ -1434,7 +1434,7 @@ NOTE: Une option DOIT être sélectionnée.</translation> <name>ColoringRulesDelegate</name> <message> <source>the "@" symbol will be ignored.</source> - <translation type="unfinished">le caractère "@" sera ignoré.</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -1444,14 +1444,6 @@ NOTE: Une option DOIT être sélectionnée.</translation> <translation>Dialogue</translation> </message> <message> - <source>Name</source> - <translation type="vanished">Nom</translation> - </message> - <message> - <source>Filter</source> - <translation type="vanished">Filtre</translation> - </message> - <message> <source><small><i>A hint.</i></small></source> <translation><small><i>Un indice.</i></small></translation> </message> @@ -1492,10 +1484,6 @@ NOTE: Une option DOIT être sélectionnée.</translation> <translation type="unfinished"></translation> </message> <message> - <source>Coloring Rules</source> - <translation type="vanished">Règles de coloration</translation> - </message> - <message> <source>Import</source> <translation>Importer</translation> </message> @@ -1512,10 +1500,6 @@ NOTE: Une option DOIT être sélectionnée.</translation> <translation>Sauvegarder les filtres dans un fichier.</translation> </message> <message> - <source>the "@" symbol will be ignored.</source> - <translation type="vanished">le caractère "@" sera ignoré.</translation> - </message> - <message> <source>Coloring Rules %1</source> <translation type="unfinished"></translation> </message> diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts index c5f8e745e4..e46284210f 100644 --- a/ui/qt/wireshark_it.ts +++ b/ui/qt/wireshark_it.ts @@ -1457,7 +1457,7 @@ NOTA: un'opzione DEVE essere selezionata.</translation> <name>ColoringRulesDelegate</name> <message> <source>the "@" symbol will be ignored.</source> - <translation type="unfinished">il simbolo "@" sarà ignorato.</translation> + <translation>il simbolo "@" sarà ignorato.</translation> </message> </context> <context> @@ -1467,14 +1467,6 @@ NOTA: un'opzione DEVE essere selezionata.</translation> <translation>Finestra</translation> </message> <message> - <source>Name</source> - <translation type="vanished">Nome</translation> - </message> - <message> - <source>Filter</source> - <translation type="vanished">Filtro</translation> - </message> - <message> <source><small><i>A hint.</i></small></source> <translation><small><i>Un suggerimento.</i></small></translation> </message> @@ -1515,10 +1507,6 @@ NOTA: un'opzione DEVE essere selezionata.</translation> <translation>Applica come filtro</translation> </message> <message> - <source>Coloring Rules</source> - <translation type="vanished">Regole di colorazione</translation> - </message> - <message> <source>Import</source> <translation>Importa</translation> </message> @@ -1535,12 +1523,8 @@ NOTA: un'opzione DEVE essere selezionata.</translation> <translation>Salva i filtri in un file.</translation> </message> <message> - <source>the "@" symbol will be ignored.</source> - <translation type="vanished">il simbolo "@" sarà ignorato.</translation> - </message> - <message> <source>Coloring Rules %1</source> - <translation type="unfinished"></translation> + <translation>Regole di colorazione %1</translation> </message> <message> <source>Double click to edit. Drag to move. Rules are processed in order until a match is found.</source> @@ -1562,24 +1546,20 @@ NOTA: un'opzione DEVE essere selezionata.</translation> <source>Wireshark doesn't recognize one or more of your coloring rules. They have been disabled.</source> <translation>Wireshark non riconosce una o più delle tue regole di colorazione. Sono state disabilitate.</translation> </message> - <message> - <source>Unable to save coloring rules: %s</source> - <translation type="vanished">Impossibile salvare le regole di colorazione: %s</translation> - </message> </context> <context> <name>ColoringRulesModel</name> <message> <source>Unable to save coloring rules: %1</source> - <translation type="unfinished"></translation> + <translation>Impossibile salvare le regole di colorazione: %1</translation> </message> <message> <source>Name</source> - <translation type="unfinished"></translation> + <translation>Nome</translation> </message> <message> <source>Filter</source> - <translation type="unfinished">Filtro</translation> + <translation>Filtro</translation> </message> </context> <context> diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts index 256d091889..30e8f3ce63 100644 --- a/ui/qt/wireshark_ja_JP.ts +++ b/ui/qt/wireshark_ja_JP.ts @@ -1429,7 +1429,7 @@ PLEASE NOTE: One option MUST be selected.</source> <name>ColoringRulesDelegate</name> <message> <source>the "@" symbol will be ignored.</source> - <translation type="unfinished">この "@" シンボルは無視されます</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -1439,14 +1439,6 @@ PLEASE NOTE: One option MUST be selected.</source> <translation>ダイアログ</translation> </message> <message> - <source>Name</source> - <translation type="vanished">名前</translation> - </message> - <message> - <source>Filter</source> - <translation type="vanished">フィルタ</translation> - </message> - <message> <source><small><i>A hint.</i></small></source> <translation><small><i>ヒント</i></small></translation> </message> @@ -1487,10 +1479,6 @@ PLEASE NOTE: One option MUST be selected.</source> <translation type="unfinished"></translation> </message> <message> - <source>Coloring Rules</source> - <translation type="vanished">色付けルール</translation> - </message> - <message> <source>Import</source> <translation>インポート</translation> </message> @@ -1507,10 +1495,6 @@ PLEASE NOTE: One option MUST be selected.</source> <translation>ファイルにフィルタを保存します</translation> </message> <message> - <source>the "@" symbol will be ignored.</source> - <translation type="vanished">この "@" シンボルは無視されます</translation> - </message> - <message> <source>Coloring Rules %1</source> <translation type="unfinished"></translation> </message> @@ -1534,10 +1518,6 @@ PLEASE NOTE: One option MUST be selected.</source> <source>Wireshark doesn't recognize one or more of your coloring rules. They have been disabled.</source> <translation type="unfinished"></translation> </message> - <message> - <source>Unable to save coloring rules: %s</source> - <translation type="vanished">色付けルール %s を保存できません</translation> - </message> </context> <context> <name>ColoringRulesModel</name> diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts index 6825a52f72..2c4f8ee01b 100644 --- a/ui/qt/wireshark_pl.ts +++ b/ui/qt/wireshark_pl.ts @@ -1435,7 +1435,7 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation> <name>ColoringRulesDelegate</name> <message> <source>the "@" symbol will be ignored.</source> - <translation type="unfinished">Symbol "@" będzie zignorowany.</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -1445,14 +1445,6 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation> <translation>Okno</translation> </message> <message> - <source>Name</source> - <translation type="vanished">Nazwa</translation> - </message> - <message> - <source>Filter</source> - <translation type="vanished">Filtr</translation> - </message> - <message> <source><small><i>A hint.</i></small></source> <translation><small><i>Podpowiedź.</i></small></translation> </message> @@ -1493,10 +1485,6 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation> <translation>Zastosuj filtr</translation> </message> <message> - <source>Coloring Rules</source> - <translation type="vanished">Reguły kolorowania</translation> - </message> - <message> <source>Import</source> <translation>Importuj</translation> </message> @@ -1513,10 +1501,6 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation> <translation>Zapisz filtry w pliku.</translation> </message> <message> - <source>the "@" symbol will be ignored.</source> - <translation type="vanished">Symbol "@" będzie zignorowany.</translation> - </message> - <message> <source>Coloring Rules %1</source> <translation type="unfinished"></translation> </message> @@ -1540,10 +1524,6 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation> <source>Wireshark doesn't recognize one or more of your coloring rules. They have been disabled.</source> <translation type="unfinished"></translation> </message> - <message> - <source>Unable to save coloring rules: %s</source> - <translation type="vanished">Nie można zapisać reguł kolorowania: %s</translation> - </message> </context> <context> <name>ColoringRulesModel</name> diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts index 3e4e0d5536..e913fcfe49 100644 --- a/ui/qt/wireshark_zh_CN.ts +++ b/ui/qt/wireshark_zh_CN.ts @@ -1450,7 +1450,7 @@ PLEASE NOTE: One option MUST be selected.</source> <name>ColoringRulesDelegate</name> <message> <source>the "@" symbol will be ignored.</source> - <translation type="unfinished">忽略"@"符号。</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -1460,14 +1460,6 @@ PLEASE NOTE: One option MUST be selected.</source> <translation>对话框</translation> </message> <message> - <source>Name</source> - <translation type="vanished">名称</translation> - </message> - <message> - <source>Filter</source> - <translation type="vanished">过滤器</translation> - </message> - <message> <source><small><i>A hint.</i></small></source> <translation><small><i>提示</i></small></translation> </message> @@ -1508,10 +1500,6 @@ PLEASE NOTE: One option MUST be selected.</source> <translation type="unfinished"></translation> </message> <message> - <source>Coloring Rules</source> - <translation type="vanished">着色规则</translation> - </message> - <message> <source>Import</source> <translation>导入</translation> </message> @@ -1528,10 +1516,6 @@ PLEASE NOTE: One option MUST be selected.</source> <translation>保存过滤器到文件。</translation> </message> <message> - <source>the "@" symbol will be ignored.</source> - <translation type="vanished">忽略"@"符号。</translation> - </message> - <message> <source>Coloring Rules %1</source> <translation type="unfinished"></translation> </message> @@ -1555,10 +1539,6 @@ PLEASE NOTE: One option MUST be selected.</source> <source>Wireshark doesn't recognize one or more of your coloring rules. They have been disabled.</source> <translation>Wireshark 无法识别您的一个或多个着色规则。它们已被禁用。</translation> </message> - <message> - <source>Unable to save coloring rules: %s</source> - <translation type="vanished">无法保存着色规则: %s</translation> - </message> </context> <context> <name>ColoringRulesModel</name> |