diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | epan/dissectors/usb.c | 61 | ||||
| -rw-r--r-- | epan/enterprise-numbers | 144 | ||||
| -rw-r--r-- | epan/sminmpec.c | 35 | ||||
| -rw-r--r-- | manuf | 70 | ||||
| -rw-r--r-- | services | 2 | ||||
| -rw-r--r-- | ui/qt/wireshark_de.ts | 125 | ||||
| -rw-r--r-- | ui/qt/wireshark_en.ts | 123 | ||||
| -rw-r--r-- | ui/qt/wireshark_fr.ts | 125 | ||||
| -rw-r--r-- | ui/qt/wireshark_it.ts | 125 | ||||
| -rw-r--r-- | ui/qt/wireshark_ja_JP.ts | 125 | ||||
| -rw-r--r-- | ui/qt/wireshark_pl.ts | 125 | ||||
| -rw-r--r-- | ui/qt/wireshark_zh_CN.ts | 125 |
13 files changed, 862 insertions, 325 deletions
@@ -4141,6 +4141,7 @@ Joakim Karlsson <oakimk[AT]gmail.com> Johan Wahl <johan.wahl[AT]ericsson.com> John A. Thacker <johnthacker[AT]gmail.com> John Miner <optommp[AT]gmail.com> +John Viklund <john.viklund[AT]effnet.com> Jonas Falkevik <jonas.falkevik[AT]gmail.com> Jonathan Brucker <jonathan.brucke[AT]gmail.com> Jonathan Muñoz <jonathan.munoz[AT]inria.fr> @@ -4186,6 +4187,7 @@ Marcel Essig <marcel.essig[AT]gmx.de> Marian Ďurkovič <md[AT]bts.sk> Marius <mareko.paliga[AT]gmail.com> Mark Cunningham <launchpad[AT]markcunningham.ie> +Mark Phillips <mark.phil[AT]samsung.com> Mark Weel <markweel[AT]hotmail.com> MarkPhillips <mark.s.phillips[AT]outlook.com> Marko Hrastovec <marko.hrastovec[AT]gmail.com> diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c index 1636fa5909..971704a2bb 100644 --- a/epan/dissectors/usb.c +++ b/epan/dissectors/usb.c @@ -3691,6 +3691,7 @@ static const value_string usb_products_vals[] = { { 0x03f90101, "Keyboard" }, { 0x03f90102, "Keyboard Mouse" }, { 0x03fd0008, "Platform Cable USB II" }, + { 0x03fd0050, "dfu downloader" }, { 0x040005dc, "Rigol Technologies DS1000USB Oscilloscope" }, { 0x04000807, "Bluetooth Dongle" }, { 0x0400080a, "Bluetooth Device" }, @@ -3729,7 +3730,7 @@ static const value_string usb_products_vals[] = { { 0x04036007, "Serial Converter" }, { 0x04036008, "Serial Converter" }, { 0x04036009, "Serial Converter" }, - { 0x04036010, "FT2232C Dual USB-UART/FIFO IC" }, + { 0x04036010, "FT2232C/D/H Dual UART/FIFO IC" }, { 0x04036011, "FT4232H Quad HS USB-UART/FIFO IC" }, { 0x04036014, "FT232H Single HS USB-UART/FIFO IC" }, { 0x04036015, "Bridge(I2C/SPI/UART/FIFO)" }, @@ -3773,6 +3774,7 @@ static const value_string usb_products_vals[] = { { 0x0403bfda, "OpenDCC (Throttle)" }, { 0x0403bfdb, "OpenDCC (Gateway)" }, { 0x0403bfdc, "OpenDCC (GBM)" }, + { 0x0403c580, "HID UNIKEY dongle [F-Response]" }, { 0x0403c630, "lcd2usb interface" }, { 0x0403c631, "i2c-tiny-usb interface" }, { 0x0403c632, "xu1541 c64 floppy drive interface" }, @@ -4830,6 +4832,7 @@ static const value_string usb_products_vals[] = { { 0x044fb651, "Ferrari GT Rumble Force Wheel" }, { 0x044fb653, "RGT Force Feedback Clutch Racing Wheel" }, { 0x044fb654, "Ferrari GT Force Feedback Wheel" }, + { 0x044fb687, "TWCS Throttle" }, { 0x044fb700, "Tacticalboard" }, { 0x04511234, "Bluetooth Device" }, { 0x04511428, "Hub" }, @@ -5116,7 +5119,9 @@ static const value_string usb_products_vals[] = { { 0x045e02d1, "Xbox One Controller" }, { 0x045e02d5, "Xbox One Digital TV Tuner" }, { 0x045e02dd, "Xbox One Controller (Covert Forces/Firmware 2015)" }, + { 0x045e02e3, "Xbox One Elite Controller" }, { 0x045e02e6, "Wireless XBox Controller Dongle" }, + { 0x045e02ea, "Xbox One S Controller" }, { 0x045e0400, "Windows Powered Pocket PC 2002" }, { 0x045e0401, "Windows Powered Pocket PC 2002" }, { 0x045e0402, "Windows Powered Pocket PC 2002" }, @@ -5275,6 +5280,7 @@ static const value_string usb_products_vals[] = { { 0x045e076d, "LifeCam HD-5000" }, { 0x045e0772, "LifeCam Studio" }, { 0x045e0779, "LifeCam HD-3000" }, + { 0x045e077f, "LifeChat LX-6000 Headset" }, { 0x045e0780, "Comfort Curve Keyboard 3000" }, { 0x045e0797, "Optical Mouse 200" }, { 0x045e07a5, "Wireless Receiver 1461C" }, @@ -5361,6 +5367,8 @@ static const value_string usb_products_vals[] = { { 0x046a0027, "CyMotion Master Solar Keyboard" }, { 0x046a002a, "Wireless Mouse & Keyboard" }, { 0x046a002d, "SmartTerminal XX44" }, + { 0x046a003c, "Raptor Gaming Keyboard" }, + { 0x046a003d, "Raptor Gaming Keyboard Integrated Hub" }, { 0x046a003e, "SmartTerminal ST-2xxx" }, { 0x046a0041, "G86 6240 Keyboard" }, { 0x046a0080, "eHealth Terminal ST 1503" }, @@ -5513,7 +5521,9 @@ static const value_string usb_products_vals[] = { { 0x046d0a37, "USB Headset H540" }, { 0x046d0a38, "Headset H340" }, { 0x046d0a44, "Headset H390" }, + { 0x046d0a45, "960 Headset" }, { 0x046d0a4d, "G430 Surround Sound Gaming Headset" }, + { 0x046d0a5b, "G933 Wireless Headset Dongle" }, { 0x046d0b02, "C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)" }, { 0x046d8801, "Video Camera" }, { 0x046db014, "Bluetooth Mouse M336/M337/M535" }, @@ -6327,6 +6337,7 @@ static const value_string usb_products_vals[] = { { 0x04a7049b, "Strobe XP 100" }, { 0x04a704a0, "7400" }, { 0x04a704ac, "Xerox Travel Scanner 100" }, + { 0x04a704cd, "Xerox Travel Scanner 150" }, { 0x04a80101, "Hub" }, { 0x04a80303, "Peripheral Switch" }, { 0x04a80404, "Peripheral Switch" }, @@ -6410,6 +6421,7 @@ static const value_string usb_products_vals[] = { { 0x04a91512, "BIJ1350D PCL" }, { 0x04a91601, "DR-2080C Scanner" }, { 0x04a91607, "DR-6080 Scanner" }, + { 0x04a91608, "DR-2580C Scanner" }, { 0x04a91700, "PIXMA MP110 Scanner" }, { 0x04a91701, "PIXMA MP130 Scanner" }, { 0x04a91702, "MP410 Composite" }, @@ -6812,6 +6824,7 @@ static const value_string usb_products_vals[] = { { 0x04a93215, "Canon EOS 60D" }, { 0x04a93217, "Canon EOS 1100D" }, { 0x04a93218, "Canon EOS 600D" }, + { 0x04a93219, "EOS 1D X" }, { 0x04a93223, "PowerShot A3300 IS" }, { 0x04a93224, "PowerShot A3200 IS" }, { 0x04a93225, "Canon IXUS 310IS" }, @@ -6839,11 +6852,14 @@ static const value_string usb_products_vals[] = { { 0x04a93243, "Canon PowerShot A4000IS" }, { 0x04a93244, "PowerShot SX260 HS" }, { 0x04a93245, "Canon PowerShot SX240HS" }, + { 0x04a93246, "PowerShot ELPH 530 HS / IXUS 510 HS" }, { 0x04a93247, "PowerShot ELPH 520 HS / IXUS 500 HS" }, { 0x04a93248, "PowerShot A3400 IS" }, { 0x04a93249, "Canon PowerShot A2400IS" }, { 0x04a9324a, "PowerShot A2300" }, { 0x04a93250, "Canon EOS 6D" }, + { 0x04a93252, "EOS 1D C" }, + { 0x04a93253, "EOS 70D" }, { 0x04a93255, "SELPHY CP900" }, { 0x04a93256, "SELPHY CP810" }, { 0x04a93258, "PowerShot G15" }, @@ -6861,7 +6877,12 @@ static const value_string usb_products_vals[] = { { 0x04a93265, "Powershot ELPH 130 IS / IXUS 140" }, { 0x04a93266, "Powershot ELPH 120 IS / IXUS 135" }, { 0x04a93268, "PowerShot ELPH 330 HS / IXUS 255 HS" }, + { 0x04a9326f, "EOS 7D Mark II" }, + { 0x04a93270, "EOS 100D" }, { 0x04a93271, "PowerShot A2500" }, + { 0x04a93272, "EOS 700D" }, + { 0x04a93274, "PowerShot G16" }, + { 0x04a93275, "PowerShot S120" }, { 0x04a93276, "PowerShot SX170 IS" }, { 0x04a93277, "PowerShot SX510 HS" }, { 0x04a93278, "PowerShot S200" }, @@ -6884,10 +6905,14 @@ static const value_string usb_products_vals[] = { { 0x04a9329f, "PowerShot SX530 HS" }, { 0x04a932a6, "PowerShot SX710 HS" }, { 0x04a932aa, "Powershot ELPH 160 / IXUS 160" }, + { 0x04a932ab, "PowerShot ELPH 350HS / IXUS 275 HS" }, { 0x04a932ac, "PowerShot ELPH 170 IS / IXUS 170" }, { 0x04a932ad, "PowerShot SX410 IS" }, { 0x04a932b1, "SELPHY CP1200" }, + { 0x04a932b2, "PowerShot G9 X" }, + { 0x04a932bb, "EOS M5" }, { 0x04a932c1, "PowerShot ELPH 180 / IXUS 175" }, + { 0x04a932c2, "PowerShot SX720 HS" }, { 0x04ad2501, "Bluetooth Device" }, { 0x04b00102, "Coolpix 990" }, { 0x04b00103, "Coolpix 880" }, @@ -7302,6 +7327,7 @@ static const value_string usb_products_vals[] = { { 0x04b91304, "iKey Token" }, { 0x04b91305, "iKey Token" }, { 0x04b91306, "iKey Token" }, + { 0x04b98000, "SafeNet Sentinel Hardware Key" }, { 0x04bb0101, "USB2-IDE/ATAPI Bridge Adapter" }, { 0x04bb0201, "USB2-IDE/ATAPI Bridge Adapter" }, { 0x04bb0204, "DVD Multi-plus unit iU-CD2" }, @@ -7591,6 +7617,7 @@ static const value_string usb_products_vals[] = { { 0x04d91818, "Keyboard [Diatec Filco Majestouch 2]" }, { 0x04d92011, "Keyboard [Diatec Filco Majestouch 1]" }, { 0x04d92013, "Keyboard [Das Keyboard]" }, + { 0x04d92206, "Fujitsu Siemens Mouse Esprimo Q" }, { 0x04d92221, "Keyboard" }, { 0x04d92323, "Keyboard" }, { 0x04d92519, "Shenzhen LogoTech 2.4GHz receiver" }, @@ -7599,6 +7626,7 @@ static const value_string usb_products_vals[] = { { 0x04d9a01c, "wireless multimedia keyboard with trackball [Trust ADURA 17911]" }, { 0x04d9a050, "Chatman V1" }, { 0x04d9a055, "Keyboard" }, + { 0x04d9a11b, "Mouse [MX-3200]" }, { 0x04da0901, "LS-120 Camera" }, { 0x04da0912, "SDR-S10" }, { 0x04da0b01, "CD-R/RW Drive" }, @@ -7608,6 +7636,7 @@ static const value_string usb_products_vals[] = { { 0x04da0d0a, "CD-R Drive KXL-CB20AN" }, { 0x04da0d0d, "CDRCB03" }, { 0x04da0d0e, "DVD-ROM & CD-R/RW" }, + { 0x04da0f07, "KX-MB2030 Multifunction Laser Printer" }, { 0x04da0f40, "Printer" }, { 0x04da104d, "Elite Panaboard UB-T880 (HID)" }, { 0x04da104e, "Elite Panaboard Pen Adaptor (HID)" }, @@ -7629,6 +7658,9 @@ static const value_string usb_products_vals[] = { { 0x04da2375, "Leica D-LUX 2" }, { 0x04da2451, "HDC-SD9" }, { 0x04da245b, "HC-X920K (3MOS Full HD video camcorder)" }, + { 0x04da2477, "SDR-H85 Camcorder (PC mode)" }, + { 0x04da2478, "SDR-H85 Camcorder (recorder mode - SD card)" }, + { 0x04da2479, "SDR-H85 Camcorder (recorder mode - HDD)" }, { 0x04da2497, "HDC-TM700" }, { 0x04da250c, "Gobi Wireless Modem (QDL mode)" }, { 0x04da250d, "Gobi Wireless Modem" }, @@ -7764,6 +7796,7 @@ static const value_string usb_products_vals[] = { { 0x04e70081, "Touchmonitor Interface" }, { 0x04e70082, "Touchmonitor Interface" }, { 0x04e700ff, "Touchmonitor Interface" }, + { 0x04e80001, "Printer Bootloader" }, { 0x04e80100, "Kingston Flash Drive (128MB)" }, { 0x04e80110, "Connect3D Flash Drive" }, { 0x04e80111, "Connect3D Flash Drive" }, @@ -7937,7 +7970,7 @@ static const value_string usb_products_vals[] = { { 0x04e86125, "D3 Station External Hard Drive" }, { 0x04e861b5, "M3 Portable Hard Drive 2TB" }, { 0x04e861b6, "M3 Portable Hard Drive 1TB" }, - { 0x04e861f3, "MU-PT500B [T3 500GB USB SSD]" }, + { 0x04e861f3, "Portable SSD T3 (MU-PT250B, MU-PT500B)" }, { 0x04e86601, "Mobile Phone" }, { 0x04e86602, "Galaxy" }, { 0x04e86603, "Galaxy" }, @@ -7987,8 +8020,8 @@ static const value_string usb_products_vals[] = { { 0x04e86860, "Galaxy (MTP)" }, { 0x04e86863, "GT-I9500 [Galaxy S4] / GT-I9250 [Galaxy Nexus] (network tethering)" }, { 0x04e86864, "GT-I9070 (network tethering, USB debugging enabled)" }, - { 0x04e86865, "GT-I9300 Phone [Galaxy S III] (PTP mode)" }, - { 0x04e86866, "GT-I9300 Phone [Galaxy S III] (debugging mode)" }, + { 0x04e86865, "Galaxy (PTP mode)" }, + { 0x04e86866, "Galaxy (debugging mode)" }, { 0x04e86868, "Escape Composite driver for Android Phones: Modem+Diagnostic+ADB" }, { 0x04e86875, "GT-B3710 Standalone LTE device (Commercial)" }, { 0x04e86876, "GT-B3710 LTE Modem" }, @@ -8122,6 +8155,7 @@ static const value_string usb_products_vals[] = { { 0x04f30214, "Lynx M9 Optical Mouse" }, { 0x04f30230, "3D Optical Mouse" }, { 0x04f30232, "Mouse" }, + { 0x04f30234, "Optical Mouse" }, { 0x04f302f4, "2.4G Cordless Mouse" }, { 0x04f30381, "Touchscreen" }, { 0x04f304a0, "Dream Cheeky Stress/Panic Button" }, @@ -8623,7 +8657,10 @@ static const value_string usb_products_vals[] = { { 0x04f92027, "QL-560 P-touch Label Printer" }, { 0x04f92028, "QL-570 P-touch Label Printer" }, { 0x04f9202b, "PT-7600 P-touch Label Printer" }, + { 0x04f92061, "PT-P700 P-touch Label Printer" }, + { 0x04f92064, "PT-P700 P-touch Label Printer RemovableDisk" }, { 0x04f92100, "Card Reader Writer" }, + { 0x04f92102, "Sewing machine" }, { 0x04f960a0, "ADS-2000" }, { 0x04f960a1, "ADS-2100" }, { 0x04f960a4, "ADS-2500W" }, @@ -9150,7 +9187,13 @@ static const value_string usb_products_vals[] = { { 0x054c061f, "Sony DSC-HX200V" }, { 0x054c0689, "Walkman NWZ-B173F" }, { 0x054c06bb, "WALKMAN NWZ-F805" }, + { 0x054c06c3, "RC-S380" }, + { 0x054c07c4, "ILCE-6000 (aka Alpha-6000) in Mass Storage mode" }, { 0x054c088c, "Portable Headphone Amplifier" }, + { 0x054c08b7, "ILCE-6000 (aka Alpha-6000) in MTP mode" }, + { 0x054c094e, "ILCE-6000 (aka Alpha-6000) in PC Remote mode" }, + { 0x054c0994, "ILCE-6000 (aka Alpha-6000) in charging mode" }, + { 0x054c0bb5, "Headset MDR-1000X" }, { 0x054c1000, "Wireless Buzz! Receiver" }, { 0x054c1294, "Sony DCR-SR75" }, { 0x05500002, "InkJet Color Printer" }, @@ -9456,6 +9499,7 @@ static const value_string usb_products_vals[] = { { 0x05721300, "SoftK56 Data Fax Voice CARP" }, { 0x05721301, "Modem Enumerator" }, { 0x05721328, "TrendNet TFM-561 modem" }, + { 0x05721804, "HP Dock Audio" }, { 0x05722000, "SoftGate 802.11 Adapter" }, { 0x05722002, "SoftGate 802.11 Adapter" }, { 0x0572262a, "tm5600 Video & Audio Grabber Capture" }, @@ -10570,6 +10614,7 @@ static const value_string usb_products_vals[] = { { 0x05dcb002, "USB CF Reader" }, { 0x05dcb018, "Multi-Card Reader" }, { 0x05dcb047, "SDHC Reader [RW047-7000]" }, + { 0x05dcb051, "microSD RDR UHS-I Card Reader [LRWM03U-7000]" }, { 0x05dcba02, "Workflow CFR1" }, { 0x05dcba0a, "Workflow DD512" }, { 0x05dcc753, "JumpDrive TwistTurn" }, @@ -10601,6 +10646,7 @@ static const value_string usb_products_vals[] = { { 0x05e30131, "CF/SM Reader/Writer" }, { 0x05e30142, "Multiple Slides Scanner-3600" }, { 0x05e30143, "Multiple Frames Film Scanner-36series" }, + { 0x05e30145, "Reflecta CrystalScan 7200 Photo-Scanner" }, { 0x05e30180, "Plustek Scanner" }, { 0x05e30182, "Wize Media 1000" }, { 0x05e30189, "ScanJet 4600 series" }, @@ -10650,6 +10696,7 @@ static const value_string usb_products_vals[] = { { 0x05e30731, "GL3310 SATA 3Gb/s Bridge Controller" }, { 0x05e30732, "All-in-One Cardreader" }, { 0x05e30736, "microSD Reader/Writer" }, + { 0x05e30738, "Card reader" }, { 0x05e30741, "microSD Card Reader" }, { 0x05e30743, "SDXC and microSDXC CardReader" }, { 0x05e30745, "Logilink CR0012" }, @@ -12421,6 +12468,7 @@ static const value_string usb_products_vals[] = { { 0x08100001, "Dual PSX Adaptor" }, { 0x08100002, "Dual PCS Adaptor" }, { 0x08100003, "PlayStation Gamepad" }, + { 0x0810e501, "SNES Gamepad" }, { 0x08130001, "Intel Play QX3 Microscope" }, { 0x08130002, "Dual Mode Camera Plus" }, { 0x08190101, "License Management and Copy Protection" }, @@ -13149,7 +13197,12 @@ static const value_string usb_products_vals[] = { { 0x09321100, "DC-1100 Video Enhamcement Device" }, { 0x09321112, "Veo Web Camera" }, { 0x0932a311, "Video Enhancement Device" }, + { 0x0936000a, "Moebius" }, + { 0x0936000b, "iMoebius" }, { 0x0936000c, "Rhythmedics 6 BioData Integrator" }, + { 0x0936000d, "Hypurius" }, + { 0x0936000e, "Millennius" }, + { 0x0936000f, "Purius" }, { 0x09360030, "Composite Device, Mass Storage Device (Flash Drive) amd HID" }, { 0x0936003c, "Rhythmedics HID Bootloader" }, { 0x09390b15, "Toshiba Stor.E Alu 2" }, diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers index 6a5f972b0f..a147a6d7a4 100644 --- a/epan/enterprise-numbers +++ b/epan/enterprise-numbers @@ -1,6 +1,6 @@ PRIVATE ENTERPRISE NUMBERS -(last updated 2017-02-11) +(last updated 2017-02-16) SMI Network Management Private Enterprise Codes: @@ -17822,9 +17822,9 @@ Decimal Frank MacLachian frankm&ibus.com 4456 - Qualimetrics - Kenny Fisher - kfisher&qualimetrics.com + AWI (formerly 'Qualimetrics') + Neal Dillman + ndillman&allweatherinc.com 4457 O ROCK ActiveWear (formerly 'Alpha & Omega Storehouse, LLC') B. Maddigan @@ -31822,7 +31822,7 @@ Decimal Dustin Sallings dustin+iana&spy.net 7967 - Tekbabble + serveroperator.com (formerly 'Tekbabble') Adam Burford iana&serveroperator.com 7968 @@ -115472,8 +115472,8 @@ Decentralization / Helenic Public Administra keio-net&itc.keio.ac.jp 28973 Landschaftsverband Rheinland (formerly 'LVR InfoKom') - Philipp Pfaff - zv.z13.app&lvr.de + Philipp Franzen + infokom.it.sec.serv&lvr.de 28974 Belarusbank Sergei Filatov @@ -192401,8 +192401,8 @@ Decentralization / Helenic Public Administra joerg.eddiks&eisenmann.com 48205 COLO21 AG - Max Zettlmeißl - m.zettlmeissl&colo21.com + Admin + admin&colo21.com 48206 SRC Incorporated Sal Yurman @@ -195266,7 +195266,7 @@ Decentralization / Helenic Public Administra 48921 Mercer Bucks Hematology Oncology Stefanie Callahan - stefanielcallahan&gmail.com + stefanie&mbhemonc.com 48922 Thales Australia Jeremy Kerwin @@ -197391,6 +197391,130 @@ Decentralization / Helenic Public Administra Dmitriy Merkushov Dmitriy Merkushov d.merkushov&gmail.com +49453 + Crab Cove Limited + Steven Griffiths + servernet1997&hotmail.com +49454 + Lobster Bay Limited + Steven Griffiths + servernet1997&hotmail.com +49455 + Oncology and Hematology Associates of South Texas, P.A. + Veronica Procasky + vprocasky&aol.com +49456 + Rottneros AB + Pasi Toivanen + val.support&rottneros.com +49457 + CM IT Services + Corrado Mulas + it-services&corradomulas.ml +49458 + Selective Insurance Company of America + Robert England + robert.england&selective.com +49459 + Baker, Donelson, Bearman, Caldwell & Berkowitz, PC + Jason Kopacko + jkopacko&bakerdonelson.com +49460 + Priora AG + Rüetschi Werner + werner.rueetschi&priora.ch +49461 + Xeen.UK LTD. + Alex Wright + alex&xeen.uk +49462 + Crinkleit + Scott Crilly + scottcrilly&crinkleit.com +49463 + Severn Trent Services + Scott Crilly + scott.crilly&stservices.co.uk +49464 + Darktide + Jenna Matthews + jrm&darktide.net +49465 + Yuki Enterprises + Jye Karl-Perry + snowleopard&amused.com.au +49466 + Helse Midt-Norge IT + Tore Tetliaune + tore.tetliaune&hemit.no +49467 + LOGISMAN ARAGÓN, S.L. + JAVIER LÓPEZ LORDA + jlopez&logisman.es +49468 + PrJSC "MTS UKRAINE" + Hablo Vladimir + vhablo&vodafone.ua +49469 + WIT + TangQianfeng + tqf&czwit.com +49470 + Community Life GmbH + Joerg Aulich + jaulich&communitylife.de +49471 + bayernets GmbH + Reinhard Melzer + reinhard.melzer&bayernets.de +49472 + Photo-Sonics, Inc + Cecil Rudenberg + crudenberg&photosonics.com +49473 + Weydstone LLC + Kai Johnson + info&suttonabinger.com +49474 + CKUA Radio Network + Ryan Breitkreitz + rbreitkreitz&ckua.com +49475 + suckleast.org Hosting Collective + Stefan Lücke + iana-pen&glaxx.net +49476 + Session Control LLC + Gerald Lester + glester&sessioncontrol.com +49477 + Vault Investing + Brent Jones + brent&getvault.com +49478 + funatic b.v. + William Janssen + william.janssen&funatic.nl +49479 + Damian Murphy Private LDAP Development + Damian Murphy + murff&warlock.org +49480 + Williams-Sonoma, Inc. (WSI) + Chris King + CKing3&wsgc.com +49481 + Vonamic GmbH + Kevin Konrad + snmp&vonamic.com +49482 + OEDIV Oetker Daten- und Informationsverarbeitung KG + Sebastian Kerssen + sebastian.kerssen&oediv.de +49483 + NYS Unified Court System + Brandon Koch + bkoch&nycourts.gov End of Document diff --git a/epan/sminmpec.c b/epan/sminmpec.c index 1aae718f53..242e0419be 100644 --- a/epan/sminmpec.c +++ b/epan/sminmpec.c @@ -4476,7 +4476,7 @@ const value_string sminmpec_values[] = { { 4453, "Infonet Services Corp." }, { 4454, "Gottfried Web and Computer Consulting" }, { 4455, "I-Bus Corporation" }, - { 4456, "Qualimetrics" }, + { 4456, "AWI (formerly 'Qualimetrics')" }, { 4457, "O ROCK ActiveWear (formerly 'Alpha & Omega Storehouse, LLC')" }, { 4458, "Radwin Ltd." }, { 4459, "Industree B.V." }, @@ -7987,7 +7987,7 @@ const value_string sminmpec_values[] = { { 7964, "Master Comunicacao e Marketing Ltda. Cass" }, { 7965, "Ingenieurbuero Tartsch" }, { 7966, "SPY internetworking" }, - { 7967, "Tekbabble" }, + { 7967, "serveroperator.com (formerly 'Tekbabble')" }, { 7968, "Spearhead Technologies Ltd." }, { 7969, "BeComm" }, { 7970, "Athelon Corporation" }, @@ -49473,6 +49473,37 @@ const value_string sminmpec_values[] = { { 49450, "DGAC SNA-RP" }, { 49451, "Molina Healthcare Inc" }, { 49452, "Dmitriy Merkushov" }, + { 49453, "Crab Cove Limited" }, + { 49454, "Lobster Bay Limited" }, + { 49455, "Oncology and Hematology Associates of South Texas, P.A. " }, + { 49456, "Rottneros AB" }, + { 49457, "CM IT Services" }, + { 49458, "Selective Insurance Company of America" }, + { 49459, "Baker, Donelson, Bearman, Caldwell & Berkowitz, PC" }, + { 49460, "Priora AG" }, + { 49461, "Xeen.UK LTD." }, + { 49462, "Crinkleit" }, + { 49463, "Severn Trent Services" }, + { 49464, "Darktide" }, + { 49465, "Yuki Enterprises" }, + { 49466, "Helse Midt-Norge IT" }, + { 49467, "LOGISMAN ARAG\0303\0223N, S.L." }, + { 49468, "PrJSC \"MTS UKRAINE\"" }, + { 49469, "WIT" }, + { 49470, "Community Life GmbH" }, + { 49471, "bayernets GmbH" }, + { 49472, "Photo-Sonics, Inc" }, + { 49473, "Weydstone LLC" }, + { 49474, "CKUA Radio Network" }, + { 49475, "suckleast.org Hosting Collective" }, + { 49476, "Session Control LLC" }, + { 49477, "Vault Investing" }, + { 49478, "funatic b.v." }, + { 49479, "Damian Murphy Private LDAP Development" }, + { 49480, "Williams-Sonoma, Inc. (WSI)" }, + { 49481, "Vonamic GmbH" }, + { 49482, "OEDIV Oetker Daten- und Informationsverarbeitung KG" }, + { 49483, "NYS Unified Court System" }, { 0, NULL} }; @@ -12089,7 +12089,7 @@ 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:40:00/36 BrivoLlc # Brivo Systems, LLC -00:50:C2:45:50:00/36 Aircell +00:50:C2:45:50:00/36 GogoBa # Gogo BA 00:50:C2:45:60:00/36 DrdcValc # DRDC Valcartier 00:50:C2:45:70:00/36 Danbridg # Danbridge 00:50:C2:45:80:00/36 HrzData # HRZ data GmbH @@ -12640,7 +12640,7 @@ 00:50:C2:67:90:00/36 Industri # Industrial Vacuum Systems 00:50:C2:67:A0:00/36 Cc # CC Systems AB 00:50:C2:67:B0:00/36 SpartonE # Sparton Electronics -00:50:C2:67:C0:00/36 Aircell +00:50:C2:67:C0:00/36 GogoBa # Gogo BA 00:50:C2:67:D0:00/36 EsaMesst # ESA Messtechnik GmbH 00:50:C2:67:E0:00/36 SaiaBurg # SAIA Burgess Controls AG 00:50:C2:67:F0:00/36 PhytecMe # Phytec Messtechnik GmbH @@ -12978,7 +12978,7 @@ 00:50:C2:7C:B0:00/36 Viewplus # ViewPlus Technologies, Inc. 00:50:C2:7C:C0:00/36 SwecoJap # SWECO JAPS AB 00:50:C2:7C:D0:00/36 Precisio # Precision MicroControl Corporation -00:50:C2:7C:E0:00/36 Aircell +00:50:C2:7C:E0:00/36 GogoBa # Gogo BA 00:50:C2:7C:F0:00/36 Emitech # Emitech Corporation 00:50:C2:7D:00:00/36 RadarTro # Radar Tronic ltd. 00:50:C2:7D:10:00/36 PhytecMe # Phytec Messtechnik GmbH @@ -14295,7 +14295,7 @@ 00:50:C2:CF:20:00/36 WeissRob # Weiss Robotics GmbH & Co. KG 00:50:C2:CF:30:00/36 DaikenAu # Daiken Automacao Ltda 00:50:C2:CF:40:00/36 Baudisch # Baudisch Electronic GmbH -00:50:C2:CF:50:00/36 Aircell +00:50:C2:CF:50:00/36 GogoBa # Gogo BA 00:50:C2:CF:60:00/36 EpecOy # Epec Oy 00:50:C2:CF:70:00/36 ArmourHo # Armour Home Electronics LTD 00:50:C2:CF:80:00/36 BeksKomm # beks Kommunikacios Technika kft @@ -14734,7 +14734,7 @@ 00:50:C2:EA:C0:00/36 AliasIp # Alias ip 00:50:C2:EA:D0:00/36 Rohde&Sc # Rohde&Schwarz Topex SA 00:50:C2:EA:E0:00/36 AlyricaN # Alyrica Networks -00:50:C2:EA:F0:00/36 Aircell +00:50:C2:EA:F0:00/36 GogoBa # Gogo BA 00:50:C2:EB:00:00/36 PulseCom # Pulse Communication Systems Pvt. Ltd. 00:50:C2:EB:10:00/36 PduExper # PDU EXPERT UK LTD 00:50:C2:EB:20:00/36 OtakiEle # Otaki Electric Corporation @@ -17178,6 +17178,7 @@ 02:E0:3B Prominet # Prominet Corporation Gigabit Ethernet Switch 02:E6:D3 BtiBus-T # BTI (Bus-Tech, Inc.) IBM Mainframes 04:02:1F HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD +04:03:D6 Nintendo # Nintendo Co.,Ltd 04:04:EA ValensSe # Valens Semiconductor Ltd. 04:0A:83 Alcatel- # Alcatel-Lucent 04:0A:E0 XmitComp # XMIT AG COMPUTER NETWORKS @@ -17259,9 +17260,11 @@ 04:71:4B:70:00:00/28 OmylisPt # Omylis Pte Ltd 04:71:4B:80:00:00/28 Energpor # Energport Inc 04:71:4B:90:00:00/28 Lighthou # Lighthouse AI, Inc +04:71:4B:A0:00:00/28 Observab # Observables, Inc. 04:71:4B:B0:00:00/28 Digibest # DIGIBEST TECHNOLOGY CO., LTD. 04:71:4B:C0:00:00/28 Kittyhaw # KittyHawk Corporation 04:71:4B:D0:00:00/28 Shenzhen # Shenzhen BoClouds Technology Co.,Ltd. +04:71:4B:E0:00:00/28 GimsoMob # Gimso Mobile Ltd 04:74:A1 AligeraE # Aligera Equipamentos Digitais Ltda 04:75:03 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 04:75:F5 Csst @@ -18226,6 +18229,7 @@ 18:2A:7B Nintendo # Nintendo Co., Ltd. 18:2B:05 8dTechno # 8D Technologies 18:2C:91 ConceptD # Concept Development, Inc. +18:2C:B4 Nectarso # Nectarsoft Co., Ltd. 18:30:09 WoojinIn # Woojin Industrial Systems Co., Ltd. 18:32:A2 LaonTech # LAON TECHNOLOGY CO., LTD. 18:33:9D Cisco # Cisco Systems, Inc @@ -18713,6 +18717,7 @@ 20:68:9D LiteonTe # Liteon Technology Corporation 20:6A:8A WistronI # Wistron Infocomm (Zhongshan) Corporation 20:6A:FF AtlasEle # Atlas Elektronik UK Limited +20:6B:E7 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 20:6C:8A Aerohive # Aerohive Networks Inc. 20:6E:9C SamsungE # Samsung Electronics Co.,Ltd 20:6F:EC BraemacC # Braemac CA LLC @@ -19245,6 +19250,7 @@ 2C:3F:3E Alge-Tim # Alge-Timing GmbH 2C:40:2B SmartIbl # Smart iBlue Technology Limited 2C:41:38 HewlettP # Hewlett Packard +2C:41:A1 Bose # Bose Corporation 2C:44:01 SamsungE # Samsung Electronics Co.,Ltd 2C:44:1B Spectrum # Spectrum Medical Limited 2C:44:FD HewlettP # Hewlett Packard @@ -19392,6 +19398,7 @@ 2C:FF:65 OkiElect # Oki Electric Industry Co., Ltd. 2E:2E:2E LaaLocal # LAA (Locally Administered Address) for Meditech Systems 30:05:5C BrotherI # Brother industries, LTD. +30:07:4D SamsungE # SAMSUNG ELECTRO-MECHANICS(THAILAND) 30:0B:9C DeltaMob # Delta Mobile Systems, Inc. 30:0C:23 Zte # zte corporation 30:0D:2A Zhejiang # Zhejiang Wellcom Technology Co.,Ltd. @@ -19493,6 +19500,7 @@ 30:B5:C2 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 30:B5:F1 AitexinT # Aitexin Technology Co., Ltd 30:B6:4F JuniperN # Juniper Networks +30:C3:D9 AlpsElec # ALPS ELECTRIC CO.,LTD. 30:C7:50 MicTechn # MIC Technology Group 30:C7:AE SamsungE # Samsung Electronics Co.,Ltd 30:C8:2A Wi-BizSr # WI-BIZ srl @@ -19578,6 +19586,7 @@ 34:36:3B Apple # Apple, Inc. 34:37:59 Zte # zte corporation 34:38:AF InlabSof # Inlab Software GmbH +34:38:B7 Humax # HUMAX Co., Ltd. 34:3D:98 Jinqianm # JinQianMao Technology Co.,Ltd. 34:3D:C4 Buffalo # BUFFALO.INC 34:40:B5 Ibm @@ -19692,6 +19701,7 @@ 34:D2:70 AmazonTe # Amazon Technologies Inc. 34:D2:C4 RenaPrin # RENA GmbH Print Systeme 34:D7:B4 Tributar # Tributary Systems, Inc. +34:D9:54 Wibotic # WiBotic Inc. 34:DB:FD Cisco # Cisco Systems, Inc 34:DE:1A IntelCor # Intel Corporate 34:DE:34 Zte # zte corporation @@ -19982,6 +19992,7 @@ 3C:49:37 AssmannE # ASSMANN Electronic GmbH 3C:4A:92 HewlettP # Hewlett Packard 3C:4C:69 Infinity # Infinity System S.L. +3C:4C:D0 CeragonN # CERAGON NETWORKS 3C:4E:47 Etronic # Etronic A/S 3C:52:82 HewlettP # Hewlett Packard 3C:57:BD KesslerC # Kessler Crane Inc. @@ -20273,7 +20284,7 @@ 40:D8:55:00:80:00/36 KaoriInd # Kaori Industria Eletronica Ltda 40:D8:55:00:90:00/36 Clearsit # ClearSite Communications Inc. 40:D8:55:00:A0:00/36 SaranaSi # Sarana Sistem Mikro -40:D8:55:00:B0:00/36 Aircell +40:D8:55:00:B0:00/36 GogoBa # Gogo BA 40:D8:55:00:C0:00/36 AplexTec # Aplex Technology Inc. 40:D8:55:00:D0:00/36 Huns 40:D8:55:00:E0:00/36 Brightwe # Brightwell Dispensers @@ -21006,7 +21017,7 @@ 48:54:15 NetRules # NET RULES TECNOLOGIA EIRELI 48:54:E8 Winbond? 48:55:5F Fiberhom # Fiberhome Telecommunication Technologies Co.,LTD -48:57:DD Facebook +48:57:DD Facebook # Facebook Inc 48:59:29 LgElectr # LG Electronics (Mobile Communications) 48:5A:3F Wisol 48:5A:B6 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. @@ -21044,6 +21055,7 @@ 48:7A:55 AleInter # ALE International 48:7A:DA Hangzhou # Hangzhou H3C Technologies Co., Limited 48:7B:6B HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD +48:7D:2E Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 48:82:44 LifeFitn # Life Fitness / Div. of Brunswick 48:82:F2 AppelEle # Appel Elektronik GmbH 48:83:C7 Sagemcom # Sagemcom Broadband SAS @@ -21207,6 +21219,7 @@ 4C:8D:79 Apple # Apple, Inc. 4C:8E:CC SilkanSa # SILKAN SA 4C:8F:A5 Jastec +4C:91:0C Corporat # Corporativo Lanix S.A. de C.V. 4C:96:14 JuniperN # Juniper Networks 4C:98:EF Zeo 4C:9E:80 KyokkoEl # KYOKKO ELECTRIC Co., Ltd. @@ -21630,6 +21643,7 @@ 54:BE:F7 Pegatron # PEGATRON CORPORATION 54:C4:15 Hangzhou # Hangzhou Hikvision Digital Technology Co.,Ltd. 54:C8:0F Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. +54:C9:DF Fn-LinkT # FN-LINK TECHNOLOGY LIMITED 54:CD:10 Panasoni # Panasonic Mobile Communications Co.,Ltd. 54:CD:A7 FujianSh # Fujian Shenzhou Electronic Co.,Ltd 54:CD:EE Shenzhen # ShenZhen Apexis Electronic Co.,Ltd @@ -21859,6 +21873,7 @@ 5C:17:37 I-ViewNo # I-View Now, LLC. 5C:17:D3 Lge 5C:18:B5 TalonCom # Talon Communications +5C:1A:6F Cambridg # Cambridge Industries(Group) Co.,Ltd. 5C:20:D0 AsoniCom # Asoni Communication Co., Ltd. 5C:22:C4 DaeEunEl # DAE EUN ELETRONICS CO., LTD 5C:24:43 O-SungTe # O-Sung Telecom Co., Ltd. @@ -22605,6 +22620,7 @@ 6C:5D:63 Shenzhen # ShenZhen Rapoo Technology Co., Ltd. 6C:5E:7A Ubiquito # Ubiquitous Internet Telecom Co., Ltd 6C:5F:1C LenovoMo # Lenovo Mobile Communication Technology Ltd. +6C:60:EB ZhiYuanE # ZHI YUAN ELECTRONICS CO., LIMITED 6C:61:26 RinicomH # Rinicom Holdings 6C:62:6D Micro-St # Micro-Star INT'L CO., LTD 6C:64:1A PenguinC # Penguin Computing @@ -22848,6 +22864,7 @@ 70:B2:65 HiltronS # Hiltron s.r.l. 70:B3:D5 IeeeRegi # IEEE Registration Authority 70:B3:D5:00:10:00/36 SorediTo # SOREDI touch systems GmbH +70:B3:D5:00:20:00/36 GogoBa # Gogo BA 70:B3:D5:00:90:00/36 Holidayc # HolidayCoro 70:B3:D5:00:E0:00/36 Magosys # Magosys Systems LTD 70:B3:D5:01:00:00/36 HanwaEle # Hanwa Electronic Ind.Co.,Ltd. @@ -23155,6 +23172,7 @@ 70:B3:D5:2B:B0:00/36 Automati # Automation Networks & Solutions LLC 70:B3:D5:2B:C0:00/36 EquiposD # EQUIPOS DE TELECOMUNICACIÓN OPTOELECTRÓNICOS, S.A. 70:B3:D5:2B:E0:00/36 Coherent # Coherent Logix, Inc. +70:B3:D5:2C:20:00/36 QuantumD # Quantum Detectors 70:B3:D5:2C:30:00/36 Proterra 70:B3:D5:2C:E0:00/36 Kdt 70:B3:D5:2C:F0:00/36 MbConnec # MB Connect Line GmbH @@ -23347,6 +23365,7 @@ 70:B3:D5:47:C0:00/36 Par-Tech # Par-Tech, Inc. 70:B3:D5:48:20:00/36 AeryonLa # Aeryon Labs Inc 70:B3:D5:48:60:00/36 Chongqin # ChongQing JianTao Technology Co., Ltd. +70:B3:D5:48:90:00/36 ArdSa # ard sa 70:B3:D5:48:A0:00/36 GeorgeWi # George Wilson Industries Ltd 70:B3:D5:48:C0:00/36 Integrat # Integrated Systems Engineering, Inc. 70:B3:D5:48:D0:00/36 OmegaBil # OMEGA BILANCE SRL SOCIETA' UNIPERSONALE @@ -23443,6 +23462,7 @@ 70:B3:D5:56:30:00/36 Zhejiang # Zhejiang Hao Teng Electronic Technology Co., Ltd. 70:B3:D5:56:40:00/36 Christma # christmann informationstechnik + medien GmbH & Co. KG 70:B3:D5:57:00:00/36 BayernEn # Bayern Engineering GmbH & Co. KG +70:B3:D5:57:20:00/36 Crde 70:B3:D5:57:80:00/36 ImageTec # IMAGE TECH CO.,LTD 70:B3:D5:57:B0:00/36 Elamakat # ELAMAKATO GmbH 70:B3:D5:57:C0:00/36 Automata # Automata GmbH & Co. KG @@ -23840,6 +23860,7 @@ 70:B3:D5:92:30:00/36 EumigInd # eumig industrie-tv GmbH 70:B3:D5:92:40:00/36 Meridian # Meridian Technologies Inc 70:B3:D5:92:50:00/36 Diamante # Diamante Lighting Srl +70:B3:D5:92:70:00/36 LgElectr # LG Electronics 70:B3:D5:92:90:00/36 Outsys 70:B3:D5:92:A0:00/36 Miravue 70:B3:D5:93:00:00/36 Institut # The Institute of Mine Seismology @@ -23882,6 +23903,7 @@ 70:B3:D5:99:A0:00/36 Kevic # KEVIC. inc, 70:B3:D5:99:E0:00/36 TrinityC # Trinity College Dublin 70:B3:D5:99:F0:00/36 ConfedBV # Confed Holding B.V. +70:B3:D5:9A:10:00/36 ItsIndus # ITS Industrial Turbine Services GmbH 70:B3:D5:9A:70:00/36 Honeywel # Honeywell 70:B3:D5:9A:D0:00/36 FortunaI # Fortuna Impex Pvt ltd 70:B3:D5:9A:E0:00/36 Volansys # Volansys technologies pvt ltd @@ -23975,6 +23997,7 @@ 70:B3:D5:A6:E0:00/36 JscElect # JSC Electrical Equipment Factory 70:B3:D5:A6:F0:00/36 8cups 70:B3:D5:A7:20:00/36 Business # Business Marketers Group, Inc. +70:B3:D5:A7:30:00/36 Mobiprom # MobiPromo 70:B3:D5:A7:80:00/36 Bionics # Bionics co.,ltd. 70:B3:D5:A7:A0:00/36 FluidMan # Fluid Management Technology 70:B3:D5:A7:C0:00/36 Transele # Transelektronik Messgeräte GmbH @@ -24039,6 +24062,7 @@ 70:B3:D5:AF:30:00/36 NewJapan # New Japan Radio Co., Ltd 70:B3:D5:AF:40:00/36 TattileS # TATTILE SRL 70:B3:D5:AF:50:00/36 NetAndPr # Net And Print Inc. +70:B3:D5:AF:60:00/36 SCESrl # S.C.E. srl 70:B3:D5:AF:70:00/36 Dimosyst # DimoSystems BV 70:B3:D5:AF:90:00/36 Critical # Critical Link LLC 70:B3:D5:AF:A0:00/36 PowerSec # Power Security Systems Ltd. @@ -24142,6 +24166,7 @@ 70:B3:D5:BE:F0:00/36 Sensorte # Sensortech Systems Inc. 70:B3:D5:BF:10:00/36 Flashnet # Flashnet SRL 70:B3:D5:BF:20:00/36 TwinDeve # TWIN DEVELOPMENT +70:B3:D5:BF:30:00/36 Cg-Wirel # CG-WIRELESS 70:B3:D5:BF:50:00/36 AcaciaRe # Acacia Research 70:B3:D5:BF:E0:00/36 AplexTec # Aplex Technology Inc. 70:B3:D5:C0:10:00/36 Smartgua # SmartGuard LLC @@ -24183,7 +24208,7 @@ 70:B3:D5:C5:B0:00/36 AcdElekt # ACD Elektronik GmbH 70:B3:D5:C5:C0:00/36 LayerLog # Layer Logic Inc 70:B3:D5:C5:D0:00/36 FoshanSh # FOSHAN SHILANTIAN NETWORK S.T. CO., LTD. -70:B3:D5:C6:00:00/36 Aircell # Aircell Inc +70:B3:D5:C6:00:00/36 GogoBa # Gogo BA 70:B3:D5:C6:10:00/36 JcHunter # JC HUNTER TECHNOLOGIES 70:B3:D5:C6:20:00/36 Wiznova 70:B3:D5:C6:30:00/36 XentechS # Xentech Solutions Limited @@ -24468,6 +24493,7 @@ 70:B3:D5:F1:A0:00/36 SatorCon # Sator Controls s.r.o. 70:B3:D5:F1:D0:00/36 Critical # Critical Link LLC 70:B3:D5:F1:E0:00/36 AtxNetwo # ATX NETWORKS LTD +70:B3:D5:F1:F0:00/36 Hkc # HKC Limited 70:B3:D5:F2:A0:00/36 WibondIn # WIBOND Informationssysteme GmbH 70:B3:D5:F2:B0:00/36 Sensys # SENSYS GmbH 70:B3:D5:F2:C0:00/36 HengenTe # Hengen Technologies GmbH @@ -24477,6 +24503,7 @@ 70:B3:D5:F3:40:00/36 MacgrayS # MacGray Services 70:B3:D5:F3:50:00/36 Carbontr # carbonTRACK 70:B3:D5:F3:60:00/36 Dinosys +70:B3:D5:F3:70:00/36 Mitsubis # Mitsubishi Electric Micro-Computer Application Software Co.,Ltd. 70:B3:D5:F3:80:00/36 Scanvaeg # Scanvaegt Nordic A/S 70:B3:D5:F3:90:00/36 ZenrosAp # Zenros ApS 70:B3:D5:F3:B0:00/36 EpdmPty # Epdm Pty Ltd @@ -24560,6 +24587,7 @@ 70:B3:D5:FE:90:00/36 CamsatPr # Camsat Przemysław Gralak 70:B3:D5:FE:B0:00/36 LesDistr # Les distributions Multi-Secure incorporee 70:B3:D5:FE:C0:00/36 Finder # Finder SpA +70:B3:D5:FF:10:00/36 DataStra # Data Strategy Limited 70:B3:D5:FF:30:00/36 AplexTec # Aplex Technology Inc. 70:B3:D5:FF:40:00/36 Serveron # Serveron Corporation 70:B3:D5:FF:50:00/36 ProlanPr # Prolan Process Control Co. @@ -24769,6 +24797,7 @@ 74:D7:CA Panasoni # Panasonic Corporation Automotive 74:D8:50 Evrisko # Evrisko Systems 74:DA:38 EdimaxTe # Edimax Technology Co. Ltd. +74:DA:DA D-LinkIn # D-Link International 74:DA:EA TexasIns # Texas Instruments 74:DB:D1 Ebay # Ebay Inc 74:DE:2B LiteonTe # Liteon Technology Corporation @@ -25174,6 +25203,7 @@ 7C:82:2D Nortec 7C:82:74 Shenzhen # Shenzhen Hikeen Technology CO.,LTD 7C:83:06 GlenDimp # Glen Dimplex Nordic as +7C:8B:CA Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 7C:8D:91 Shanghai # Shanghai Hongzhuo Information Technology co.,LTD 7C:8E:E4 TexasIns # Texas Instruments 7C:91:22 SamsungE # Samsung Electronics Co.,Ltd @@ -25801,6 +25831,7 @@ 88:AD:43 Pegatron # PEGATRON CORPORATION 88:AD:D2 SamsungE # Samsung Electronics Co.,Ltd 88:AE:1D CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD. +88:B1:11 IntelCor # Intel Corporate 88:B1:68 DeltaCon # Delta Control GmbH 88:B1:E1 MojoNetw # Mojo Networks, Inc. 88:B6:27 GembirdE # Gembird Europe BV @@ -26873,6 +26904,7 @@ A0:A8:CD IntelCor # Intel Corporate A0:AA:FD Erathink # EraThink Technologies Corp. A0:AB:1B D-LinkIn # D-Link International A0:AD:A1 JmrElect # JMR Electronics, Inc +A0:AF:BD IntelCor # Intel Corporate A0:B1:00 Shenzhen # ShenZhen Cando Electronics Co.,Ltd A0:B3:CC HewlettP # Hewlett Packard A0:B4:37 GdMissio # GD Mission Systems @@ -27085,6 +27117,7 @@ A4:70:D6 Motorola # Motorola Mobility LLC, a Lenovo Company A4:71:74 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD A4:77:33 Google # Google, Inc. A4:77:60 Nokia # Nokia Corporation +A4:78:86 Avaya # Avaya Inc A4:79:E4 Klinfo # KLINFO Corp A4:7A:A4 ArrisGro # ARRIS Group, Inc. A4:7A:CF VibicomC # VIBICOM COMMUNICATIONS INC. @@ -27366,6 +27399,7 @@ AC:47:23 Genelec AC:48:2D RalinwiN # Ralinwi Nanjing Electronic Technology Co., Ltd. AC:4A:FE HisenseB # Hisense Broadband Multimedia Technology Co.,Ltd. AC:4B:C8 JuniperN # Juniper Networks +AC:4E:2E Shenzhen # Shenzhen JingHanDa Electronics Co.Ltd AC:4E:91 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD AC:4F:FC Svs-Vist # SVS-VISTEK GmbH AC:50:36 Pi-Coral # Pi-Coral Inc @@ -27564,6 +27598,7 @@ B0:48:7A Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. B0:49:5F OmronHea # OMRON HEALTHCARE Co., Ltd. B0:4B:BF PtHanSun # PT HAN SUNG ELECTORONICS INDONESIA B0:4C:05 Freseniu # Fresenius Medical Care Deutschland GmbH +B0:4E:26 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. B0:50:BC Shenzhen # SHENZHEN BASICOM ELECTRONIC CO.,LTD. B0:51:8E HollTech # Holl technology CO.Ltd. B0:52:16 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. @@ -27602,6 +27637,7 @@ B0:86:9E Chloride # Chloride S.r.L B0:88:07 StrataWo # Strata Worldwide B0:89:00 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD B0:89:91 Lge +B0:89:C2 Zyptonit # Zyptonite B0:8E:1A Uradio # URadio Systems Co., Ltd B0:90:74 FulanEle # Fulan Electronics Limited B0:91:22 TexasIns # Texas Instruments @@ -28728,7 +28764,7 @@ C8:D7:19 Cisco-Li # Cisco-Linksys, LLC C8:D7:79 QingdaoH # Qingdao Haier Telecom Co.，Ltd C8:D7:B0 SamsungE # Samsung Electronics Co.,Ltd C8:DD:C9 LenovoMo # Lenovo Mobile Communication Technology Ltd. -C8:DE:51 IntegraN # Integra Networks, Inc. +C8:DE:51 Integrao # IntegraOptics C8:DF:7C Nokia # Nokia Corporation C8:E0:EB Apple # Apple, Inc. C8:E1:30 Milkyway # Milkyway Group Ltd @@ -29502,6 +29538,7 @@ D8:EB:97 Trendnet # TRENDnet, Inc. D8:EE:78 MoogProt # Moog Protokraft D8:EF:CD Nokia D8:F0:F2 Zeebo # Zeebo Inc +D8:F1:F0 PepximIn # Pepxim International Limited D8:F7:10 LibreWir # Libre Wireless Technologies Inc. D8:FB:11 Axacore D8:FB:5E AskeyCom # ASKEY COMPUTER CORP @@ -29628,6 +29665,7 @@ DC:AE:04 Celoxica # CELOXICA Ltd DC:B0:58 BürkertW # Bürkert Werke GmbH DC:B3:B4 Honeywel # Honeywell Environmental & Combustion Controls (Tianjin) Co., Ltd. DC:B4:C4 Microsof # Microsoft XCG +DC:BE:7A Zhejiang # Zhejiang Nurotron Biotechnology Co. DC:BF:90 HuizhouQ # HUIZHOU QIAOXING TELECOMMUNICATION INDUSTRY CO.,LTD. DC:C0:DB Shenzhen # Shenzhen Kaiboer Technology Co., Ltd. DC:C0:EB AssaAblo # ASSA ABLOY CÔTE PICARDE @@ -30358,6 +30396,16 @@ F0:1F:AF Dell # Dell Inc. F0:21:9D Cal-Comp # Cal-Comp Electronics & Communications Company Ltd. F0:22:4E EsanElec # Esan electronic co. F0:23:29 ShowaDen # SHOWA DENKI CO.,LTD. +F0:23:B9 IeeeRegi # IEEE Registration Authority +F0:23:B9:00:00:00/28 Aquametr # Aquametro AG +F0:23:B9:10:00:00/28 Ubiant +F0:23:B9:60:00:00/28 XiamenJi # Xiamen Jinhaode Electronic Co.,Ltd +F0:23:B9:70:00:00/28 Transcen # Transcend Building Automation control network corporation +F0:23:B9:80:00:00/28 G3Techno # G3 TECHNOLOGIES< INC +F0:23:B9:90:00:00/28 EmuTechn # Emu Technology +F0:23:B9:B0:00:00/28 QCoreMed # Q Core Medical Ltd +F0:23:B9:C0:00:00/28 Shenzhen # Shenzhen Lachesis Mhealth Co., Ltd. +F0:23:B9:D0:00:00/28 Private F0:24:05 OpusHigh # OPUS High Technology Corporation F0:24:08 TalarisS # Talaris (Sweden) AB F0:24:75 Apple # Apple, Inc. @@ -30482,6 +30530,7 @@ F0:D1:B8 Ledvance F0:D2:F1 AmazonTe # Amazon Technologies Inc. F0:D3:A7 Cobaltra # CobaltRay Co., Ltd F0:D3:E7 Sensomet # Sensometrix SA +F0:D4:F6 LarsThra # Lars Thrane A/S F0:D5:BF IntelCor # Intel Corporate F0:D6:57 Echosens F0:D7:67 AxemaPas # Axema Passagekontroll AB @@ -30640,6 +30689,7 @@ F4:9F:F3 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD F4:A2:94 EagleWor # EAGLE WORLD DEVELOPMENT CO., LIMITED F4:A5:2A HawaTech # Hawa Technologies Inc F4:A7:39 JuniperN # Juniper Networks +F4:A9:97 Canon # CANON INC. F4:AC:C1 Cisco # Cisco Systems, Inc F4:B1:64 Lightnin # Lightning Telecommunications Technology Co. Ltd F4:B3:81 Windowma # WindowMaster A/S @@ -30905,6 +30955,7 @@ FC:00:12 ToshibaS # Toshiba Samsung Storage Technolgoy Korea Corpo FC:01:9E Vievu FC:01:CD Fundacio # FUNDACION TEKNIKER FC:06:47 Cortland # Cortland Research, LLC +FC:06:ED M2motive # M2Motive Technology Inc. FC:07:A0 LreMedic # LRE Medical GmbH FC:08:4A Fujitsu # FUJITSU LIMITED FC:08:77 PrentkeR # Prentke Romich Company @@ -30958,6 +31009,7 @@ FC:48:EF HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD FC:4A:E9 Castlene # Castlenet Technology Inc. FC:4B:1C Intersen # INTERSENSOR S.R.L. FC:4B:BC SunplusT # Sunplus Technology Co., Ltd. +FC:4D:8C Shenzhen # SHENZHEN PANTE ELECTRONICS TECHNOLOGY CO., LTD FC:4D:D4 Universa # Universal Global Scientific Industrial Co., Ltd. FC:50:90 SimexSpZ # SIMEX Sp. z o.o. FC:51:A4 ArrisGro # ARRIS Group, Inc. @@ -7778,6 +7778,8 @@ dsmipv6 4191/udp # Dual Stack MIPv6 NAT Traversal [RFC5555] azeti 4192/tcp # Azeti Agent Service [Uwe_Holz] [Uwe_Holz] 2009-11-09 azeti-bd 4192/udp # azeti blinddate [Michael_Werski] [Michael_Werski] 2010-02-18 pvxplusio 4193/tcp # PxPlus remote file srvr [Mike_King] [Mike_King] 2009-11-09 +hctl 4197/tcp # Harman HControl Protocol [Harman_International_Industries_Inc] [Darin_Smith] 2017-02-16 +hctl 4197/udp # Harman HControl Protocol [Harman_International_Industries_Inc] [Darin_Smith] 2017-02-16 eims-admin 4199/tcp # EIMS ADMIN [Glenn_Anderson] [Glenn_Anderson] eims-admin 4199/udp # EIMS ADMIN [Glenn_Anderson] [Glenn_Anderson] corelccam 4300/tcp # Corel CCam [Jason_Aiken] [Jason_Aiken] diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts index cedd4c6091..811cda5c75 100644 --- a/ui/qt/wireshark_de.ts +++ b/ui/qt/wireshark_de.ts @@ -9600,57 +9600,57 @@ text-decoration: underline; <translation> vor dem Öffnen einer anderen Datei</translation> </message> <message> - <location filename="main_window_slots.cpp" line="712"/> + <location filename="main_window_slots.cpp" line="731"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> <message> - <location filename="main_window_slots.cpp" line="817"/> + <location filename="main_window_slots.cpp" line="836"/> <source>Saving %1</source> <translation>Speichere %1</translation> </message> <message> - <location filename="main_window_slots.cpp" line="857"/> + <location filename="main_window_slots.cpp" line="876"/> <source>No interface selected</source> <translation>Keine Schnittstelle ausgewählt</translation> </message> <message> - <location filename="main_window_slots.cpp" line="867"/> + <location filename="main_window_slots.cpp" line="886"/> <source>Invalid capture filter</source> <translation>Ungültiger Mitschnittfilter</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1115"/> + <location filename="main_window_slots.cpp" line="1134"/> <source>Clear Menu</source> <translation>Menüeinträge löschen</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1598"/> + <location filename="main_window_slots.cpp" line="1617"/> <source>Please wait while Wireshark is initializing</source> <translation>Bitte Warten während Wireshark initialisiert wird</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1699"/> + <location filename="main_window_slots.cpp" line="1718"/> <source> before closing the file</source> <translation> vor dem Schließen der Datei</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1781"/> + <location filename="main_window_slots.cpp" line="1800"/> <source>Export Selected Packet Bytes</source> <translation>Ausgewählte Paketbytes exportieren</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1847"/> + <location filename="main_window_slots.cpp" line="1866"/> <source>No Keys</source> <translation>Keine Schlüssel</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1848"/> + <location filename="main_window_slots.cpp" line="1867"/> <source>There are no SSL Session Keys to save.</source> <translation>Es sind keine SSL Sitzungsschlüssel zum Speichern vorhanden.</translation> </message> <message numerus="yes"> - <location filename="main_window_slots.cpp" line="1854"/> + <location filename="main_window_slots.cpp" line="1873"/> <source>Export SSL Session Keys (%Ln key(s))</source> <oldsource>Export SSL Session Keys (%1 key%2</oldsource> <translation> @@ -9659,74 +9659,74 @@ text-decoration: underline; </translation> </message> <message> - <location filename="main_window_slots.cpp" line="1783"/> + <location filename="main_window_slots.cpp" line="1802"/> <source>Raw data (*.bin *.dat *.raw);;All Files (</source> <translation>Rohdaten (*.bin *.dat *.raw);; Alle Dateien (</translation> </message> <message> - <location filename="main_window_slots.cpp" line="762"/> + <location filename="main_window_slots.cpp" line="781"/> <source>Merging files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="1858"/> + <location filename="main_window_slots.cpp" line="1877"/> <source>SSL Session Keys (*.keys *.txt);;All Files (</source> <translation>SSL Sitzungsschlüssel (*.keys *.txt);; Alle Dateien (</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1976"/> + <location filename="main_window_slots.cpp" line="1995"/> <source>Couldn't copy text. Try another item.</source> <translation>Text konnte nicht kopiert werden. Probieren sie einen anderen Eintrag.</translation> </message> <message> - <location filename="main_window_slots.cpp" line="2382"/> - <location filename="main_window_slots.cpp" line="3493"/> + <location filename="main_window_slots.cpp" line="2405"/> + <location filename="main_window_slots.cpp" line="3516"/> <source>Unable to build conversation filter.</source> <translation>Verbindungsfilter kann nicht erstellt werden.</translation> </message> <message> - <location filename="main_window_slots.cpp" line="2532"/> - <location filename="main_window_slots.cpp" line="2545"/> + <location filename="main_window_slots.cpp" line="2555"/> + <location filename="main_window_slots.cpp" line="2568"/> <source> before reloading the file</source> <translation> vor dem Neuladen der Datei</translation> </message> <message> - <location filename="main_window_slots.cpp" line="2579"/> + <location filename="main_window_slots.cpp" line="2602"/> <source>No filter available. Try another </source> <translation>Kein Filter verfügbar. Probieren Sie einen anderen.</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3500"/> + <location filename="main_window_slots.cpp" line="3523"/> <source>Error compiling filter for this conversation.</source> <translation>Fehler beim Erstellen eines Filters für diese Verbindung.</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3509"/> + <location filename="main_window_slots.cpp" line="3532"/> <source>No previous/next packet in conversation.</source> <translation>Kein vorheriges/nächstes Paket in dieser Verbindung.</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3586"/> + <location filename="main_window_slots.cpp" line="3609"/> <source>No Interface Selected</source> <translation>Keine Schnittstelle ausgewählt</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3593"/> + <location filename="main_window_slots.cpp" line="3616"/> <source> before starting a new capture</source> <translation> vor dem Starten einer neuen Aufzeichnung</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3611"/> + <location filename="main_window_slots.cpp" line="3634"/> <source> before restarting the capture</source> <translation> vor dem Neustart der Aufzeichnung</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3819"/> + <location filename="main_window_slots.cpp" line="3842"/> <source>Wiki Page for %1</source> <translation>Wikiseite für &1</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3820"/> + <location filename="main_window_slots.cpp" line="3843"/> <source><p>The Wireshark Wiki is maintained by the community.</p><p>The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.</p><p>Proceed to the wiki?</p></source> <translation><p>Das Wireshark Wiki wird durch die Community gepflegt.</p><p>Die Seite, die aufgerufen werden soll, kann wundervoll, unvollständig, falsch oder gar nicht vorhanden sein.</p><p>Zum Wiki gehen?</p></translation> </message> @@ -10593,7 +10593,7 @@ text-decoration: underline; <translation>Wert</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="402"/> + <location filename="preferences_dialog.cpp" line="403"/> <source>Preferences</source> <translation>Einstellungen</translation> </message> @@ -10682,8 +10682,9 @@ text-decoration: underline; </message> <message> <location filename="profile_dialog.ui" line="60"/> - <source>Remove this profile. The Default profile and system provided profiles cannot be removed.</source> - <translation>Dieses Profil entfernen. Das Standardprofil und vorgegebene Profile können nicht entfernt werden.</translation> + <source>Remove this profile. System provided profiles cannot be removed.</source> + <oldsource>Remove this profile. The Default profile and system provided profiles cannot be removed.</oldsource> + <translation type="unfinished">Dieses Profil entfernen. Das Standardprofil und vorgegebene Profile können nicht entfernt werden.</translation> </message> <message> <location filename="profile_dialog.ui" line="71"/> @@ -10696,42 +10697,57 @@ text-decoration: underline; <translation>Profile konfigurieren</translation> </message> <message> - <location filename="profile_dialog.cpp" line="170"/> + <location filename="profile_dialog.cpp" line="163"/> + <source>Will be reset to default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="179"/> <source>Created from %1</source> <translation>Erstellt von %1</translation> </message> <message> - <location filename="profile_dialog.cpp" line="175"/> + <location filename="profile_dialog.cpp" line="181"/> + <source>(system provided)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="187"/> <source>Created from default settings</source> <translation>Erstellt aus den Standardeinstellungen</translation> </message> <message> - <location filename="profile_dialog.cpp" line="178"/> + <location filename="profile_dialog.cpp" line="190"/> <source>Renamed from %1</source> <translation>Umbenannt von %1</translation> </message> <message> - <location filename="profile_dialog.cpp" line="184"/> + <location filename="profile_dialog.cpp" line="196"/> <source>Go to %1</source> <translation>Gehe zu %1</translation> </message> <message> - <location filename="profile_dialog.cpp" line="209"/> + <location filename="profile_dialog.cpp" line="221"/> <source>This is a system provided profile.</source> <translation>Dies ist ein vorgegebenes Profil.</translation> </message> <message> - <location filename="profile_dialog.cpp" line="213"/> + <location filename="profile_dialog.cpp" line="225"/> <source>A profile already exists with this name.</source> <translation>Ein Profil mit diesem Namen existiert bereits.</translation> </message> <message> - <location filename="profile_dialog.cpp" line="218"/> + <location filename="profile_dialog.cpp" line="230"/> <source>A profile already exists with this name</source> <translation>Ein Profil mit diesem Namen existiert bereits.</translation> </message> <message> - <location filename="profile_dialog.cpp" line="317"/> + <location filename="profile_dialog.cpp" line="234"/> + <source>The profile will be reset to default values.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="355"/> <source>Profile Error</source> <translation>Profil Fehler</translation> </message> @@ -10906,22 +10922,22 @@ text-decoration: underline; <context> <name>QObject</name> <message> - <location filename="preferences_dialog.cpp" line="122"/> + <location filename="preferences_dialog.cpp" line="123"/> <source>Default</source> <translation type="unfinished">Standard</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="124"/> + <location filename="preferences_dialog.cpp" line="125"/> <source>Changed</source> <translation type="unfinished">Geändert</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="142"/> + <location filename="preferences_dialog.cpp" line="143"/> <source>Has this preference been changed?</source> <translation>Wurde diese Einstellung geändert?</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="152"/> + <location filename="preferences_dialog.cpp" line="153"/> <source>Default value is empty</source> <translation>Standardwert ist leer</translation> </message> @@ -11457,7 +11473,7 @@ text-decoration: underline; </message> <message> <location filename="lte_rlc_statistics_dialog.cpp" line="176"/> - <location filename="preferences_dialog.cpp" line="120"/> + <location filename="preferences_dialog.cpp" line="121"/> <source>Unknown</source> <translation>Unbekannt</translation> </message> @@ -15995,6 +16011,29 @@ text-decoration: underline; </message> </context> <context> + <name>WiresharkApplication</name> + <message> + <location filename="wireshark_application.cpp" line="582"/> + <source>Dell Backup and Recovery Found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="583"/> + <source>You appear to be running Dell Backup and Recovery 1.8.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="584"/> + <source>DBAR can make many applications crash <a href="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12036">including Wireshark</a>.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="588"/> + <source>Offending DLL: %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>WiresharkDialog</name> <message> <location filename="wireshark_dialog.cpp" line="122"/> diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts index 6cb7bc2124..e3e66a1d91 100644 --- a/ui/qt/wireshark_en.ts +++ b/ui/qt/wireshark_en.ts @@ -9346,57 +9346,57 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="712"/> + <location filename="main_window_slots.cpp" line="731"/> <source>%1: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="817"/> + <location filename="main_window_slots.cpp" line="836"/> <source>Saving %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="857"/> + <location filename="main_window_slots.cpp" line="876"/> <source>No interface selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="867"/> + <location filename="main_window_slots.cpp" line="886"/> <source>Invalid capture filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="1115"/> + <location filename="main_window_slots.cpp" line="1134"/> <source>Clear Menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="1598"/> + <location filename="main_window_slots.cpp" line="1617"/> <source>Please wait while Wireshark is initializing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="1699"/> + <location filename="main_window_slots.cpp" line="1718"/> <source> before closing the file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="1781"/> + <location filename="main_window_slots.cpp" line="1800"/> <source>Export Selected Packet Bytes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="1847"/> + <location filename="main_window_slots.cpp" line="1866"/> <source>No Keys</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="1848"/> + <location filename="main_window_slots.cpp" line="1867"/> <source>There are no SSL Session Keys to save.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="main_window_slots.cpp" line="1854"/> + <location filename="main_window_slots.cpp" line="1873"/> <source>Export SSL Session Keys (%Ln key(s))</source> <oldsource>Export SSL Session Keys (%1 key%2</oldsource> <translation> @@ -9405,74 +9405,74 @@ a:hover { </translation> </message> <message> - <location filename="main_window_slots.cpp" line="1783"/> + <location filename="main_window_slots.cpp" line="1802"/> <source>Raw data (*.bin *.dat *.raw);;All Files (</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="762"/> + <location filename="main_window_slots.cpp" line="781"/> <source>Merging files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="1858"/> + <location filename="main_window_slots.cpp" line="1877"/> <source>SSL Session Keys (*.keys *.txt);;All Files (</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="1976"/> + <location filename="main_window_slots.cpp" line="1995"/> <source>Couldn't copy text. Try another item.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="2382"/> - <location filename="main_window_slots.cpp" line="3493"/> + <location filename="main_window_slots.cpp" line="2405"/> + <location filename="main_window_slots.cpp" line="3516"/> <source>Unable to build conversation filter.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="2532"/> - <location filename="main_window_slots.cpp" line="2545"/> + <location filename="main_window_slots.cpp" line="2555"/> + <location filename="main_window_slots.cpp" line="2568"/> <source> before reloading the file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="2579"/> + <location filename="main_window_slots.cpp" line="2602"/> <source>No filter available. Try another </source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="3500"/> + <location filename="main_window_slots.cpp" line="3523"/> <source>Error compiling filter for this conversation.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="3509"/> + <location filename="main_window_slots.cpp" line="3532"/> <source>No previous/next packet in conversation.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="3586"/> + <location filename="main_window_slots.cpp" line="3609"/> <source>No Interface Selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="3593"/> + <location filename="main_window_slots.cpp" line="3616"/> <source> before starting a new capture</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="3611"/> + <location filename="main_window_slots.cpp" line="3634"/> <source> before restarting the capture</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="3819"/> + <location filename="main_window_slots.cpp" line="3842"/> <source>Wiki Page for %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="3820"/> + <location filename="main_window_slots.cpp" line="3843"/> <source><p>The Wireshark Wiki is maintained by the community.</p><p>The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.</p><p>Proceed to the wiki?</p></source> <translation type="unfinished"></translation> </message> @@ -10313,7 +10313,7 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="preferences_dialog.cpp" line="402"/> + <location filename="preferences_dialog.cpp" line="403"/> <source>Preferences</source> <translation type="unfinished"></translation> </message> @@ -10390,7 +10390,8 @@ a:hover { </message> <message> <location filename="profile_dialog.ui" line="60"/> - <source>Remove this profile. The Default profile and system provided profiles cannot be removed.</source> + <source>Remove this profile. System provided profiles cannot be removed.</source> + <oldsource>Remove this profile. The Default profile and system provided profiles cannot be removed.</oldsource> <translation type="unfinished"></translation> </message> <message> @@ -10404,42 +10405,57 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="profile_dialog.cpp" line="170"/> + <location filename="profile_dialog.cpp" line="163"/> + <source>Will be reset to default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="179"/> <source>Created from %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="profile_dialog.cpp" line="175"/> + <location filename="profile_dialog.cpp" line="181"/> + <source>(system provided)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="187"/> <source>Created from default settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="profile_dialog.cpp" line="178"/> + <location filename="profile_dialog.cpp" line="190"/> <source>Renamed from %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="profile_dialog.cpp" line="184"/> + <location filename="profile_dialog.cpp" line="196"/> <source>Go to %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="profile_dialog.cpp" line="209"/> + <location filename="profile_dialog.cpp" line="221"/> <source>This is a system provided profile.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="profile_dialog.cpp" line="213"/> + <location filename="profile_dialog.cpp" line="225"/> <source>A profile already exists with this name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="profile_dialog.cpp" line="218"/> + <location filename="profile_dialog.cpp" line="230"/> <source>A profile already exists with this name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="profile_dialog.cpp" line="317"/> + <location filename="profile_dialog.cpp" line="234"/> + <source>The profile will be reset to default values.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="355"/> <source>Profile Error</source> <translation type="unfinished"></translation> </message> @@ -10614,22 +10630,22 @@ a:hover { <context> <name>QObject</name> <message> - <location filename="preferences_dialog.cpp" line="122"/> + <location filename="preferences_dialog.cpp" line="123"/> <source>Default</source> <translation type="unfinished"></translation> </message> <message> - <location filename="preferences_dialog.cpp" line="124"/> + <location filename="preferences_dialog.cpp" line="125"/> <source>Changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="preferences_dialog.cpp" line="142"/> + <location filename="preferences_dialog.cpp" line="143"/> <source>Has this preference been changed?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="preferences_dialog.cpp" line="152"/> + <location filename="preferences_dialog.cpp" line="153"/> <source>Default value is empty</source> <translation type="unfinished"></translation> </message> @@ -11148,7 +11164,7 @@ a:hover { </message> <message> <location filename="lte_rlc_statistics_dialog.cpp" line="176"/> - <location filename="preferences_dialog.cpp" line="120"/> + <location filename="preferences_dialog.cpp" line="121"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> @@ -15541,6 +15557,29 @@ a:hover { </message> </context> <context> + <name>WiresharkApplication</name> + <message> + <location filename="wireshark_application.cpp" line="582"/> + <source>Dell Backup and Recovery Found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="583"/> + <source>You appear to be running Dell Backup and Recovery 1.8.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="584"/> + <source>DBAR can make many applications crash <a href="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12036">including Wireshark</a>.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="588"/> + <source>Offending DLL: %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>WiresharkDialog</name> <message> <location filename="wireshark_dialog.cpp" line="122"/> diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts index b98734eb88..5040542dff 100644 --- a/ui/qt/wireshark_fr.ts +++ b/ui/qt/wireshark_fr.ts @@ -9568,57 +9568,57 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="712"/> + <location filename="main_window_slots.cpp" line="731"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> <message> - <location filename="main_window_slots.cpp" line="817"/> + <location filename="main_window_slots.cpp" line="836"/> <source>Saving %1</source> <translation>Sauvegarde en cours %1</translation> </message> <message> - <location filename="main_window_slots.cpp" line="857"/> + <location filename="main_window_slots.cpp" line="876"/> <source>No interface selected</source> <translation>Aucune interface sélectionnée</translation> </message> <message> - <location filename="main_window_slots.cpp" line="867"/> + <location filename="main_window_slots.cpp" line="886"/> <source>Invalid capture filter</source> <translation>Filtre de capture invalide</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1115"/> + <location filename="main_window_slots.cpp" line="1134"/> <source>Clear Menu</source> <translation>Effacer les fichiers récemment ouverts</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1598"/> + <location filename="main_window_slots.cpp" line="1617"/> <source>Please wait while Wireshark is initializing</source> <translation>Veuillez patienter pendant que Wireshark s'initialise. . .</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1699"/> + <location filename="main_window_slots.cpp" line="1718"/> <source> before closing the file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="1781"/> + <location filename="main_window_slots.cpp" line="1800"/> <source>Export Selected Packet Bytes</source> <translation>Exporter Octets de Paquets Sélectionnés</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1847"/> + <location filename="main_window_slots.cpp" line="1866"/> <source>No Keys</source> <translation>Aucune clés</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1848"/> + <location filename="main_window_slots.cpp" line="1867"/> <source>There are no SSL Session Keys to save.</source> <translation>Il y a aucune clé de Session SSL à sauvegarder.</translation> </message> <message numerus="yes"> - <location filename="main_window_slots.cpp" line="1854"/> + <location filename="main_window_slots.cpp" line="1873"/> <source>Export SSL Session Keys (%Ln key(s))</source> <oldsource>Export SSL Session Keys (%1 key%2</oldsource> <translation type="unfinished"> @@ -9627,74 +9627,74 @@ a:hover { </translation> </message> <message> - <location filename="main_window_slots.cpp" line="1783"/> + <location filename="main_window_slots.cpp" line="1802"/> <source>Raw data (*.bin *.dat *.raw);;All Files (</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="762"/> + <location filename="main_window_slots.cpp" line="781"/> <source>Merging files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="1858"/> + <location filename="main_window_slots.cpp" line="1877"/> <source>SSL Session Keys (*.keys *.txt);;All Files (</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="1976"/> + <location filename="main_window_slots.cpp" line="1995"/> <source>Couldn't copy text. Try another item.</source> <translation>Impossible de copier le texte. Essayer un autre item.</translation> </message> <message> - <location filename="main_window_slots.cpp" line="2382"/> - <location filename="main_window_slots.cpp" line="3493"/> + <location filename="main_window_slots.cpp" line="2405"/> + <location filename="main_window_slots.cpp" line="3516"/> <source>Unable to build conversation filter.</source> <translation>Impossible de construire un filtre de conversation.</translation> </message> <message> - <location filename="main_window_slots.cpp" line="2532"/> - <location filename="main_window_slots.cpp" line="2545"/> + <location filename="main_window_slots.cpp" line="2555"/> + <location filename="main_window_slots.cpp" line="2568"/> <source> before reloading the file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="2579"/> + <location filename="main_window_slots.cpp" line="2602"/> <source>No filter available. Try another </source> <translation>Aucun filtre disponible. Essayer un autre</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3500"/> + <location filename="main_window_slots.cpp" line="3523"/> <source>Error compiling filter for this conversation.</source> <translation>Erreur dans la compilation du filtre pour cette conversation.</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3509"/> + <location filename="main_window_slots.cpp" line="3532"/> <source>No previous/next packet in conversation.</source> <translation>Aucun paquet précédent/suivant dans la conversation</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3586"/> + <location filename="main_window_slots.cpp" line="3609"/> <source>No Interface Selected</source> <translation>Aucune Interface Sélectionnée</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3593"/> + <location filename="main_window_slots.cpp" line="3616"/> <source> before starting a new capture</source> <translation>avant de commencer une nouvelle capture</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3611"/> + <location filename="main_window_slots.cpp" line="3634"/> <source> before restarting the capture</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="3819"/> + <location filename="main_window_slots.cpp" line="3842"/> <source>Wiki Page for %1</source> <translation>Page Wiki pour %1</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3820"/> + <location filename="main_window_slots.cpp" line="3843"/> <source><p>The Wireshark Wiki is maintained by the community.</p><p>The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.</p><p>Proceed to the wiki?</p></source> <translation><p>Le Wiki Wireshark est maintenu par la communauté</p> <p>La page que vous vous apprêtez à charger peut être magnifique, incomplète, fausse ou inexistante</p> @@ -10563,7 +10563,7 @@ a:hover { <translation>Valeur</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="402"/> + <location filename="preferences_dialog.cpp" line="403"/> <source>Preferences</source> <translation>Préférences</translation> </message> @@ -10652,8 +10652,9 @@ a:hover { </message> <message> <location filename="profile_dialog.ui" line="60"/> - <source>Remove this profile. The Default profile and system provided profiles cannot be removed.</source> - <translation>Supprimer ce profile. Le profile par défaut et les profiles générés par le système ne peuvent être supprimés.</translation> + <source>Remove this profile. System provided profiles cannot be removed.</source> + <oldsource>Remove this profile. The Default profile and system provided profiles cannot be removed.</oldsource> + <translation type="unfinished">Supprimer ce profile. Le profile par défaut et les profiles générés par le système ne peuvent être supprimés.</translation> </message> <message> <location filename="profile_dialog.ui" line="71"/> @@ -10666,42 +10667,57 @@ a:hover { <translation>Profils de configuration</translation> </message> <message> - <location filename="profile_dialog.cpp" line="170"/> + <location filename="profile_dialog.cpp" line="163"/> + <source>Will be reset to default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="179"/> <source>Created from %1</source> <translation>Créé à partir de %1</translation> </message> <message> - <location filename="profile_dialog.cpp" line="175"/> + <location filename="profile_dialog.cpp" line="181"/> + <source>(system provided)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="187"/> <source>Created from default settings</source> <translation>Créé à partir des paramètres par défaut</translation> </message> <message> - <location filename="profile_dialog.cpp" line="178"/> + <location filename="profile_dialog.cpp" line="190"/> <source>Renamed from %1</source> <translation>Renomé à partir de %1</translation> </message> <message> - <location filename="profile_dialog.cpp" line="184"/> + <location filename="profile_dialog.cpp" line="196"/> <source>Go to %1</source> <translation>Aller à %1</translation> </message> <message> - <location filename="profile_dialog.cpp" line="209"/> + <location filename="profile_dialog.cpp" line="221"/> <source>This is a system provided profile.</source> <translation>Ceci est un profile fournit par le système.</translation> </message> <message> - <location filename="profile_dialog.cpp" line="213"/> + <location filename="profile_dialog.cpp" line="225"/> <source>A profile already exists with this name.</source> <translation>Un profil existe déjà avec ce nom.</translation> </message> <message> - <location filename="profile_dialog.cpp" line="218"/> + <location filename="profile_dialog.cpp" line="230"/> <source>A profile already exists with this name</source> <translation>Un profil existe déjà avec ce nom.</translation> </message> <message> - <location filename="profile_dialog.cpp" line="317"/> + <location filename="profile_dialog.cpp" line="234"/> + <source>The profile will be reset to default values.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="355"/> <source>Profile Error</source> <translation>Erreur de Profil</translation> </message> @@ -10876,22 +10892,22 @@ a:hover { <context> <name>QObject</name> <message> - <location filename="preferences_dialog.cpp" line="122"/> + <location filename="preferences_dialog.cpp" line="123"/> <source>Default</source> <translation type="unfinished">Défaut</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="124"/> + <location filename="preferences_dialog.cpp" line="125"/> <source>Changed</source> <translation type="unfinished">Modifier</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="142"/> + <location filename="preferences_dialog.cpp" line="143"/> <source>Has this preference been changed?</source> <translation>Cette préférence a été changé?</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="152"/> + <location filename="preferences_dialog.cpp" line="153"/> <source>Default value is empty</source> <translation>La valeur par défaut est vide</translation> </message> @@ -11427,7 +11443,7 @@ a:hover { </message> <message> <location filename="lte_rlc_statistics_dialog.cpp" line="176"/> - <location filename="preferences_dialog.cpp" line="120"/> + <location filename="preferences_dialog.cpp" line="121"/> <source>Unknown</source> <translation>Inconnu</translation> </message> @@ -15937,6 +15953,29 @@ Changer la direction de la connexion (voir le flux inverse).</p></body& </message> </context> <context> + <name>WiresharkApplication</name> + <message> + <location filename="wireshark_application.cpp" line="582"/> + <source>Dell Backup and Recovery Found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="583"/> + <source>You appear to be running Dell Backup and Recovery 1.8.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="584"/> + <source>DBAR can make many applications crash <a href="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12036">including Wireshark</a>.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="588"/> + <source>Offending DLL: %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>WiresharkDialog</name> <message> <location filename="wireshark_dialog.cpp" line="122"/> diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts index 1d6385dbe9..34d9d07f7b 100644 --- a/ui/qt/wireshark_it.ts +++ b/ui/qt/wireshark_it.ts @@ -9598,57 +9598,57 @@ a:hover { <translation>errore durante l'apertura di un altro file</translation> </message> <message> - <location filename="main_window_slots.cpp" line="712"/> + <location filename="main_window_slots.cpp" line="731"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> <message> - <location filename="main_window_slots.cpp" line="817"/> + <location filename="main_window_slots.cpp" line="836"/> <source>Saving %1</source> <translation>Salvataggio di %1</translation> </message> <message> - <location filename="main_window_slots.cpp" line="857"/> + <location filename="main_window_slots.cpp" line="876"/> <source>No interface selected</source> <translation>Nessuna interfaccia selezionata</translation> </message> <message> - <location filename="main_window_slots.cpp" line="867"/> + <location filename="main_window_slots.cpp" line="886"/> <source>Invalid capture filter</source> <translation>Filtro di cattura invalido</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1115"/> + <location filename="main_window_slots.cpp" line="1134"/> <source>Clear Menu</source> <translation>Pulisci menu</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1598"/> + <location filename="main_window_slots.cpp" line="1617"/> <source>Please wait while Wireshark is initializing</source> <translation>Attendi l'inizializzazione di Wireshark</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1699"/> + <location filename="main_window_slots.cpp" line="1718"/> <source> before closing the file</source> <translation>prima della chiusura del file</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1781"/> + <location filename="main_window_slots.cpp" line="1800"/> <source>Export Selected Packet Bytes</source> <translation>Esporta i byte del pacchetto selezionato</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1847"/> + <location filename="main_window_slots.cpp" line="1866"/> <source>No Keys</source> <translation>Nessuna chiave</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1848"/> + <location filename="main_window_slots.cpp" line="1867"/> <source>There are no SSL Session Keys to save.</source> <translation>Non ci sono chiavi di sessione SSL da salvare.</translation> </message> <message numerus="yes"> - <location filename="main_window_slots.cpp" line="1854"/> + <location filename="main_window_slots.cpp" line="1873"/> <source>Export SSL Session Keys (%Ln key(s))</source> <oldsource>Export SSL Session Keys (%1 key%2</oldsource> <translation> @@ -9657,74 +9657,74 @@ a:hover { </translation> </message> <message> - <location filename="main_window_slots.cpp" line="1783"/> + <location filename="main_window_slots.cpp" line="1802"/> <source>Raw data (*.bin *.dat *.raw);;All Files (</source> <translation>Dati grezzi (*.bin *.dat *.raw);;Tutti i file (</translation> </message> <message> - <location filename="main_window_slots.cpp" line="762"/> + <location filename="main_window_slots.cpp" line="781"/> <source>Merging files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="1858"/> + <location filename="main_window_slots.cpp" line="1877"/> <source>SSL Session Keys (*.keys *.txt);;All Files (</source> <translation>Chiavi di sessione SSL (*.keys *.txt);;Any File (</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1976"/> + <location filename="main_window_slots.cpp" line="1995"/> <source>Couldn't copy text. Try another item.</source> <translation>Non riesco a copiare il testo. Prova un'altra voce.</translation> </message> <message> - <location filename="main_window_slots.cpp" line="2382"/> - <location filename="main_window_slots.cpp" line="3493"/> + <location filename="main_window_slots.cpp" line="2405"/> + <location filename="main_window_slots.cpp" line="3516"/> <source>Unable to build conversation filter.</source> <translation>Impossibile creare il filtro di conversazione.</translation> </message> <message> - <location filename="main_window_slots.cpp" line="2532"/> - <location filename="main_window_slots.cpp" line="2545"/> + <location filename="main_window_slots.cpp" line="2555"/> + <location filename="main_window_slots.cpp" line="2568"/> <source> before reloading the file</source> <translation>prima di ricaricare il file</translation> </message> <message> - <location filename="main_window_slots.cpp" line="2579"/> + <location filename="main_window_slots.cpp" line="2602"/> <source>No filter available. Try another </source> <translation>Nessun filtro disponibile. Provane un altro </translation> </message> <message> - <location filename="main_window_slots.cpp" line="3500"/> + <location filename="main_window_slots.cpp" line="3523"/> <source>Error compiling filter for this conversation.</source> <translation>Errore durante la compilazione del filtro per questa conversazione.</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3509"/> + <location filename="main_window_slots.cpp" line="3532"/> <source>No previous/next packet in conversation.</source> <translation>Nessun pacchetto precedente/successivo in conversazione.</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3586"/> + <location filename="main_window_slots.cpp" line="3609"/> <source>No Interface Selected</source> <translation>Nessuna interfaccia selezionata</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3593"/> + <location filename="main_window_slots.cpp" line="3616"/> <source> before starting a new capture</source> <translation>prima di iniziare una nuova cattura</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3611"/> + <location filename="main_window_slots.cpp" line="3634"/> <source> before restarting the capture</source> <translation>prima di riavviare la cattura</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3819"/> + <location filename="main_window_slots.cpp" line="3842"/> <source>Wiki Page for %1</source> <translation>Pagina wiki per %1</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3820"/> + <location filename="main_window_slots.cpp" line="3843"/> <source><p>The Wireshark Wiki is maintained by the community.</p><p>The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.</p><p>Proceed to the wiki?</p></source> <translation><p>Il Wiki di Wireshark è gestito dalla comunità.</p><p>La pagina che stai per caricare potrebbe essere perfetta, incompleta, errata o inesistente.</p><p>Vuoi proseguire?</p></translation> </message> @@ -10591,7 +10591,7 @@ a:hover { <translation>Valore</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="402"/> + <location filename="preferences_dialog.cpp" line="403"/> <source>Preferences</source> <translation>Preferenze</translation> </message> @@ -10680,8 +10680,9 @@ a:hover { </message> <message> <location filename="profile_dialog.ui" line="60"/> - <source>Remove this profile. The Default profile and system provided profiles cannot be removed.</source> - <translation>Rimuovi questo profilo. Il profilo Predefinito e i profili forniti dal sistema non possono essere rimossi.</translation> + <source>Remove this profile. System provided profiles cannot be removed.</source> + <oldsource>Remove this profile. The Default profile and system provided profiles cannot be removed.</oldsource> + <translation type="unfinished">Rimuovi questo profilo. Il profilo Predefinito e i profili forniti dal sistema non possono essere rimossi.</translation> </message> <message> <location filename="profile_dialog.ui" line="71"/> @@ -10694,42 +10695,57 @@ a:hover { <translation>Profili di configurazione</translation> </message> <message> - <location filename="profile_dialog.cpp" line="170"/> + <location filename="profile_dialog.cpp" line="163"/> + <source>Will be reset to default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="179"/> <source>Created from %1</source> <translation>Creato da %1</translation> </message> <message> - <location filename="profile_dialog.cpp" line="175"/> + <location filename="profile_dialog.cpp" line="181"/> + <source>(system provided)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="187"/> <source>Created from default settings</source> <translation>Creato dalle impostazioni predefinite</translation> </message> <message> - <location filename="profile_dialog.cpp" line="178"/> + <location filename="profile_dialog.cpp" line="190"/> <source>Renamed from %1</source> <translation>Rinominato da %1</translation> </message> <message> - <location filename="profile_dialog.cpp" line="184"/> + <location filename="profile_dialog.cpp" line="196"/> <source>Go to %1</source> <translation>Vai a %1</translation> </message> <message> - <location filename="profile_dialog.cpp" line="209"/> + <location filename="profile_dialog.cpp" line="221"/> <source>This is a system provided profile.</source> <translation>Questo è un profilo fornito dal sistema.</translation> </message> <message> - <location filename="profile_dialog.cpp" line="213"/> + <location filename="profile_dialog.cpp" line="225"/> <source>A profile already exists with this name.</source> <translation>Un profilo con questo nome esiste già.</translation> </message> <message> - <location filename="profile_dialog.cpp" line="218"/> + <location filename="profile_dialog.cpp" line="230"/> <source>A profile already exists with this name</source> <translation>Un profilo con questo nome esiste già</translation> </message> <message> - <location filename="profile_dialog.cpp" line="317"/> + <location filename="profile_dialog.cpp" line="234"/> + <source>The profile will be reset to default values.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="355"/> <source>Profile Error</source> <translation>Errore di profilo</translation> </message> @@ -10904,22 +10920,22 @@ a:hover { <context> <name>QObject</name> <message> - <location filename="preferences_dialog.cpp" line="122"/> + <location filename="preferences_dialog.cpp" line="123"/> <source>Default</source> <translation type="unfinished">Predefinito</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="124"/> + <location filename="preferences_dialog.cpp" line="125"/> <source>Changed</source> <translation type="unfinished">Modificato</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="142"/> + <location filename="preferences_dialog.cpp" line="143"/> <source>Has this preference been changed?</source> <translation>Questa impostazione è stata cambiata?</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="152"/> + <location filename="preferences_dialog.cpp" line="153"/> <source>Default value is empty</source> <translation>Il valore predefinito è vuoto</translation> </message> @@ -11455,7 +11471,7 @@ a:hover { </message> <message> <location filename="lte_rlc_statistics_dialog.cpp" line="176"/> - <location filename="preferences_dialog.cpp" line="120"/> + <location filename="preferences_dialog.cpp" line="121"/> <source>Unknown</source> <translation>Sconosciuto</translation> </message> @@ -15988,6 +16004,29 @@ a:hover { </message> </context> <context> + <name>WiresharkApplication</name> + <message> + <location filename="wireshark_application.cpp" line="582"/> + <source>Dell Backup and Recovery Found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="583"/> + <source>You appear to be running Dell Backup and Recovery 1.8.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="584"/> + <source>DBAR can make many applications crash <a href="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12036">including Wireshark</a>.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="588"/> + <source>Offending DLL: %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>WiresharkDialog</name> <message> <location filename="wireshark_dialog.cpp" line="122"/> diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts index 386d70a8fa..730332caa1 100644 --- a/ui/qt/wireshark_ja_JP.ts +++ b/ui/qt/wireshark_ja_JP.ts @@ -9550,57 +9550,57 @@ a:hover { <translation>別のファイルを開く前に</translation> </message> <message> - <location filename="main_window_slots.cpp" line="712"/> + <location filename="main_window_slots.cpp" line="731"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> <message> - <location filename="main_window_slots.cpp" line="817"/> + <location filename="main_window_slots.cpp" line="836"/> <source>Saving %1</source> <translation>保存中 %1</translation> </message> <message> - <location filename="main_window_slots.cpp" line="857"/> + <location filename="main_window_slots.cpp" line="876"/> <source>No interface selected</source> <translation>インターフェースが選択されていません</translation> </message> <message> - <location filename="main_window_slots.cpp" line="867"/> + <location filename="main_window_slots.cpp" line="886"/> <source>Invalid capture filter</source> <translation>無効なキャプチャフィルタ</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1115"/> + <location filename="main_window_slots.cpp" line="1134"/> <source>Clear Menu</source> <translation>メニューをクリア</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1598"/> + <location filename="main_window_slots.cpp" line="1617"/> <source>Please wait while Wireshark is initializing</source> <translation>Wiresharkが初期化している間お待ちください</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1699"/> + <location filename="main_window_slots.cpp" line="1718"/> <source> before closing the file</source> <translation>ファイルを閉じる前に</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1781"/> + <location filename="main_window_slots.cpp" line="1800"/> <source>Export Selected Packet Bytes</source> <translation>選択したパケットバイト列をエクスポート</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1847"/> + <location filename="main_window_slots.cpp" line="1866"/> <source>No Keys</source> <translation>キーはありません</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1848"/> + <location filename="main_window_slots.cpp" line="1867"/> <source>There are no SSL Session Keys to save.</source> <translation>保存するSSLセッション鍵はありません</translation> </message> <message numerus="yes"> - <location filename="main_window_slots.cpp" line="1854"/> + <location filename="main_window_slots.cpp" line="1873"/> <source>Export SSL Session Keys (%Ln key(s))</source> <oldsource>Export SSL Session Keys (%1 key%2</oldsource> <translation> @@ -9608,74 +9608,74 @@ a:hover { </translation> </message> <message> - <location filename="main_window_slots.cpp" line="1783"/> + <location filename="main_window_slots.cpp" line="1802"/> <source>Raw data (*.bin *.dat *.raw);;All Files (</source> <translation>Raw(無加工)データ形式 (*.bin *.dat *.raw);;すべてのファイル(</translation> </message> <message> - <location filename="main_window_slots.cpp" line="762"/> + <location filename="main_window_slots.cpp" line="781"/> <source>Merging files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="1858"/> + <location filename="main_window_slots.cpp" line="1877"/> <source>SSL Session Keys (*.keys *.txt);;All Files (</source> <translation>SSLセッション鍵 (*.keys *.txt);;すべてのファイル (</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1976"/> + <location filename="main_window_slots.cpp" line="1995"/> <source>Couldn't copy text. Try another item.</source> <translation>テキストをコピーできません 別の項目を試してみてください</translation> </message> <message> - <location filename="main_window_slots.cpp" line="2382"/> - <location filename="main_window_slots.cpp" line="3493"/> + <location filename="main_window_slots.cpp" line="2405"/> + <location filename="main_window_slots.cpp" line="3516"/> <source>Unable to build conversation filter.</source> <translation>会話フィルタを作成できません</translation> </message> <message> - <location filename="main_window_slots.cpp" line="2532"/> - <location filename="main_window_slots.cpp" line="2545"/> + <location filename="main_window_slots.cpp" line="2555"/> + <location filename="main_window_slots.cpp" line="2568"/> <source> before reloading the file</source> <translation>ファイルを再読み込みする前に</translation> </message> <message> - <location filename="main_window_slots.cpp" line="2579"/> + <location filename="main_window_slots.cpp" line="2602"/> <source>No filter available. Try another </source> <translation>フィルタが利用できません 別のものを試してください</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3500"/> + <location filename="main_window_slots.cpp" line="3523"/> <source>Error compiling filter for this conversation.</source> <translation>この対話の間のフィルタ翻訳エラー</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3509"/> + <location filename="main_window_slots.cpp" line="3532"/> <source>No previous/next packet in conversation.</source> <translation>対話の前/次のパケットがありません</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3586"/> + <location filename="main_window_slots.cpp" line="3609"/> <source>No Interface Selected</source> <translation>インターフェースが選択されていません</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3593"/> + <location filename="main_window_slots.cpp" line="3616"/> <source> before starting a new capture</source> <translation>新規キャプチャを開始する前に</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3611"/> + <location filename="main_window_slots.cpp" line="3634"/> <source> before restarting the capture</source> <translation>キャプチャを再スタートする前に</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3819"/> + <location filename="main_window_slots.cpp" line="3842"/> <source>Wiki Page for %1</source> <translation>%1 の Wikiページ</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3820"/> + <location filename="main_window_slots.cpp" line="3843"/> <source><p>The Wireshark Wiki is maintained by the community.</p><p>The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.</p><p>Proceed to the wiki?</p></source> <translation><p>ワイヤーシャークWikiはコミュニティによって運営されています </p><p>いま見ているページはすばらしかったり、不完全だったり、間違っていたり、存在しないかもしれません。</p><p>Wikiに移動しますか？</p></translation> </message> @@ -10542,7 +10542,7 @@ a:hover { <translation>値</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="402"/> + <location filename="preferences_dialog.cpp" line="403"/> <source>Preferences</source> <translation>設定</translation> </message> @@ -10631,8 +10631,9 @@ a:hover { </message> <message> <location filename="profile_dialog.ui" line="60"/> - <source>Remove this profile. The Default profile and system provided profiles cannot be removed.</source> - <translation>このプロファイルを削除します デフォルトプロファイルとシステム提供プロファイルは削除できません</translation> + <source>Remove this profile. System provided profiles cannot be removed.</source> + <oldsource>Remove this profile. The Default profile and system provided profiles cannot be removed.</oldsource> + <translation type="unfinished">このプロファイルを削除します デフォルトプロファイルとシステム提供プロファイルは削除できません</translation> </message> <message> <location filename="profile_dialog.ui" line="71"/> @@ -10645,42 +10646,57 @@ a:hover { <translation>設定プロファイル</translation> </message> <message> - <location filename="profile_dialog.cpp" line="170"/> + <location filename="profile_dialog.cpp" line="163"/> + <source>Will be reset to default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="179"/> <source>Created from %1</source> <translation>%1 から作成</translation> </message> <message> - <location filename="profile_dialog.cpp" line="175"/> + <location filename="profile_dialog.cpp" line="181"/> + <source>(system provided)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="187"/> <source>Created from default settings</source> <translation>デフォルト設定から作成</translation> </message> <message> - <location filename="profile_dialog.cpp" line="178"/> + <location filename="profile_dialog.cpp" line="190"/> <source>Renamed from %1</source> <translation>%1 の名前を変更</translation> </message> <message> - <location filename="profile_dialog.cpp" line="184"/> + <location filename="profile_dialog.cpp" line="196"/> <source>Go to %1</source> <translation>%1 に移動</translation> </message> <message> - <location filename="profile_dialog.cpp" line="209"/> + <location filename="profile_dialog.cpp" line="221"/> <source>This is a system provided profile.</source> <translation>これはシステム提供プロファイルです</translation> </message> <message> - <location filename="profile_dialog.cpp" line="213"/> + <location filename="profile_dialog.cpp" line="225"/> <source>A profile already exists with this name.</source> <translation>この名前のプロファイルは既に存在します</translation> </message> <message> - <location filename="profile_dialog.cpp" line="218"/> + <location filename="profile_dialog.cpp" line="230"/> <source>A profile already exists with this name</source> <translation>既存プロファイル名</translation> </message> <message> - <location filename="profile_dialog.cpp" line="317"/> + <location filename="profile_dialog.cpp" line="234"/> + <source>The profile will be reset to default values.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="355"/> <source>Profile Error</source> <translation>プロファイルエラー</translation> </message> @@ -10855,22 +10871,22 @@ a:hover { <context> <name>QObject</name> <message> - <location filename="preferences_dialog.cpp" line="122"/> + <location filename="preferences_dialog.cpp" line="123"/> <source>Default</source> <translation type="unfinished">デフォルト</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="124"/> + <location filename="preferences_dialog.cpp" line="125"/> <source>Changed</source> <translation type="unfinished">変更された</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="142"/> + <location filename="preferences_dialog.cpp" line="143"/> <source>Has this preference been changed?</source> <translation>この設定を変更されましたか？</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="152"/> + <location filename="preferences_dialog.cpp" line="153"/> <source>Default value is empty</source> <translation>デフォルト値は空です</translation> </message> @@ -11406,7 +11422,7 @@ a:hover { </message> <message> <location filename="lte_rlc_statistics_dialog.cpp" line="176"/> - <location filename="preferences_dialog.cpp" line="120"/> + <location filename="preferences_dialog.cpp" line="121"/> <source>Unknown</source> <translation>不明</translation> </message> @@ -15917,6 +15933,29 @@ a:hover { </message> </context> <context> + <name>WiresharkApplication</name> + <message> + <location filename="wireshark_application.cpp" line="582"/> + <source>Dell Backup and Recovery Found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="583"/> + <source>You appear to be running Dell Backup and Recovery 1.8.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="584"/> + <source>DBAR can make many applications crash <a href="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12036">including Wireshark</a>.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="588"/> + <source>Offending DLL: %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>WiresharkDialog</name> <message> <location filename="wireshark_dialog.cpp" line="122"/> diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts index 9d0c6a5d55..26abfcd8d8 100644 --- a/ui/qt/wireshark_pl.ts +++ b/ui/qt/wireshark_pl.ts @@ -9600,57 +9600,57 @@ text-decoration: underline; <translation>przed otwarciem nowego pliku</translation> </message> <message> - <location filename="main_window_slots.cpp" line="712"/> + <location filename="main_window_slots.cpp" line="731"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> <message> - <location filename="main_window_slots.cpp" line="817"/> + <location filename="main_window_slots.cpp" line="836"/> <source>Saving %1</source> <translation>Zapisywanie %1</translation> </message> <message> - <location filename="main_window_slots.cpp" line="857"/> + <location filename="main_window_slots.cpp" line="876"/> <source>No interface selected</source> <translation>Nie wybrano interfejsu</translation> </message> <message> - <location filename="main_window_slots.cpp" line="867"/> + <location filename="main_window_slots.cpp" line="886"/> <source>Invalid capture filter</source> <translation>Niepoprawny filtr przechwytywania</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1115"/> + <location filename="main_window_slots.cpp" line="1134"/> <source>Clear Menu</source> <translation>Wyczyść Menu</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1598"/> + <location filename="main_window_slots.cpp" line="1617"/> <source>Please wait while Wireshark is initializing</source> <translation>Proszę czekać, trwa uruchamianie Wiresharka</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1699"/> + <location filename="main_window_slots.cpp" line="1718"/> <source> before closing the file</source> <translation>przed zapisaniem pliku</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1781"/> + <location filename="main_window_slots.cpp" line="1800"/> <source>Export Selected Packet Bytes</source> <translation>Eksportuj zaznaczony bajty pakietu</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1847"/> + <location filename="main_window_slots.cpp" line="1866"/> <source>No Keys</source> <translation>Brak kluczy</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1848"/> + <location filename="main_window_slots.cpp" line="1867"/> <source>There are no SSL Session Keys to save.</source> <translation>Nie ma żadnych kluczy sesji SSL do zapisu.</translation> </message> <message numerus="yes"> - <location filename="main_window_slots.cpp" line="1854"/> + <location filename="main_window_slots.cpp" line="1873"/> <source>Export SSL Session Keys (%Ln key(s))</source> <oldsource>Export SSL Session Keys (%1 key%2</oldsource> <translation> @@ -9660,74 +9660,74 @@ text-decoration: underline; </translation> </message> <message> - <location filename="main_window_slots.cpp" line="1783"/> + <location filename="main_window_slots.cpp" line="1802"/> <source>Raw data (*.bin *.dat *.raw);;All Files (</source> <translation>Surowe dane (*.bin *.dat *.raw);;Dowolny plik (</translation> </message> <message> - <location filename="main_window_slots.cpp" line="762"/> + <location filename="main_window_slots.cpp" line="781"/> <source>Merging files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="1858"/> + <location filename="main_window_slots.cpp" line="1877"/> <source>SSL Session Keys (*.keys *.txt);;All Files (</source> <translation>Klucze sesji SSL (*.keys *.txt);; Dowolny plik (</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1976"/> + <location filename="main_window_slots.cpp" line="1995"/> <source>Couldn't copy text. Try another item.</source> <translation>Nie można skopiować tekstu. Spróbuj inną pozycję.</translation> </message> <message> - <location filename="main_window_slots.cpp" line="2382"/> - <location filename="main_window_slots.cpp" line="3493"/> + <location filename="main_window_slots.cpp" line="2405"/> + <location filename="main_window_slots.cpp" line="3516"/> <source>Unable to build conversation filter.</source> <translation>Nie można stworzyć filtru konwersacji.</translation> </message> <message> - <location filename="main_window_slots.cpp" line="2532"/> - <location filename="main_window_slots.cpp" line="2545"/> + <location filename="main_window_slots.cpp" line="2555"/> + <location filename="main_window_slots.cpp" line="2568"/> <source> before reloading the file</source> <translation>przed przeładowaniem pliku</translation> </message> <message> - <location filename="main_window_slots.cpp" line="2579"/> + <location filename="main_window_slots.cpp" line="2602"/> <source>No filter available. Try another </source> <translation>Brak dostępnych filtrów. Spróbuj ponownie</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3500"/> + <location filename="main_window_slots.cpp" line="3523"/> <source>Error compiling filter for this conversation.</source> <translation>Błąd kompilacji filtru dla tej konwersacji.</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3509"/> + <location filename="main_window_slots.cpp" line="3532"/> <source>No previous/next packet in conversation.</source> <translation>Brak poprzedniego i następnego pakietu w konwersacji.</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3586"/> + <location filename="main_window_slots.cpp" line="3609"/> <source>No Interface Selected</source> <translation>Nie wybrano interfejsu</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3593"/> + <location filename="main_window_slots.cpp" line="3616"/> <source> before starting a new capture</source> <translation>przed wystartowaniem nowego przechwytywania</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3611"/> + <location filename="main_window_slots.cpp" line="3634"/> <source> before restarting the capture</source> <translation>przed restartem przechwytywania</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3819"/> + <location filename="main_window_slots.cpp" line="3842"/> <source>Wiki Page for %1</source> <translation>Strona Wiki dla %1</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3820"/> + <location filename="main_window_slots.cpp" line="3843"/> <source><p>The Wireshark Wiki is maintained by the community.</p><p>The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.</p><p>Proceed to the wiki?</p></source> <translation><p>Strona Wiki Wiresharka jest zarządzania przez społeczność.</p><p>Strona którą chcesz wczytać może być wspaniała, niekompletna, błędna lub nie istnieć.</p><p>Kontynuować wczytywanie strony Wiki?</p></translation> </message> @@ -10593,7 +10593,7 @@ text-decoration: underline; <translation>Wartość</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="402"/> + <location filename="preferences_dialog.cpp" line="403"/> <source>Preferences</source> <translation>Preferencje</translation> </message> @@ -10682,8 +10682,9 @@ text-decoration: underline; </message> <message> <location filename="profile_dialog.ui" line="60"/> - <source>Remove this profile. The Default profile and system provided profiles cannot be removed.</source> - <translation>Usuń profil. Profile domyślne oraz dostarczone z tym oprogramowaniem nie mogą być usunięte.</translation> + <source>Remove this profile. System provided profiles cannot be removed.</source> + <oldsource>Remove this profile. The Default profile and system provided profiles cannot be removed.</oldsource> + <translation type="unfinished">Usuń profil. Profile domyślne oraz dostarczone z tym oprogramowaniem nie mogą być usunięte.</translation> </message> <message> <location filename="profile_dialog.ui" line="71"/> @@ -10696,42 +10697,57 @@ text-decoration: underline; <translation>Konfiguracja profili</translation> </message> <message> - <location filename="profile_dialog.cpp" line="170"/> + <location filename="profile_dialog.cpp" line="163"/> + <source>Will be reset to default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="179"/> <source>Created from %1</source> <translation>Utworzono z %1</translation> </message> <message> - <location filename="profile_dialog.cpp" line="175"/> + <location filename="profile_dialog.cpp" line="181"/> + <source>(system provided)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="187"/> <source>Created from default settings</source> <translation>Utworzono z domyślnych ustawień</translation> </message> <message> - <location filename="profile_dialog.cpp" line="178"/> + <location filename="profile_dialog.cpp" line="190"/> <source>Renamed from %1</source> <translation>Przemianowano z %1</translation> </message> <message> - <location filename="profile_dialog.cpp" line="184"/> + <location filename="profile_dialog.cpp" line="196"/> <source>Go to %1</source> <translation>Przejdź do %1</translation> </message> <message> - <location filename="profile_dialog.cpp" line="209"/> + <location filename="profile_dialog.cpp" line="221"/> <source>This is a system provided profile.</source> <translation>To jest profil dostarczony z tym oprogramowaniem.</translation> </message> <message> - <location filename="profile_dialog.cpp" line="213"/> + <location filename="profile_dialog.cpp" line="225"/> <source>A profile already exists with this name.</source> <translation>Profil o tej nazwie już istnieje.</translation> </message> <message> - <location filename="profile_dialog.cpp" line="218"/> + <location filename="profile_dialog.cpp" line="230"/> <source>A profile already exists with this name</source> <translation>Profil o tej nazwie już istnieje</translation> </message> <message> - <location filename="profile_dialog.cpp" line="317"/> + <location filename="profile_dialog.cpp" line="234"/> + <source>The profile will be reset to default values.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="355"/> <source>Profile Error</source> <translation>Błąd w profilu</translation> </message> @@ -10906,22 +10922,22 @@ text-decoration: underline; <context> <name>QObject</name> <message> - <location filename="preferences_dialog.cpp" line="122"/> + <location filename="preferences_dialog.cpp" line="123"/> <source>Default</source> <translation type="unfinished">Domyślne</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="124"/> + <location filename="preferences_dialog.cpp" line="125"/> <source>Changed</source> <translation type="unfinished">Zmienione</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="142"/> + <location filename="preferences_dialog.cpp" line="143"/> <source>Has this preference been changed?</source> <translation>Czy to ustawienie zostało zmienione?</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="152"/> + <location filename="preferences_dialog.cpp" line="153"/> <source>Default value is empty</source> <translation>Domyślna wartość jest pusta</translation> </message> @@ -11457,7 +11473,7 @@ text-decoration: underline; </message> <message> <location filename="lte_rlc_statistics_dialog.cpp" line="176"/> - <location filename="preferences_dialog.cpp" line="120"/> + <location filename="preferences_dialog.cpp" line="121"/> <source>Unknown</source> <translation>Nienany</translation> </message> @@ -15994,6 +16010,29 @@ text-decoration: underline; </message> </context> <context> + <name>WiresharkApplication</name> + <message> + <location filename="wireshark_application.cpp" line="582"/> + <source>Dell Backup and Recovery Found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="583"/> + <source>You appear to be running Dell Backup and Recovery 1.8.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="584"/> + <source>DBAR can make many applications crash <a href="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12036">including Wireshark</a>.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="588"/> + <source>Offending DLL: %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>WiresharkDialog</name> <message> <location filename="wireshark_dialog.cpp" line="122"/> diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts index 42c5d4884d..8a5ab07ebf 100644 --- a/ui/qt/wireshark_zh_CN.ts +++ b/ui/qt/wireshark_zh_CN.ts @@ -9587,57 +9587,57 @@ text-decoration: underline; <translation>打开另一个文件前</translation> </message> <message> - <location filename="main_window_slots.cpp" line="712"/> + <location filename="main_window_slots.cpp" line="731"/> <source>%1: %2</source> <translation>%1: %2</translation> </message> <message> - <location filename="main_window_slots.cpp" line="817"/> + <location filename="main_window_slots.cpp" line="836"/> <source>Saving %1</source> <translation>正在保存 %1</translation> </message> <message> - <location filename="main_window_slots.cpp" line="857"/> + <location filename="main_window_slots.cpp" line="876"/> <source>No interface selected</source> <translation>未选中接口</translation> </message> <message> - <location filename="main_window_slots.cpp" line="867"/> + <location filename="main_window_slots.cpp" line="886"/> <source>Invalid capture filter</source> <translation>无效捕获过滤器</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1115"/> + <location filename="main_window_slots.cpp" line="1134"/> <source>Clear Menu</source> <translation>清除菜单</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1598"/> + <location filename="main_window_slots.cpp" line="1617"/> <source>Please wait while Wireshark is initializing</source> <translation>Wireshark 正在初始化，请稍候</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1699"/> + <location filename="main_window_slots.cpp" line="1718"/> <source> before closing the file</source> <translation>关闭文件前</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1781"/> + <location filename="main_window_slots.cpp" line="1800"/> <source>Export Selected Packet Bytes</source> <translation>导出选择分组字节流</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1847"/> + <location filename="main_window_slots.cpp" line="1866"/> <source>No Keys</source> <translation>无密钥</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1848"/> + <location filename="main_window_slots.cpp" line="1867"/> <source>There are no SSL Session Keys to save.</source> <translation>没有可以保存的 SSL 会话密钥。</translation> </message> <message numerus="yes"> - <location filename="main_window_slots.cpp" line="1854"/> + <location filename="main_window_slots.cpp" line="1873"/> <source>Export SSL Session Keys (%Ln key(s))</source> <oldsource>Export SSL Session Keys (%1 key%2</oldsource> <translation> @@ -9645,74 +9645,74 @@ text-decoration: underline; </translation> </message> <message> - <location filename="main_window_slots.cpp" line="1783"/> + <location filename="main_window_slots.cpp" line="1802"/> <source>Raw data (*.bin *.dat *.raw);;All Files (</source> <translation>原始数据 (*.bin *.dat *.raw);;所有文件 (</translation> </message> <message> - <location filename="main_window_slots.cpp" line="762"/> + <location filename="main_window_slots.cpp" line="781"/> <source>Merging files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window_slots.cpp" line="1858"/> + <location filename="main_window_slots.cpp" line="1877"/> <source>SSL Session Keys (*.keys *.txt);;All Files (</source> <translation>SSL 会话密钥 (*.keys *.txt);;所有文件 (</translation> </message> <message> - <location filename="main_window_slots.cpp" line="1976"/> + <location filename="main_window_slots.cpp" line="1995"/> <source>Couldn't copy text. Try another item.</source> <translation>无法复制文本。请尝试其他对象。</translation> </message> <message> - <location filename="main_window_slots.cpp" line="2382"/> - <location filename="main_window_slots.cpp" line="3493"/> + <location filename="main_window_slots.cpp" line="2405"/> + <location filename="main_window_slots.cpp" line="3516"/> <source>Unable to build conversation filter.</source> <translation>无法建立对话过滤器。</translation> </message> <message> - <location filename="main_window_slots.cpp" line="2532"/> - <location filename="main_window_slots.cpp" line="2545"/> + <location filename="main_window_slots.cpp" line="2555"/> + <location filename="main_window_slots.cpp" line="2568"/> <source> before reloading the file</source> <translation>重新载入文件前</translation> </message> <message> - <location filename="main_window_slots.cpp" line="2579"/> + <location filename="main_window_slots.cpp" line="2602"/> <source>No filter available. Try another </source> <translation>无过滤器可用。请尝试其他 </translation> </message> <message> - <location filename="main_window_slots.cpp" line="3500"/> + <location filename="main_window_slots.cpp" line="3523"/> <source>Error compiling filter for this conversation.</source> <translation>为此对话编译过滤器时出错。</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3509"/> + <location filename="main_window_slots.cpp" line="3532"/> <source>No previous/next packet in conversation.</source> <translation>此对话中没有上一个/下一个分组。</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3586"/> + <location filename="main_window_slots.cpp" line="3609"/> <source>No Interface Selected</source> <translation>未选中接口</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3593"/> + <location filename="main_window_slots.cpp" line="3616"/> <source> before starting a new capture</source> <translation>在开始新捕获前</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3611"/> + <location filename="main_window_slots.cpp" line="3634"/> <source> before restarting the capture</source> <translation>重新开始捕获前</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3819"/> + <location filename="main_window_slots.cpp" line="3842"/> <source>Wiki Page for %1</source> <translation>%1 的 Wiki 页面</translation> </message> <message> - <location filename="main_window_slots.cpp" line="3820"/> + <location filename="main_window_slots.cpp" line="3843"/> <source><p>The Wireshark Wiki is maintained by the community.</p><p>The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.</p><p>Proceed to the wiki?</p></source> <translation><p>Wireshark Wiki 由社区进行维护。</p><p>您即将加载的页面可能是良好的、不完整的、有错误的，甚至不存在的。</p><p>继续访问该 Wiki？</p></translation> </message> @@ -10578,7 +10578,7 @@ text-decoration: underline; <translation>值</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="402"/> + <location filename="preferences_dialog.cpp" line="403"/> <source>Preferences</source> <translation>首选项</translation> </message> @@ -10667,8 +10667,9 @@ text-decoration: underline; </message> <message> <location filename="profile_dialog.ui" line="60"/> - <source>Remove this profile. The Default profile and system provided profiles cannot be removed.</source> - <translation>移除此配置文件。默认配置和系统提供的配置不能移除。</translation> + <source>Remove this profile. System provided profiles cannot be removed.</source> + <oldsource>Remove this profile. The Default profile and system provided profiles cannot be removed.</oldsource> + <translation type="unfinished">移除此配置文件。默认配置和系统提供的配置不能移除。</translation> </message> <message> <location filename="profile_dialog.ui" line="71"/> @@ -10681,42 +10682,57 @@ text-decoration: underline; <translation>配置文件</translation> </message> <message> - <location filename="profile_dialog.cpp" line="170"/> + <location filename="profile_dialog.cpp" line="163"/> + <source>Will be reset to default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="179"/> <source>Created from %1</source> <translation>创建自 %1</translation> </message> <message> - <location filename="profile_dialog.cpp" line="175"/> + <location filename="profile_dialog.cpp" line="181"/> + <source>(system provided)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="187"/> <source>Created from default settings</source> <translation>根据默认设置创建</translation> </message> <message> - <location filename="profile_dialog.cpp" line="178"/> + <location filename="profile_dialog.cpp" line="190"/> <source>Renamed from %1</source> <translation>重命名自 %1</translation> </message> <message> - <location filename="profile_dialog.cpp" line="184"/> + <location filename="profile_dialog.cpp" line="196"/> <source>Go to %1</source> <translation>转到 %1</translation> </message> <message> - <location filename="profile_dialog.cpp" line="209"/> + <location filename="profile_dialog.cpp" line="221"/> <source>This is a system provided profile.</source> <translation>这是一个系统提供的配置文件。</translation> </message> <message> - <location filename="profile_dialog.cpp" line="213"/> + <location filename="profile_dialog.cpp" line="225"/> <source>A profile already exists with this name.</source> <translation>已存在该名称的配置文件。</translation> </message> <message> - <location filename="profile_dialog.cpp" line="218"/> + <location filename="profile_dialog.cpp" line="230"/> <source>A profile already exists with this name</source> <translation>已存在该名称的配置文件。</translation> </message> <message> - <location filename="profile_dialog.cpp" line="317"/> + <location filename="profile_dialog.cpp" line="234"/> + <source>The profile will be reset to default values.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="profile_dialog.cpp" line="355"/> <source>Profile Error</source> <translation>配置文件错误</translation> </message> @@ -10891,22 +10907,22 @@ text-decoration: underline; <context> <name>QObject</name> <message> - <location filename="preferences_dialog.cpp" line="122"/> + <location filename="preferences_dialog.cpp" line="123"/> <source>Default</source> <translation type="unfinished">默认</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="124"/> + <location filename="preferences_dialog.cpp" line="125"/> <source>Changed</source> <translation type="unfinished">已更改</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="142"/> + <location filename="preferences_dialog.cpp" line="143"/> <source>Has this preference been changed?</source> <translation>此首选项已被更改？</translation> </message> <message> - <location filename="preferences_dialog.cpp" line="152"/> + <location filename="preferences_dialog.cpp" line="153"/> <source>Default value is empty</source> <translation>默认值为空</translation> </message> @@ -11442,7 +11458,7 @@ text-decoration: underline; </message> <message> <location filename="lte_rlc_statistics_dialog.cpp" line="176"/> - <location filename="preferences_dialog.cpp" line="120"/> + <location filename="preferences_dialog.cpp" line="121"/> <source>Unknown</source> <translation>未知</translation> </message> @@ -15949,6 +15965,29 @@ text-decoration: underline; </message> </context> <context> + <name>WiresharkApplication</name> + <message> + <location filename="wireshark_application.cpp" line="582"/> + <source>Dell Backup and Recovery Found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="583"/> + <source>You appear to be running Dell Backup and Recovery 1.8.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="584"/> + <source>DBAR can make many applications crash <a href="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12036">including Wireshark</a>.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="wireshark_application.cpp" line="588"/> + <source>Offending DLL: %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>WiresharkDialog</name> <message> <location filename="wireshark_dialog.cpp" line="122"/> |