diff options
-rw-r--r-- | AUTHORS | 7 | ||||
-rw-r--r-- | epan/enterprise-numbers | 220 | ||||
-rw-r--r-- | epan/sminmpec.c | 53 | ||||
-rw-r--r-- | manuf | 31 | ||||
-rw-r--r-- | services | 4 | ||||
-rw-r--r-- | ui/qt/wireshark_de.ts | 60 | ||||
-rw-r--r-- | ui/qt/wireshark_en.ts | 60 | ||||
-rw-r--r-- | ui/qt/wireshark_fr.ts | 60 | ||||
-rw-r--r-- | ui/qt/wireshark_it.ts | 60 | ||||
-rw-r--r-- | ui/qt/wireshark_ja_JP.ts | 60 | ||||
-rw-r--r-- | ui/qt/wireshark_pl.ts | 60 | ||||
-rw-r--r-- | ui/qt/wireshark_zh_CN.ts | 60 |
12 files changed, 498 insertions, 237 deletions
@@ -3985,7 +3985,7 @@ Andrew Chernyh <andrew.chernyh[AT]gmail.com> Andrew Hoag <Andrew.Hoag[AT]aireon.com> Andy Ling <Andy.Ling[AT]quantel.com> Andy Ling <andy.ling[AT]s-a-m.com> -Anil Kumar K K <anilkumar911[AT]gmail.com> +Anil Kumar <anilkumar911[AT]gmail.com> Anndy Ke <anndymaktub[AT]yahoo.com.tw> Anthony Coddington <anthony.coddington[AT]endace.com> Anton Thomasson <anton.thomasson[AT]ericsson.com> @@ -4009,6 +4009,7 @@ Benoit Grange <benoit.grange[AT]gmail.com> Bertrand Bonnefoy-Claudet <bertrandbc[AT]gmail.com> Binh Trinh <beango[AT]gmail.com> Birol Capa <birol.capa[AT]siemens.com> +Boazi <ronen.boazi[AT]intel.com> Boris Bochkarev <Boris-Bochkaryov[AT]yandex.ru> Bradford Boyle <bradford.d.boyle[AT]gmail.com> Branislav Makan <branislav.makan1994[AT]gmail.com> @@ -4095,6 +4096,8 @@ Francois Schneider <francois.schneider[AT]airbus.com> Francois-Xavier Le Bail <fx.lebail[AT]yahoo.com> Frank Carpenter <frank.carpenter[AT]spectralink.com> Franklin Mathieu <franklinmathieu[AT]gmail.com> +Gabriel Ganne <gabriel.ganne[AT]enea.com> +Gabriel Ganne <gabriel.ganne[AT]qosmos.com> Ganesh Nawsupe <ganesh991[AT]gmail.com> Garming Sam <garming[AT]catalyst.net.nz> Gene Cumm <gene.cumm[AT]gmail.com> @@ -4197,6 +4200,7 @@ Mark Weel <markweel[AT]hotmail.com> MarkPhillips <mark.s.phillips[AT]outlook.com> Marko Hrastovec <marko.hrastovec[AT]gmail.com> Martin Tibenský <martin.tibensky[AT]alcatel-lucent.com> +Martin Vit <martin[AT]voipmonitor.org> Masashi Honma <masashi.honma[AT]gmail.com> Matej Košík <5764c029b688c1c0d24a2e97cd764f[AT]gmail.com> Matt Lawrence <bugzilla.wireshark[AT]erisa.co.uk> @@ -4209,6 +4213,7 @@ Michael Oed <michael.oed[AT]gmail.com> Michael Pergament <mpergament[AT]googlemail.com> Michael Sweet <michael.r.sweet[AT]gmail.com> Michael Vigovsky <upliner[AT]gmail.com> +Michal Kubecek <mkubecek[AT]suse.cz> Michal Pazdera <michal.pazdera[AT]gmail.com> Michal Prívozník <mprivozn[AT]redhat.com> Michał Skalski <mskalski13[AT]gmail.com> diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers index 91e7632865..4684b2d549 100644 --- a/epan/enterprise-numbers +++ b/epan/enterprise-numbers @@ -1,6 +1,6 @@ PRIVATE ENTERPRISE NUMBERS -(last updated 2017-03-03) +(last updated 2017-03-12) SMI Network Management Private Enterprise Codes: @@ -5615,8 +5615,8 @@ Decimal 76600.114&compuserve.com 1400 Sandia National Laboratories - David P. Duggan - dduggan&sandia.gov + Diana Eichert + deicher&sandia.gov 1401 Synerdyne Corp. Dan Burns @@ -30330,9 +30330,9 @@ Decimal Graham Phillips graham&cbcu.cam.ac.uk 7594 - Citadel Investment Group - Tarek Hammoud - hammoud&wfg.com + Citadel LLC (formerly 'Citadel Investment Group') + Eric Lambert + hostmaster&citadel.com 7595 RATIO Entwicklungen GmbH Oliver Thulke @@ -104196,8 +104196,8 @@ Auswertungsstelle nramirez&bancolombia.com 26156 Quicksilva Ltd. - Greg Bullock - greg.bullock&qxlva.com + Craig Millard + itsupport&qxlva.com 26157 Chupa Chups, S.A. Xavier Roig Gracia @@ -122056,8 +122056,8 @@ Decentralization / Helenic Public Administra nluett&rfz-online.de 30619 TOSHIBA MITSUBISHI-ELECTRIC INDUSTRIAL SYSTEMS CORPORATION - toshio ikeda - IKEDA.toshio&tmeic.co.jp + Tadashi Hara + HARA.tadashi&tmeic.co.jp 30620 Sloka Telecom Private Limited Upendra Ram Praturi @@ -122515,9 +122515,9 @@ Decentralization / Helenic Public Administra Don Larsen DonLarsen&UmpquaBank.com 30734 - Florian Sailer (formerly 'Seven-F') + Florian Sailer Florian Sailer - florian.sailer&outlook.com + f.sailer&outlook.com 30735 BLUECOARA Networks Hideo NAKAMITSU @@ -166924,9 +166924,9 @@ Decentralization / Helenic Public Administra Yanda Ma yanda&airshipvms.com 41836 - bct electronic GesmbH - Peter Meerwald - p.meerwald&bct-electronic.com + Commend International GmbH (formerly 'bct electronic GesmbH') + Martin Posch + lizenz&commend.com 41837 Evan-Moor Corp Eric Lindquist @@ -176857,8 +176857,8 @@ Decentralization / Helenic Public Administra aditya_mh&telkom.co.id 44319 Oklahoma Cancer Specialists and Research Institute - Russell McCarty - Russell.McCarty&ocsri.org + John Oborn + John.Oborn&ocsri.org 44320 Lake Norman Hematology Oncology Betty Adams @@ -197072,9 +197072,9 @@ Decentralization / Helenic Public Administra Mark Caldwell armin&apmetrix.com 49373 - Daniel Schmitz - Daniel Schmitz - schmitz.daniel&outlook.com + Meissner AG (formerly 'Daniel Schmitz') + IT Services + it&meissner.eu 49374 BAITIC SOLUCIONES Luis M. Roman Sanchez @@ -197819,6 +197819,186 @@ Decentralization / Helenic Public Administra Cancer Care Specialists Brett Slizeski brett.slizeski&ccsreno.com +49560 + Gemeente Purmerend + Sander Kornman + systeembeheer&purmerend.nl +49561 + EAD Systeme GmbH + Georg Eutermoser + support&ead-systeme.de +49562 + Frankfurter Verein für soziale Heimstätten + Dirk Westfal + it&frankfurter-verein.de +49563 + Shure Incorporated + Kehang Wu + wu_kehang&shure.com +49564 + YumaWorks, Inc. + Andy Bierman + andy&yumaworks.com +49565 + Universitate Alexandru Ioan Cuza din Iasi, Facultatea de Informatica + Alexandru Ocheana + arhanghel&info.uaic.ro +49566 + Salish Cancer Center + Lauree Ombrellaro + Lauree.ombrellaro&salishcancercenter.com +49567 + Norrskog Wood Products AB + Jim Salvin + jim.salvin&norrskog.se +49568 + jRedes Ltda ME + Jardson Thome + redes&jardsont.com.br +49569 + Surgical Information Sciences + Danny Askarov + danny.askarov&surgicalis.com +49570 + Jonathan Wilbur + Jonathan Wilbur + jwilbur&jwilbur.info +49571 + Elektrotechnik und Elektronik Oltmann GmbH + Stefan Springer + s.springer&eeo-gmbh.de +49572 + Precision Castparts Corp + Network Operations + pccnoc&precastcorp.com +49573 + eVolution Networks + Tomer Greenwald + Tomer.greenwald&evolution-networks.com +49574 + Modern Language Association + Eric Knappe + eknappe&mla.org +49575 + El-Abbadi School + Jacob El-Abbadi + jacob.elabbadi8&gmail.com +49576 + K.T.E.C. + Kai Ryu + kai1103&gmail.com +49577 + GlobalCom + Praneet Rai + praneet&globalcom.in +49578 + OON GlobalCom Private Limited + Praneet Rai + praneet&globalcom.in +49579 + TCOM L.P. + Drew Hornischer + drew.hornischer&tcomlp.com +49580 + Samuel Bächler Informatik + Samuel Bächler + baechler&boeser.ch +49581 + Sensify Security + Jeffrey Venable, Sr. + jeff&sensify-security.com +49582 + Vapor Team + Thomas Lewis + thomaslewis&0xaa55.me +49583 + Txture GmbH + Thomas Trojer + thomas.trojer&txture.io +49584 + PacketX Technology Ltd. + Tony Wang + tony.wang&packetx.biz +49585 + InoftTech + Demakov Nikita + demakoffnik&gmail.com +49586 + Ulf Andersson Åkeri AB + Anders Andersson + anders&uaakeri.se +49587 + Prästlönetillgångarna i Uppsala stift + Stefan Granath + stefan.granath&svenskakyrkan.se +49588 + CONET Kft. + Sandor Meczler + smeczler&conet.hu +49589 + Auto-Maskin AS + Leif Algermissen + la&auto-maskin.com +49590 + Bobst Mex SA + Bernard Schuepbach + bernard.schuepbach&bobst.com +49591 + TecAlliance GmbH + Oliver Mittas + Oliver.Mittas&tecalliance.net +49592 + Net Research + Andrzej Gregorczyk + andgre&netrsr.com +49593 + ACES + SCHINIOTAKIS K. + constantin.schiniotakis&gmail.com +49594 + The Royal Marsden NHS Foundation Trust + Simon Bryant + simon.bryant&rmh.nhs.uk +49595 + aineton + rui ma + 420874062&qq.com +49596 + Previder BV + Stefan Broeils + s.broeils&previder.nl +49597 + PremiumSoft CyberTech Limited + LIN WA WING + adp&navicat.com +49598 + LANKA NAP INC + Ruben Rajah + admin&lankanap.com +49599 + Bridgeworks Ltd + Steven Hayter + development&4bridgeworks.com +49600 + Vision Valley FZ LLC + Muhammed Basheer + products&visionvalley.net +49601 + Apollo Solar Inc. + John E. Pfeifer + johnp&apollosolar.com +49602 + CertificaEdu + Ronaldo de Sousa Araujo + contato&ronaldoaraujo.eti.br +49603 + LINKTEK Co., LTD. + Doo-Hwa, Jung + dhjung&linktek.biz +49604 + KysinTech + Xun HAN + hx&kysintech.com End of Document diff --git a/epan/sminmpec.c b/epan/sminmpec.c index 7b8fd1d309..6962f502bf 100644 --- a/epan/sminmpec.c +++ b/epan/sminmpec.c @@ -7614,7 +7614,7 @@ const value_string sminmpec_values[] = { { 7591, "Divisa Inform\0303\0241tica y Telecomunicaciones S.A." }, { 7592, "Swedish Institute of Space Physics" }, { 7593, "University of Cambridge, Clinical and Biomedical Computing Unit" }, - { 7594, "Citadel Investment Group" }, + { 7594, "Citadel LLC (formerly 'Citadel Investment Group')" }, { 7595, "RATIO Entwicklungen GmbH" }, { 7596, "Trellis Photonics" }, { 7597, "NOVA LJUBLJANSKA BANKA" }, @@ -30754,7 +30754,7 @@ const value_string sminmpec_values[] = { { 30731, "BODET S.A" }, { 30732, "NetSocket, Inc." }, { 30733, "Umpqua Bank" }, - { 30734, "Florian Sailer (formerly 'Seven-F')" }, + { 30734, "Florian Sailer" }, { 30735, "BLUECOARA Networks" }, { 30736, "Kyoeisangyo corp." }, { 30737, "Servicios Tecnicos Agrupados S.A." }, @@ -41856,7 +41856,7 @@ const value_string sminmpec_values[] = { { 41833, "Paree BV - Elektro Telecom" }, { 41834, "BRAM Technologies" }, { 41835, "JDL Digital Systems Inc." }, - { 41836, "bct electronic GesmbH" }, + { 41836, "Commend International GmbH (formerly 'bct electronic GesmbH')" }, { 41837, "Evan-Moor Corp" }, { 41838, "Dynamic Network Services Inc." }, { 41839, "Prism-IPX Systems, LLC" }, @@ -49393,7 +49393,7 @@ const value_string sminmpec_values[] = { { 49370, "VTU Energy" }, { 49371, "VIA Rail Canada Inc." }, { 49372, "Apmetrix, Inc." }, - { 49373, "Daniel Schmitz" }, + { 49373, "Meissner AG (formerly 'Daniel Schmitz')" }, { 49374, "BAITIC SOLUCIONES" }, { 49375, "New York City Housing Authority" }, { 49376, "IPKids" }, @@ -49580,6 +49580,51 @@ const value_string sminmpec_values[] = { { 49557, "CONDAT S.A.S." }, { 49558, "TechCERT" }, { 49559, "Cancer Care Specialists " }, + { 49560, "Gemeente Purmerend" }, + { 49561, "EAD Systeme GmbH" }, + { 49562, "Frankfurter Verein f\0303\0274r soziale Heimst\0303\0244tten" }, + { 49563, "Shure Incorporated" }, + { 49564, "YumaWorks, Inc." }, + { 49565, "Universitate Alexandru Ioan Cuza din Iasi, Facultatea de Informatica" }, + { 49566, "Salish Cancer Center" }, + { 49567, "Norrskog Wood Products AB" }, + { 49568, "jRedes Ltda ME" }, + { 49569, "Surgical Information Sciences" }, + { 49570, "Jonathan Wilbur" }, + { 49571, "Elektrotechnik und Elektronik Oltmann GmbH" }, + { 49572, "Precision Castparts Corp" }, + { 49573, "eVolution Networks" }, + { 49574, "Modern Language Association" }, + { 49575, "El-Abbadi School" }, + { 49576, "K.T.E.C." }, + { 49577, "GlobalCom" }, + { 49578, "OON GlobalCom Private Limited" }, + { 49579, "TCOM L.P." }, + { 49580, "Samuel B\0303\0244chler Informatik" }, + { 49581, "Sensify Security" }, + { 49582, "Vapor Team" }, + { 49583, "Txture GmbH" }, + { 49584, "PacketX Technology Ltd." }, + { 49585, "InoftTech" }, + { 49586, "Ulf Andersson \0303\0205keri AB" }, + { 49587, "Pr\0303\0244stl\0303\0266netillg\0303\0245ngarna i Uppsala stift" }, + { 49588, "CONET Kft." }, + { 49589, "Auto-Maskin AS" }, + { 49590, "Bobst Mex SA" }, + { 49591, "TecAlliance GmbH" }, + { 49592, "Net Research" }, + { 49593, "ACES" }, + { 49594, "The Royal Marsden NHS Foundation Trust" }, + { 49595, "aineton" }, + { 49596, "Previder BV" }, + { 49597, "PremiumSoft CyberTech Limited" }, + { 49598, "LANKA NAP INC" }, + { 49599, "Bridgeworks Ltd" }, + { 49600, "Vision Valley FZ LLC" }, + { 49601, "Apollo Solar Inc." }, + { 49602, "CertificaEdu" }, + { 49603, "LINKTEK Co., LTD." }, + { 49604, "KysinTech" }, { 0, NULL} }; @@ -18432,6 +18432,7 @@ 1C:4A:F7 Amon # AMON INC 1C:4B:B9 SmgEnter # SMG ENTERPRISE, LLC 1C:4B:D6 Azurewav # AzureWave Technology Inc. +1C:4D:70 IntelCor # Intel Corporate 1C:51:B5 Techaya # Techaya LTD 1C:52:16 Dongguan # DONGGUAN HELE ELECTRONICS CO., LTD 1C:52:D6 FlatDisp # FLAT DISPLAY TECHNOLOGY CORPORATION @@ -19328,6 +19329,7 @@ 2C:9A:A4 Eolo # Eolo SpA 2C:9D:1E HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 2C:9E:5F ArrisGro # ARRIS Group, Inc. +2C:9E:EC JabilCir # Jabil Circuit Penang 2C:9E:FC Canon # CANON INC. 2C:A1:57 Acromate # acromate, Inc. 2C:A1:7D ArrisGro # ARRIS Group, Inc. @@ -21336,6 +21338,7 @@ 50:11:EB Silverne # SilverNet Ltd 50:14:B5 RichfitI # Richfit Information Technology Co., Ltd 50:17:FF Cisco # Cisco Systems, Inc +50:18:4C Platina # Platina Systems Inc. 50:1A:A5 GnNetcom # GN Netcom A/S 50:1A:C5 Microsof # Microsoft 50:1C:BF Cisco # Cisco Systems, Inc @@ -23172,6 +23175,7 @@ 70:B3:D5:28:90:00/36 Shenzhen # Shenzhen Rongda Computer Co.,Ltd 70:B3:D5:28:A0:00/36 TransitS # Transit Solutions, LLC. 70:B3:D5:28:B0:00/36 ArnouseD # Arnouse Digital Devices, Corp. +70:B3:D5:28:C0:00/36 StepTech # Step Technica Co., Ltd. 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 @@ -23226,6 +23230,7 @@ 70:B3:D5:30:50:00/36 CaitronI # CAITRON Industrial Solutions GmbH 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 70:B3:D5:30:C0:00/36 SiconSrl # Sicon srl 70:B3:D5:30:E0:00/36 Private 70:B3:D5:31:30:00/36 DiehlCon # DIEHL Controls @@ -23273,6 +23278,7 @@ 70:B3:D5:36:C0:00/36 SiconSrl # Sicon srl 70:B3:D5:36:D0:00/36 Cybertea # Cyberteam Sp z o o 70:B3:D5:36:F0:00/36 Buddygua # BuddyGuard GmbH +70:B3:D5:37:00:00/36 Inphi # Inphi Corporation 70:B3:D5:37:60:00/36 Private 70:B3:D5:37:70:00/36 Monnit # Monnit Corporation 70:B3:D5:37:80:00/36 Synchrot # synchrotron SOLEIL @@ -23335,6 +23341,7 @@ 70:B3:D5:3E:F0:00/36 VtronPty # Vtron Pty Ltd 70:B3:D5:3F:00:00/36 Interval # Intervala 70:B3:D5:3F:10:00/36 OlympusN # Olympus NDT Canada +70:B3:D5:3F:30:00/36 Spea # SPEA SPA 70:B3:D5:3F:40:00/36 WincodeT # Wincode Technology Co., Ltd. 70:B3:D5:3F:60:00/36 SycompEl # Sycomp Electronic GmbH 70:B3:D5:3F:90:00/36 HerrickT # Herrick Tech Labs @@ -23617,6 +23624,7 @@ 70:B3:D5:6A:00:00/36 ActiveRe # Active Research Limited 70:B3:D5:6A:10:00/36 GlialTec # GLIAL TECHNOLOGY 70:B3:D5:6A:50:00/36 AkenoriP # Akenori PTE LTD +70:B3:D5:6A:60:00/36 WowSyste # WOW System 70:B3:D5:6A:80:00/36 VitschEl # Vitsch Electronics 70:B3:D5:6A:90:00/36 OhmoriEl # OHMORI ELECTRIC INDUSTRIES CO.LTD 70:B3:D5:6B:00:00/36 Ptype # PTYPE Co., LTD. @@ -23755,12 +23763,14 @@ 70:B3:D5:7D:90:00/36 AtomGike # ATOM GIKEN Co.,Ltd. 70:B3:D5:7D:D0:00/36 ExcelMed # Excel Medical Electronics LLC 70:B3:D5:7D:E0:00/36 Telaeris # Telaeris, Inc. +70:B3:D5:7E:00:00/36 Sanko-Sh # Sanko-sha,inc. 70:B3:D5:7E:10:00/36 AppliedM # Applied Materials 70:B3:D5:7E:20:00/36 DeproÉle # Depro Électronique inc 70:B3:D5:7E:30:00/36 RedleafS # RedLeaf Security 70:B3:D5:7E:40:00/36 C21 # C21 Systems Ltd 70:B3:D5:7E:50:00/36 Megaflex # Megaflex Oy 70:B3:D5:7E:70:00/36 Atessa # Atessa, Inc. +70:B3:D5:7E:80:00/36 Mannkind # Mannkind Corporation 70:B3:D5:7E:90:00/36 MecselOy # Mecsel Oy 70:B3:D5:7E:B0:00/36 XeroxInt # Xerox International Partners 70:B3:D5:7E:C0:00/36 Gridsmar # GRIDSMART Technologies @@ -24447,6 +24457,7 @@ 70:B3:D5:E4:C0:00/36 Iai-Isra # IAI-Israel Aerospace Industries MBT 70:B3:D5:E4:E0:00/36 Midfin # Midfin Systems 70:B3:D5:E4:F0:00/36 RwsAutom # RWS Automation GmbH +70:B3:D5:E5:00:00/36 Advanced # Advanced Vision Technology Ltd 70:B3:D5:E5:30:00/36 Mi # MI INC. 70:B3:D5:E5:50:00/36 BeltSRL # BELT S.r.l. 70:B3:D5:E5:80:00/36 ThurlbyT # Thurlby Thandar Instruments LTD @@ -24668,6 +24679,7 @@ 70:F1:96 Actionte # Actiontec Electronics, Inc 70:F1:A1 LiteonTe # Liteon Technology Corporation 70:F1:E5 Xetawave # Xetawave LLC +70:F3:5A Cisco # Cisco Systems, Inc 70:F3:95 Universa # Universal Global Scientific Industrial Co., Ltd. 70:F8:E7 IeeeRegi # IEEE Registration Authority 70:F8:E7:00:00:00/28 Shenzhen # SHENZHEN Xin JiuNing Electronics Co Ltd @@ -25820,6 +25832,7 @@ 88:66:A5 Apple # Apple, Inc. 88:68:5C Shenzhen # Shenzhen ChuangDao & Perpetual Eternal Technology Co.,Ltd 88:6A:B1 VivoMobi # vivo Mobile Communication Co., Ltd. +88:6A:E3 AlphaNet # Alpha Networks Inc. 88:6B:0F Bluegiga # Bluegiga Technologies OY 88:6B:44 SunnovoI # Sunnovo International Limited 88:6B:6E Apple # Apple, Inc. @@ -26181,6 +26194,7 @@ 90:5F:8D Modas # modas GmbH 90:60:F1 Apple # Apple, Inc. 90:61:0C FidaInte # Fida International (S) Pte Ltd +90:61:AE IntelCor # Intel Corporate 90:67:17 AlphionI # Alphion India Private Limited 90:67:1C HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 90:67:B5 Alcatel- # Alcatel-Lucent @@ -26331,6 +26345,7 @@ 94:3A:F0 Nokia # Nokia Corporation 94:3B:B1 Kaonmedi # Kaonmedia CO., LTD. 94:3D:C9 AsahiNet # Asahi Net, Inc. +94:3F:C2 HewlettP # Hewlett Packard Enterprise 94:40:A2 AnywaveC # Anywave Communication Technologies, Inc. 94:44:44 LgInnote # LG Innotek 94:44:52 BelkinIn # Belkin International Inc. @@ -26857,6 +26872,7 @@ A0:20:A6 Espressi # Espressif Inc. A0:21:95 SamsungE # Samsung Electronics Co.,Ltd A0:21:B7 Netgear A0:23:1B Telecomp # TeleComp R&D Corp. +A0:23:9F Cisco # Cisco Systems, Inc A0:2B:B8 HewlettP # Hewlett Packard A0:2C:36 Fn-LinkT # FN-LINK TECHNOLOGY LIMITED A0:2E:F3 UnitedIn # United Integrated Services Co., Led. @@ -26916,6 +26932,7 @@ A0:65:18 VnptTech # VNPT TECHNOLOGY A0:67:BE SiconSrl # Sicon srl A0:69:86 WellavTe # Wellav Technologies Ltd A0:6A:00 Verilink # Verilink Corporation +A0:6A:44 Vizio # Vizio, Inc A0:6C:EC Rim A0:6D:09 Intelcan # Intelcan Technosystems Inc. A0:6E:50 NanotekE # Nanotek Elektronik Sistemler Ltd. Sti. @@ -27000,10 +27017,20 @@ A0:C4:A5 SygnHous # SYGN HOUSE CO.,LTD A0:C5:62 ArrisGro # ARRIS Group, Inc. A0:C5:89 IntelCor # Intel Corporate A0:C5:F2 IeeeRegi # IEEE Registration Authority +A0:C5:F2:00:00:00/28 Private +A0:C5:F2:10:00:00/28 KnsGroup # KNS Group LLC (YADRO Company) +A0:C5:F2:20:00:00/28 Speedgoa # Speedgoat GmbH +A0:C5:F2:30:00:00/28 Waav # WAAV, Inc. +A0:C5:F2:40:00:00/28 Aicare # AiCare Corp. A0:C5:F2:50:00:00/28 TangoWav # Tango Wave +A0:C5:F2:60:00:00/28 Shenzhen # ShenZhen JuWangShi Tech A0:C5:F2:70:00:00/28 Viettron # Viettronimex JSC A0:C5:F2:80:00:00/28 CoolrGro # CoolR Group Inc A0:C5:F2:90:00:00/28 ImpulseN # Impulse Networks Pte Ltd +A0:C5:F2:A0:00:00/28 SeriousI # Serious Integrated, Inc. +A0:C5:F2:B0:00:00/28 OrayCom # Oray.com co., LTD. +A0:C5:F2:C0:00:00/28 Glooko # Glooko inc +A0:C5:F2:D0:00:00/28 Unaliwea # UnaliWear, Inc. A0:C6:EC Shenzhen # ShenZhen ANYK Technology Co.,LTD A0:C9:A0 MurataMa # Murata Manufacturing Co., Ltd. A0:CB:FD SamsungE # Samsung Electronics Co.,Ltd @@ -27278,6 +27305,7 @@ A4:EE:57 SeikoEps # Seiko Epson Corporation A4:EF:52 Telewave # Telewave Co., Ltd. A4:F1:E8 Apple # Apple, Inc. A4:F3:C1 OpenSour # Open Source Robotics Foundation, Inc. +A4:F3:E7 Integrat # Integrated Device Technology (Malaysia) Sdn. Bhd. A4:F4:C2 VnptTech # VNPT TECHNOLOGY A4:F5:22 ChofuSei # CHOFU SEISAKUSHO CO.,LTD A4:F7:D0 LanAcces # LAN Accessories Co., Ltd. @@ -28571,6 +28599,7 @@ C4:55:A6 CadacHol # Cadac Holdings Ltd C4:55:C2 Bach-Sim # Bach-Simpson C4:56:00 GalleonE # Galleon Embedded Computing C4:56:FE LavaInte # Lava International Ltd. +C4:57:1F Junelife C4:57:6E SamsungE # Samsung Electronics Co.,Ltd C4:58:C2 Shenzhen # Shenzhen TATFOOK Technology Co., Ltd. C4:59:76 FugooCoo # Fugoo Coorporation @@ -30011,6 +30040,7 @@ E4:35:C8 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD E4:35:FB SabreTec # Sabre Technology (Hull) Ltd E4:37:D7 HenriDep # HENRI DEPAEPE S.A.S. E4:38:F2 Advantag # Advantage Controls +E4:3A:6E Shenzhen # Shenzhen Zeroone Technology CO.,LTD E4:3E:D7 Arcadyan # Arcadyan Corporation E4:3F:A2 WuxiDspT # Wuxi DSP Technologies Inc. E4:40:E2 SamsungE # Samsung Electronics Co.,Ltd @@ -30702,6 +30732,7 @@ F4:28:96 SpectoPa # SPECTO PAINEIS ELETRONICOS LTDA F4:29:81 VivoMobi # vivo Mobile Communication Co., Ltd. F4:2B:48 Ubiqam F4:2C:56 SenorTec # SENOR TECH CO LTD +F4:30:B9 HewlettP # Hewlett Packard F4:31:C3 Apple # Apple, Inc. F4:36:E1 AbilisSa # Abilis Systems SARL F4:37:B7 Apple # Apple, Inc. @@ -8211,8 +8211,8 @@ snap 4752/tcp # Simple Network Audio Protocol [Dameon_Wagner] [Dameo snap 4752/udp # Simple Network Audio Protocol [Dameon_Wagner] [Dameon_Wagner] 2002-02 simon 4753/tcp # Simple Invocation of Methods Over Network (SIMON) [Alexander_Christian] [Alexander_Christian] 2012-04-19 simon-disc 4753/udp # Simple Invocation of Methods Over Network (SIMON) Discovery [Alexander_Christian] [Alexander_Christian] 2012-04-19 -gre-in-udp 4754/udp # GRE-in-UDP Encapsulation [IESG] [IETF_Chair] 2016-10-05 [RFC-ietf-tsvwg-gre-in-udp-encap-19] -gre-udp-dtls 4755/udp # GRE-in-UDP Encapsulation with DTLS [IESG] [IETF_Chair] 2016-10-05 [RFC-ietf-tsvwg-gre-in-udp-encap-19] +gre-in-udp 4754/udp # GRE-in-UDP Encapsulation [IESG] [IETF_Chair] 2016-10-05 [RFC8086] +gre-udp-dtls 4755/udp # GRE-in-UDP Encapsulation with DTLS [IESG] [IETF_Chair] 2016-10-05 [RFC8086] RDCenter 4756/tcp # Reticle Decision Center [KLA_Tencor] [George_Hwa] 2016-10-17 converge 4774/tcp # Converge RPC [Asteris_LLC] [Steven_Borrelli] 2016-09-16 bfd-multi-ctl 4784/tcp # BFD Multihop Control [Dave_Katz][Dave_Ward] [Dave_Katz][Dave_Ward] 2006-02 diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts index 7511d67e8b..109e807717 100644 --- a/ui/qt/wireshark_de.ts +++ b/ui/qt/wireshark_de.ts @@ -851,42 +851,42 @@ <translation>Kein mögliches Dateiformat unterstützt Kommentare. Möchten Sie die Kommentare verwerfen und in dem ausgewählten Format speichern?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="388"/> + <location filename="capture_file_dialog.cpp" line="391"/> <source>All Files (</source> <translation>Alle Dateien (</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="394"/> + <location filename="capture_file_dialog.cpp" line="397"/> <source>All Capture Files</source> <translation>Alle Mitschnittdateien</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="430"/> + <location filename="capture_file_dialog.cpp" line="433"/> <source>Format:</source> <translation>Format:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="435"/> + <location filename="capture_file_dialog.cpp" line="438"/> <source>Size:</source> <translation>Größe:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="440"/> + <location filename="capture_file_dialog.cpp" line="443"/> <source>Start / elapsed:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="486"/> + <location filename="capture_file_dialog.cpp" line="489"/> <source>Automatically detect file type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="784"/> + <location filename="capture_file_dialog.cpp" line="787"/> <source>%1, error after %2 packets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="791"/> + <location filename="capture_file_dialog.cpp" line="794"/> <source>%1, timed out at %2 packets</source> <translation type="unfinished"></translation> </message> @@ -903,37 +903,37 @@ <translation type="vanished">Verstrichene Zeit:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="452"/> + <location filename="capture_file_dialog.cpp" line="455"/> <source>Prepend packets</source> <translation>Pakete vorne einfügen</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="453"/> + <location filename="capture_file_dialog.cpp" line="456"/> <source>Insert packets from the selected file before the current file. Packet timestamps will be ignored.</source> <translation>Pakete aus der ausgewählten Datei vor der aktuellen Datei einfügen. Der Zeitstempel der Pakete wird dabei ignoriert.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="456"/> + <location filename="capture_file_dialog.cpp" line="459"/> <source>Merge chronologically</source> <translation>Chronologisch zusammenführen</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="457"/> + <location filename="capture_file_dialog.cpp" line="460"/> <source>Insert packets in chronological order.</source> <translation>Pakete in chronologischer Reihenfolge einfügen</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="461"/> + <location filename="capture_file_dialog.cpp" line="464"/> <source>Append packets</source> <translation>Pakete anfügen</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="462"/> + <location filename="capture_file_dialog.cpp" line="465"/> <source>Insert packets from the selected file after the current file. Packet timestamps will be ignored.</source> <translation>Pakete aus der ausgewählten Datei nach der aktuellen Datei anfügen. Die Zeitstempel der Pakete werden ignoriert.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="477"/> + <location filename="capture_file_dialog.cpp" line="480"/> <source>Read filter:</source> <translation>Lesefilter:</translation> </message> @@ -958,40 +958,40 @@ <translation type="vanished">&Externe Namensauflösung</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="495"/> + <location filename="capture_file_dialog.cpp" line="498"/> <source>Compress with g&zip</source> <translation>Mit g&zip komprimieren</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="526"/> + <location filename="capture_file_dialog.cpp" line="529"/> <source>Open Capture File</source> <oldsource>Wireshark: Open Capture File</oldsource> <translation>Mitschnittdatei öffnen</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="556"/> + <location filename="capture_file_dialog.cpp" line="559"/> <source>Save Capture File As</source> <oldsource>Wireshark: Save Capture File As</oldsource> <translation>Mitschnittdatei speichern unter</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="562"/> + <location filename="capture_file_dialog.cpp" line="565"/> <source>Save as:</source> <translation>Speichern als:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="584"/> + <location filename="capture_file_dialog.cpp" line="587"/> <source>Export Specified Packets</source> <oldsource>Wireshark: Export Specified Packets</oldsource> <translation>Ausgewählte Pakete exportieren</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="588"/> + <location filename="capture_file_dialog.cpp" line="591"/> <source>Export as:</source> <translation>Exportieren als:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="617"/> + <location filename="capture_file_dialog.cpp" line="620"/> <source>Merge Capture File</source> <oldsource>Wireshark: Merge Capture File</oldsource> <translation>Mitschnittdatei zusammenführen</translation> @@ -1001,17 +1001,17 @@ <translation type="vanished">-</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="730"/> + <location filename="capture_file_dialog.cpp" line="733"/> <source>directory</source> <translation>Verzeichnis</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="737"/> + <location filename="capture_file_dialog.cpp" line="740"/> <source>unknown file format</source> <translation>unbekanntes Dateiformat</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="739"/> + <location filename="capture_file_dialog.cpp" line="742"/> <source>error opening file</source> <translation>Fehler beim Öffnen der Datei</translation> </message> @@ -1032,7 +1032,7 @@ <translation type="vanished">?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="818"/> + <location filename="capture_file_dialog.cpp" line="821"/> <source>unknown</source> <translation>unbekannt</translation> </message> @@ -9613,7 +9613,7 @@ text-decoration: underline; <translation>&Ohne speichern beenden</translation> </message> <message> - <location filename="main_window.cpp" line="2648"/> + <location filename="main_window.cpp" line="2651"/> <source>Show or hide the toolbar</source> <translation type="unfinished"></translation> </message> @@ -9631,17 +9631,17 @@ text-decoration: underline; <translation>Stoppen und Fortsetzen &ohne zu Speichern</translation> </message> <message> - <location filename="main_window.cpp" line="2083"/> + <location filename="main_window.cpp" line="2086"/> <source>(File name can't be mapped to UTF-8)</source> <translation>(Dateiname kann nicht auf UTF-8 angewendet werden)</translation> </message> <message> - <location filename="main_window.cpp" line="2104"/> + <location filename="main_window.cpp" line="2107"/> <source>The Wireshark Network Analyzer</source> <translation>Die Wireshark Netzwerk Analysesoftware</translation> </message> <message> - <location filename="main_window.cpp" line="2129"/> + <location filename="main_window.cpp" line="2132"/> <source>Capturing from %1</source> <translation>Aufzeichnen von %1</translation> </message> diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts index b7d2f0d00d..395b8d4229 100644 --- a/ui/qt/wireshark_en.ts +++ b/ui/qt/wireshark_en.ts @@ -847,136 +847,136 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="388"/> + <location filename="capture_file_dialog.cpp" line="391"/> <source>All Files (</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="394"/> + <location filename="capture_file_dialog.cpp" line="397"/> <source>All Capture Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="430"/> + <location filename="capture_file_dialog.cpp" line="433"/> <source>Format:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="435"/> + <location filename="capture_file_dialog.cpp" line="438"/> <source>Size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="440"/> + <location filename="capture_file_dialog.cpp" line="443"/> <source>Start / elapsed:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="486"/> + <location filename="capture_file_dialog.cpp" line="489"/> <source>Automatically detect file type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="784"/> + <location filename="capture_file_dialog.cpp" line="787"/> <source>%1, error after %2 packets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="791"/> + <location filename="capture_file_dialog.cpp" line="794"/> <source>%1, timed out at %2 packets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="452"/> + <location filename="capture_file_dialog.cpp" line="455"/> <source>Prepend packets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="453"/> + <location filename="capture_file_dialog.cpp" line="456"/> <source>Insert packets from the selected file before the current file. Packet timestamps will be ignored.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="456"/> + <location filename="capture_file_dialog.cpp" line="459"/> <source>Merge chronologically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="457"/> + <location filename="capture_file_dialog.cpp" line="460"/> <source>Insert packets in chronological order.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="461"/> + <location filename="capture_file_dialog.cpp" line="464"/> <source>Append packets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="462"/> + <location filename="capture_file_dialog.cpp" line="465"/> <source>Insert packets from the selected file after the current file. Packet timestamps will be ignored.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="477"/> + <location filename="capture_file_dialog.cpp" line="480"/> <source>Read filter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="495"/> + <location filename="capture_file_dialog.cpp" line="498"/> <source>Compress with g&zip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="526"/> + <location filename="capture_file_dialog.cpp" line="529"/> <source>Open Capture File</source> <oldsource>Wireshark: Open Capture File</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="556"/> + <location filename="capture_file_dialog.cpp" line="559"/> <source>Save Capture File As</source> <oldsource>Wireshark: Save Capture File As</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="562"/> + <location filename="capture_file_dialog.cpp" line="565"/> <source>Save as:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="584"/> + <location filename="capture_file_dialog.cpp" line="587"/> <source>Export Specified Packets</source> <oldsource>Wireshark: Export Specified Packets</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="588"/> + <location filename="capture_file_dialog.cpp" line="591"/> <source>Export as:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="617"/> + <location filename="capture_file_dialog.cpp" line="620"/> <source>Merge Capture File</source> <oldsource>Wireshark: Merge Capture File</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="730"/> + <location filename="capture_file_dialog.cpp" line="733"/> <source>directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="737"/> + <location filename="capture_file_dialog.cpp" line="740"/> <source>unknown file format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="739"/> + <location filename="capture_file_dialog.cpp" line="742"/> <source>error opening file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="818"/> + <location filename="capture_file_dialog.cpp" line="821"/> <source>unknown</source> <translation type="unfinished"></translation> </message> @@ -9351,7 +9351,7 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="2648"/> + <location filename="main_window.cpp" line="2651"/> <source>Show or hide the toolbar</source> <translation type="unfinished"></translation> </message> @@ -9369,17 +9369,17 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="2083"/> + <location filename="main_window.cpp" line="2086"/> <source>(File name can't be mapped to UTF-8)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="2104"/> + <location filename="main_window.cpp" line="2107"/> <source>The Wireshark Network Analyzer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="2129"/> + <location filename="main_window.cpp" line="2132"/> <source>Capturing from %1</source> <translation type="unfinished"></translation> </message> diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts index 2845069e98..841cbc8f11 100644 --- a/ui/qt/wireshark_fr.ts +++ b/ui/qt/wireshark_fr.ts @@ -851,42 +851,42 @@ <translation>Le format de fichier dans lequel vous voulez sauvegarder ne prendre pas en charge les commentaires. Voulez-vous supprimer les commentaires et enregistrer dans le format que vous avez choisi?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="388"/> + <location filename="capture_file_dialog.cpp" line="391"/> <source>All Files (</source> <translation>Tous les Fichiers (</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="394"/> + <location filename="capture_file_dialog.cpp" line="397"/> <source>All Capture Files</source> <translation>Tous les fichiers de capture</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="430"/> + <location filename="capture_file_dialog.cpp" line="433"/> <source>Format:</source> <translation>Format:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="435"/> + <location filename="capture_file_dialog.cpp" line="438"/> <source>Size:</source> <translation>Taille:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="440"/> + <location filename="capture_file_dialog.cpp" line="443"/> <source>Start / elapsed:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="486"/> + <location filename="capture_file_dialog.cpp" line="489"/> <source>Automatically detect file type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="784"/> + <location filename="capture_file_dialog.cpp" line="787"/> <source>%1, error after %2 packets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="791"/> + <location filename="capture_file_dialog.cpp" line="794"/> <source>%1, timed out at %2 packets</source> <translation type="unfinished"></translation> </message> @@ -903,37 +903,37 @@ <translation type="vanished">Temps écoulé</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="452"/> + <location filename="capture_file_dialog.cpp" line="455"/> <source>Prepend packets</source> <translation>Ajout de paquets</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="453"/> + <location filename="capture_file_dialog.cpp" line="456"/> <source>Insert packets from the selected file before the current file. Packet timestamps will be ignored.</source> <translation>Insérer les paquets à partir du fichier sélectionné avant que le fichier actuel. Horodatage des paquets seront ignorés.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="456"/> + <location filename="capture_file_dialog.cpp" line="459"/> <source>Merge chronologically</source> <translation>Fusionner chronologiquement</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="457"/> + <location filename="capture_file_dialog.cpp" line="460"/> <source>Insert packets in chronological order.</source> <translation>Insérer des paquets dans l'ordre chronologique.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="461"/> + <location filename="capture_file_dialog.cpp" line="464"/> <source>Append packets</source> <translation>Ajout de paquets</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="462"/> + <location filename="capture_file_dialog.cpp" line="465"/> <source>Insert packets from the selected file after the current file. Packet timestamps will be ignored.</source> <translation>Insérer des paquets à partir du fichier sélectionné après le fichier en cours. Horodatage des paquets seront ignorés.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="477"/> + <location filename="capture_file_dialog.cpp" line="480"/> <source>Read filter:</source> <translation>Filtre de lecture:</translation> </message> @@ -958,40 +958,40 @@ <translation type="vanished">Résolution de nom &externe</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="495"/> + <location filename="capture_file_dialog.cpp" line="498"/> <source>Compress with g&zip</source> <translation>Compresser avec g&zip</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="526"/> + <location filename="capture_file_dialog.cpp" line="529"/> <source>Open Capture File</source> <oldsource>Wireshark: Open Capture File</oldsource> <translation>Ouvrir un fichier de capture</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="556"/> + <location filename="capture_file_dialog.cpp" line="559"/> <source>Save Capture File As</source> <oldsource>Wireshark: Save Capture File As</oldsource> <translation>Wireshark: Sauvegarder le fichier de capture sous </translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="562"/> + <location filename="capture_file_dialog.cpp" line="565"/> <source>Save as:</source> <translation>Sauvegarder sous:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="584"/> + <location filename="capture_file_dialog.cpp" line="587"/> <source>Export Specified Packets</source> <oldsource>Wireshark: Export Specified Packets</oldsource> <translation>Exporter les paquets séléctionnés</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="588"/> + <location filename="capture_file_dialog.cpp" line="591"/> <source>Export as:</source> <translation>Exporter sous:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="617"/> + <location filename="capture_file_dialog.cpp" line="620"/> <source>Merge Capture File</source> <oldsource>Wireshark: Merge Capture File</oldsource> <translation>Fusionner des captures</translation> @@ -1001,17 +1001,17 @@ <translation type="vanished">-</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="730"/> + <location filename="capture_file_dialog.cpp" line="733"/> <source>directory</source> <translation>dossier</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="737"/> + <location filename="capture_file_dialog.cpp" line="740"/> <source>unknown file format</source> <translation>Format du fichier inconnu</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="739"/> + <location filename="capture_file_dialog.cpp" line="742"/> <source>error opening file</source> <translation>erreur pour ouvrir le fichier</translation> </message> @@ -1032,7 +1032,7 @@ <translation type="vanished">?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="818"/> + <location filename="capture_file_dialog.cpp" line="821"/> <source>unknown</source> <translation>inconnu</translation> </message> @@ -9581,7 +9581,7 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="2648"/> + <location filename="main_window.cpp" line="2651"/> <source>Show or hide the toolbar</source> <translation type="unfinished"></translation> </message> @@ -9599,17 +9599,17 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="2083"/> + <location filename="main_window.cpp" line="2086"/> <source>(File name can't be mapped to UTF-8)</source> <translation>(Nom du fichier ne peut pas être mappé à l'UTF-8)</translation> </message> <message> - <location filename="main_window.cpp" line="2104"/> + <location filename="main_window.cpp" line="2107"/> <source>The Wireshark Network Analyzer</source> <translation>L'analyseur de réseau Wireshark</translation> </message> <message> - <location filename="main_window.cpp" line="2129"/> + <location filename="main_window.cpp" line="2132"/> <source>Capturing from %1</source> <translation>Capture en cours de %1</translation> </message> diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts index 80ed6620b5..56d689157f 100644 --- a/ui/qt/wireshark_it.ts +++ b/ui/qt/wireshark_it.ts @@ -851,42 +851,42 @@ <translation>Nessun formato di file in cui può essere salvato supporta i commenti. Vuoi scartare i commenti e salvare nel formato scelto?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="388"/> + <location filename="capture_file_dialog.cpp" line="391"/> <source>All Files (</source> <translation>Tutti i file (</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="394"/> + <location filename="capture_file_dialog.cpp" line="397"/> <source>All Capture Files</source> <translation>Tutti i file delle catture</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="430"/> + <location filename="capture_file_dialog.cpp" line="433"/> <source>Format:</source> <translation>Formato:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="435"/> + <location filename="capture_file_dialog.cpp" line="438"/> <source>Size:</source> <translation>Dimensione:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="440"/> + <location filename="capture_file_dialog.cpp" line="443"/> <source>Start / elapsed:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="486"/> + <location filename="capture_file_dialog.cpp" line="489"/> <source>Automatically detect file type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="784"/> + <location filename="capture_file_dialog.cpp" line="787"/> <source>%1, error after %2 packets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="791"/> + <location filename="capture_file_dialog.cpp" line="794"/> <source>%1, timed out at %2 packets</source> <translation type="unfinished"></translation> </message> @@ -903,37 +903,37 @@ <translation type="vanished">Tempo trascorso:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="452"/> + <location filename="capture_file_dialog.cpp" line="455"/> <source>Prepend packets</source> <translation>Aggiungi pacchetti in testa</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="453"/> + <location filename="capture_file_dialog.cpp" line="456"/> <source>Insert packets from the selected file before the current file. Packet timestamps will be ignored.</source> <translation>Inserisci pacchetti dal file selezionato prima del file corrente. La marca temporale dei pacchetti sarà ignorata.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="456"/> + <location filename="capture_file_dialog.cpp" line="459"/> <source>Merge chronologically</source> <translation>Unisci cronologicamente</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="457"/> + <location filename="capture_file_dialog.cpp" line="460"/> <source>Insert packets in chronological order.</source> <translation>Inserisci pacchetti in ordine cronologico.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="461"/> + <location filename="capture_file_dialog.cpp" line="464"/> <source>Append packets</source> <translation>Aggiungi pacchetti in coda</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="462"/> + <location filename="capture_file_dialog.cpp" line="465"/> <source>Insert packets from the selected file after the current file. Packet timestamps will be ignored.</source> <translation>Inserisci pacchetti dal file selezionato dopo il file corrente. La marca temporale dei pacchetti sarà ignorata.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="477"/> + <location filename="capture_file_dialog.cpp" line="480"/> <source>Read filter:</source> <translation>Filtro di lettura:</translation> </message> @@ -958,40 +958,40 @@ <translation type="vanished">Risolutore di nomi &esterno</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="495"/> + <location filename="capture_file_dialog.cpp" line="498"/> <source>Compress with g&zip</source> <translation>Comprimi con g&zip</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="526"/> + <location filename="capture_file_dialog.cpp" line="529"/> <source>Open Capture File</source> <oldsource>Wireshark: Open Capture File</oldsource> <translation>Apri un file di cattura</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="556"/> + <location filename="capture_file_dialog.cpp" line="559"/> <source>Save Capture File As</source> <oldsource>Wireshark: Save Capture File As</oldsource> <translation>Salva il file di cattura come</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="562"/> + <location filename="capture_file_dialog.cpp" line="565"/> <source>Save as:</source> <translation>Salva come:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="584"/> + <location filename="capture_file_dialog.cpp" line="587"/> <source>Export Specified Packets</source> <oldsource>Wireshark: Export Specified Packets</oldsource> <translation>Esporta i pacchetti specificati</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="588"/> + <location filename="capture_file_dialog.cpp" line="591"/> <source>Export as:</source> <translation>Esporta come:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="617"/> + <location filename="capture_file_dialog.cpp" line="620"/> <source>Merge Capture File</source> <oldsource>Wireshark: Merge Capture File</oldsource> <translation>Unisci file di cattura</translation> @@ -1001,17 +1001,17 @@ <translation type="vanished">-</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="730"/> + <location filename="capture_file_dialog.cpp" line="733"/> <source>directory</source> <translation>cartella</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="737"/> + <location filename="capture_file_dialog.cpp" line="740"/> <source>unknown file format</source> <translation>formato dii file sconosciuto</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="739"/> + <location filename="capture_file_dialog.cpp" line="742"/> <source>error opening file</source> <translation>errore nell'apertura del file</translation> </message> @@ -1032,7 +1032,7 @@ <translation type="vanished">?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="818"/> + <location filename="capture_file_dialog.cpp" line="821"/> <source>unknown</source> <translation>sconosciuto</translation> </message> @@ -9611,7 +9611,7 @@ a:hover { <translation>Esci senza sal&vare</translation> </message> <message> - <location filename="main_window.cpp" line="2648"/> + <location filename="main_window.cpp" line="2651"/> <source>Show or hide the toolbar</source> <translation type="unfinished"></translation> </message> @@ -9629,17 +9629,17 @@ a:hover { <translation>Ferma e continua senza sal&vare</translation> </message> <message> - <location filename="main_window.cpp" line="2083"/> + <location filename="main_window.cpp" line="2086"/> <source>(File name can't be mapped to UTF-8)</source> <translation>(Il nome del file non può essere associato in UTF-8)</translation> </message> <message> - <location filename="main_window.cpp" line="2104"/> + <location filename="main_window.cpp" line="2107"/> <source>The Wireshark Network Analyzer</source> <translation>Wireshark l'analizzatore di rete</translation> </message> <message> - <location filename="main_window.cpp" line="2129"/> + <location filename="main_window.cpp" line="2132"/> <source>Capturing from %1</source> <translation>Cattura da %1</translation> </message> diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts index 468c2c8e35..abe4f177b1 100644 --- a/ui/qt/wireshark_ja_JP.ts +++ b/ui/qt/wireshark_ja_JP.ts @@ -851,42 +851,42 @@ <translation>コメントに対応したファイル形式ではありません。コメントを破棄して選んだ形式で保存しますか?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="388"/> + <location filename="capture_file_dialog.cpp" line="391"/> <source>All Files (</source> <translation>すべてのファイル (</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="394"/> + <location filename="capture_file_dialog.cpp" line="397"/> <source>All Capture Files</source> <translation>すべてのキャプチャファイル</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="430"/> + <location filename="capture_file_dialog.cpp" line="433"/> <source>Format:</source> <translation>形式:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="435"/> + <location filename="capture_file_dialog.cpp" line="438"/> <source>Size:</source> <translation>サイズ:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="440"/> + <location filename="capture_file_dialog.cpp" line="443"/> <source>Start / elapsed:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="486"/> + <location filename="capture_file_dialog.cpp" line="489"/> <source>Automatically detect file type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="784"/> + <location filename="capture_file_dialog.cpp" line="787"/> <source>%1, error after %2 packets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="791"/> + <location filename="capture_file_dialog.cpp" line="794"/> <source>%1, timed out at %2 packets</source> <translation type="unfinished"></translation> </message> @@ -903,37 +903,37 @@ <translation type="vanished">経過時間:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="452"/> + <location filename="capture_file_dialog.cpp" line="455"/> <source>Prepend packets</source> <translation>前にパケットを挿入</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="453"/> + <location filename="capture_file_dialog.cpp" line="456"/> <source>Insert packets from the selected file before the current file. Packet timestamps will be ignored.</source> <translation>現在のファイルの前に選択したファイルからパケットを挿入します。パケットのタイムスタンプは無視されます</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="456"/> + <location filename="capture_file_dialog.cpp" line="459"/> <source>Merge chronologically</source> <translation>時系列で結合</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="457"/> + <location filename="capture_file_dialog.cpp" line="460"/> <source>Insert packets in chronological order.</source> <translation>時系列順でパケットを挿入します</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="461"/> + <location filename="capture_file_dialog.cpp" line="464"/> <source>Append packets</source> <translation>後にパケットを追加</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="462"/> + <location filename="capture_file_dialog.cpp" line="465"/> <source>Insert packets from the selected file after the current file. Packet timestamps will be ignored.</source> <translation>現在のファイルの後に選択したファイルからパケットを挿入します パケットのタイムスタンプは無視されます</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="477"/> + <location filename="capture_file_dialog.cpp" line="480"/> <source>Read filter:</source> <translation>読込フィルタ:</translation> </message> @@ -958,40 +958,40 @@ <translation type="vanished">外部の名前解決(&E)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="495"/> + <location filename="capture_file_dialog.cpp" line="498"/> <source>Compress with g&zip</source> <translation>gzip形式で圧縮(&z)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="526"/> + <location filename="capture_file_dialog.cpp" line="529"/> <source>Open Capture File</source> <oldsource>Wireshark: Open Capture File</oldsource> <translation>キャプチャファイルを開く</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="556"/> + <location filename="capture_file_dialog.cpp" line="559"/> <source>Save Capture File As</source> <oldsource>Wireshark: Save Capture File As</oldsource> <translation>としてキャプチャファイルを保存</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="562"/> + <location filename="capture_file_dialog.cpp" line="565"/> <source>Save as:</source> <translation>として保存:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="584"/> + <location filename="capture_file_dialog.cpp" line="587"/> <source>Export Specified Packets</source> <oldsource>Wireshark: Export Specified Packets</oldsource> <translation>指定したパケットをエクスポート</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="588"/> + <location filename="capture_file_dialog.cpp" line="591"/> <source>Export as:</source> <translation>としてエクスポート:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="617"/> + <location filename="capture_file_dialog.cpp" line="620"/> <source>Merge Capture File</source> <oldsource>Wireshark: Merge Capture File</oldsource> <translation>キャプチャファイルを結合</translation> @@ -1001,17 +1001,17 @@ <translation type="vanished">-</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="730"/> + <location filename="capture_file_dialog.cpp" line="733"/> <source>directory</source> <translation>ディレクトリ</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="737"/> + <location filename="capture_file_dialog.cpp" line="740"/> <source>unknown file format</source> <translation>不明なファイルフォーマット</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="739"/> + <location filename="capture_file_dialog.cpp" line="742"/> <source>error opening file</source> <translation>ファイルオープンエラー</translation> </message> @@ -1032,7 +1032,7 @@ <translation type="vanished">?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="818"/> + <location filename="capture_file_dialog.cpp" line="821"/> <source>unknown</source> <translation>不明</translation> </message> @@ -9563,7 +9563,7 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="2648"/> + <location filename="main_window.cpp" line="2651"/> <source>Show or hide the toolbar</source> <translation type="unfinished"></translation> </message> @@ -9581,17 +9581,17 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="2083"/> + <location filename="main_window.cpp" line="2086"/> <source>(File name can't be mapped to UTF-8)</source> <translation>ファイル名をUTF-8形式に割り当てできません</translation> </message> <message> - <location filename="main_window.cpp" line="2104"/> + <location filename="main_window.cpp" line="2107"/> <source>The Wireshark Network Analyzer</source> <translation>ワイヤーシャークネットワークアナライザ</translation> </message> <message> - <location filename="main_window.cpp" line="2129"/> + <location filename="main_window.cpp" line="2132"/> <source>Capturing from %1</source> <translation>%1 からキャプチャ中</translation> </message> diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts index 0137e3d000..3d87fc4e84 100644 --- a/ui/qt/wireshark_pl.ts +++ b/ui/qt/wireshark_pl.ts @@ -851,42 +851,42 @@ <translation>Nie ma formatu w którym możliwy jest zapis z komentarzami. Czy chcesz porzucić komentarze i zapisać plik?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="388"/> + <location filename="capture_file_dialog.cpp" line="391"/> <source>All Files (</source> <translation>Wszystkie pliki (</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="394"/> + <location filename="capture_file_dialog.cpp" line="397"/> <source>All Capture Files</source> <translation>Wszystkie pliki przechwytywania</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="430"/> + <location filename="capture_file_dialog.cpp" line="433"/> <source>Format:</source> <translation>Format:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="435"/> + <location filename="capture_file_dialog.cpp" line="438"/> <source>Size:</source> <translation>Rozmiar:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="440"/> + <location filename="capture_file_dialog.cpp" line="443"/> <source>Start / elapsed:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="486"/> + <location filename="capture_file_dialog.cpp" line="489"/> <source>Automatically detect file type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="784"/> + <location filename="capture_file_dialog.cpp" line="787"/> <source>%1, error after %2 packets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="791"/> + <location filename="capture_file_dialog.cpp" line="794"/> <source>%1, timed out at %2 packets</source> <translation type="unfinished"></translation> </message> @@ -903,37 +903,37 @@ <translation type="vanished">Upłynęło:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="452"/> + <location filename="capture_file_dialog.cpp" line="455"/> <source>Prepend packets</source> <translation>Dodaj pakiety na początku</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="453"/> + <location filename="capture_file_dialog.cpp" line="456"/> <source>Insert packets from the selected file before the current file. Packet timestamps will be ignored.</source> <translation>Wstaw pakiety z wybranego pliku na początek. Czasy pakietów będą zignorowane.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="456"/> + <location filename="capture_file_dialog.cpp" line="459"/> <source>Merge chronologically</source> <translation>Scalaj chronologicznie</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="457"/> + <location filename="capture_file_dialog.cpp" line="460"/> <source>Insert packets in chronological order.</source> <translation>Wstaw pakiety w kolejności chronologicznej</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="461"/> + <location filename="capture_file_dialog.cpp" line="464"/> <source>Append packets</source> <translation>Dodaj pakiety</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="462"/> + <location filename="capture_file_dialog.cpp" line="465"/> <source>Insert packets from the selected file after the current file. Packet timestamps will be ignored.</source> <translation>Wstaw pakiety z wybranego pliku na koniec. Czasy pakietów będą zignorowane.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="477"/> + <location filename="capture_file_dialog.cpp" line="480"/> <source>Read filter:</source> <translation>Filtr wczytywania:</translation> </message> @@ -958,40 +958,40 @@ <translation type="vanished">Zewnętrzne rozwijanie nazw</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="495"/> + <location filename="capture_file_dialog.cpp" line="498"/> <source>Compress with g&zip</source> <translation>Kompresuj używając gzip</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="526"/> + <location filename="capture_file_dialog.cpp" line="529"/> <source>Open Capture File</source> <oldsource>Wireshark: Open Capture File</oldsource> <translation>Otwórz plik przechwytywania</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="556"/> + <location filename="capture_file_dialog.cpp" line="559"/> <source>Save Capture File As</source> <oldsource>Wireshark: Save Capture File As</oldsource> <translation>Zapisz plik przechwytywania jako</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="562"/> + <location filename="capture_file_dialog.cpp" line="565"/> <source>Save as:</source> <translation>Zapisz jako:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="584"/> + <location filename="capture_file_dialog.cpp" line="587"/> <source>Export Specified Packets</source> <oldsource>Wireshark: Export Specified Packets</oldsource> <translation>Eksportuj wybrane pakiety</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="588"/> + <location filename="capture_file_dialog.cpp" line="591"/> <source>Export as:</source> <translation>Eksportuj jako:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="617"/> + <location filename="capture_file_dialog.cpp" line="620"/> <source>Merge Capture File</source> <oldsource>Wireshark: Merge Capture File</oldsource> <translation>Scal pliki przechwytywania</translation> @@ -1001,17 +1001,17 @@ <translation type="vanished">-</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="730"/> + <location filename="capture_file_dialog.cpp" line="733"/> <source>directory</source> <translation>katalog</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="737"/> + <location filename="capture_file_dialog.cpp" line="740"/> <source>unknown file format</source> <translation>nieznany format pliku</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="739"/> + <location filename="capture_file_dialog.cpp" line="742"/> <source>error opening file</source> <translation>błąd podczas otwierania pliku</translation> </message> @@ -1032,7 +1032,7 @@ <translation type="vanished">?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="818"/> + <location filename="capture_file_dialog.cpp" line="821"/> <source>unknown</source> <translation>nieznany</translation> </message> @@ -9613,7 +9613,7 @@ text-decoration: underline; <translation>Wyjdź bez zapisy&wania</translation> </message> <message> - <location filename="main_window.cpp" line="2648"/> + <location filename="main_window.cpp" line="2651"/> <source>Show or hide the toolbar</source> <translation type="unfinished"></translation> </message> @@ -9631,17 +9631,17 @@ text-decoration: underline; <translation>Zatrzymaj i kontynuuj bez zapisy&wania</translation> </message> <message> - <location filename="main_window.cpp" line="2083"/> + <location filename="main_window.cpp" line="2086"/> <source>(File name can't be mapped to UTF-8)</source> <translation>(Nazwa pliku nie może być przekonwertowana do formatu UTF-8)</translation> </message> <message> - <location filename="main_window.cpp" line="2104"/> + <location filename="main_window.cpp" line="2107"/> <source>The Wireshark Network Analyzer</source> <translation>Analizator Wireshark</translation> </message> <message> - <location filename="main_window.cpp" line="2129"/> + <location filename="main_window.cpp" line="2132"/> <source>Capturing from %1</source> <translation>Przechwytywanie z %1</translation> </message> diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts index 3c459393d1..c9d13e9da4 100644 --- a/ui/qt/wireshark_zh_CN.ts +++ b/ui/qt/wireshark_zh_CN.ts @@ -851,42 +851,42 @@ <translation>可以保存的文件格式中,没有支持注释的格式。您是否要丢弃注释并以您选择的格式保存?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="388"/> + <location filename="capture_file_dialog.cpp" line="391"/> <source>All Files (</source> <translation>所有文件 (</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="394"/> + <location filename="capture_file_dialog.cpp" line="397"/> <source>All Capture Files</source> <translation>所有捕获文件</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="430"/> + <location filename="capture_file_dialog.cpp" line="433"/> <source>Format:</source> <translation>格式:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="435"/> + <location filename="capture_file_dialog.cpp" line="438"/> <source>Size:</source> <translation>大小:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="440"/> + <location filename="capture_file_dialog.cpp" line="443"/> <source>Start / elapsed:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="486"/> + <location filename="capture_file_dialog.cpp" line="489"/> <source>Automatically detect file type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="784"/> + <location filename="capture_file_dialog.cpp" line="787"/> <source>%1, error after %2 packets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="791"/> + <location filename="capture_file_dialog.cpp" line="794"/> <source>%1, timed out at %2 packets</source> <translation type="unfinished"></translation> </message> @@ -903,37 +903,37 @@ <translation type="vanished">已用时间:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="452"/> + <location filename="capture_file_dialog.cpp" line="455"/> <source>Prepend packets</source> <translation>前置分组</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="453"/> + <location filename="capture_file_dialog.cpp" line="456"/> <source>Insert packets from the selected file before the current file. Packet timestamps will be ignored.</source> <translation>将选中文件中的分组插入到当前文件之前。分组时间戳将被忽略。</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="456"/> + <location filename="capture_file_dialog.cpp" line="459"/> <source>Merge chronologically</source> <translation>按时间戳合并</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="457"/> + <location filename="capture_file_dialog.cpp" line="460"/> <source>Insert packets in chronological order.</source> <translation>按照时间顺序插入分组。</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="461"/> + <location filename="capture_file_dialog.cpp" line="464"/> <source>Append packets</source> <translation>追加分组</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="462"/> + <location filename="capture_file_dialog.cpp" line="465"/> <source>Insert packets from the selected file after the current file. Packet timestamps will be ignored.</source> <translation>将选中文件中的分组插入到当前文件之后。分组时间戳将被忽略。</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="477"/> + <location filename="capture_file_dialog.cpp" line="480"/> <source>Read filter:</source> <translation>读取过滤器:</translation> </message> @@ -958,40 +958,40 @@ <translation type="vanished">使用外部解析服务(&E)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="495"/> + <location filename="capture_file_dialog.cpp" line="498"/> <source>Compress with g&zip</source> <translation>用 gzip 压缩(&Z)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="526"/> + <location filename="capture_file_dialog.cpp" line="529"/> <source>Open Capture File</source> <oldsource>Wireshark: Open Capture File</oldsource> <translation>打开捕获文件</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="556"/> + <location filename="capture_file_dialog.cpp" line="559"/> <source>Save Capture File As</source> <oldsource>Wireshark: Save Capture File As</oldsource> <translation>保存捕获文件为</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="562"/> + <location filename="capture_file_dialog.cpp" line="565"/> <source>Save as:</source> <translation>另存为:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="584"/> + <location filename="capture_file_dialog.cpp" line="587"/> <source>Export Specified Packets</source> <oldsource>Wireshark: Export Specified Packets</oldsource> <translation>导出特定分组</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="588"/> + <location filename="capture_file_dialog.cpp" line="591"/> <source>Export as:</source> <translation>导出为:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="617"/> + <location filename="capture_file_dialog.cpp" line="620"/> <source>Merge Capture File</source> <oldsource>Wireshark: Merge Capture File</oldsource> <translation>合并捕获文件</translation> @@ -1001,17 +1001,17 @@ <translation type="vanished">-</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="730"/> + <location filename="capture_file_dialog.cpp" line="733"/> <source>directory</source> <translation>目录</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="737"/> + <location filename="capture_file_dialog.cpp" line="740"/> <source>unknown file format</source> <translation>未知文件格式</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="739"/> + <location filename="capture_file_dialog.cpp" line="742"/> <source>error opening file</source> <translation>打开文件出错</translation> </message> @@ -1032,7 +1032,7 @@ <translation type="vanished">?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="818"/> + <location filename="capture_file_dialog.cpp" line="821"/> <source>unknown</source> <translation>未知</translation> </message> @@ -9600,7 +9600,7 @@ text-decoration: underline; <translation>直接退出,不保存(&W)</translation> </message> <message> - <location filename="main_window.cpp" line="2648"/> + <location filename="main_window.cpp" line="2651"/> <source>Show or hide the toolbar</source> <translation type="unfinished"></translation> </message> @@ -9618,17 +9618,17 @@ text-decoration: underline; <translation>停止并继续,不保存(&W)</translation> </message> <message> - <location filename="main_window.cpp" line="2083"/> + <location filename="main_window.cpp" line="2086"/> <source>(File name can't be mapped to UTF-8)</source> <translation>文件名不能映射到UTF-8</translation> </message> <message> - <location filename="main_window.cpp" line="2104"/> + <location filename="main_window.cpp" line="2107"/> <source>The Wireshark Network Analyzer</source> <translation>Wireshark 网络分析器</translation> </message> <message> - <location filename="main_window.cpp" line="2129"/> + <location filename="main_window.cpp" line="2132"/> <source>Capturing from %1</source> <translation>正在捕获 %1</translation> </message> |