diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | epan/dissectors/usb.c | 128 | ||||
| -rw-r--r-- | epan/enterprise-numbers | 126 | ||||
| -rw-r--r-- | epan/sminmpec.c | 29 | ||||
| -rw-r--r-- | manuf | 49 | ||||
| -rw-r--r-- | ui/qt/wireshark_de.ts | 130 | ||||
| -rw-r--r-- | ui/qt/wireshark_en.ts | 138 | ||||
| -rw-r--r-- | ui/qt/wireshark_fr.ts | 130 | ||||
| -rw-r--r-- | ui/qt/wireshark_it.ts | 130 | ||||
| -rw-r--r-- | ui/qt/wireshark_ja_JP.ts | 130 | ||||
| -rw-r--r-- | ui/qt/wireshark_pl.ts | 130 | ||||
| -rw-r--r-- | ui/qt/wireshark_zh_CN.ts | 130 |
12 files changed, 774 insertions, 478 deletions
@@ -4132,6 +4132,7 @@ Luke Mewburn <luke[AT]mewburn.net> Léo Gaspard <leo[AT]gaspard.io> Maarten Bezemer <maarten.bezemer[AT]gmail.com> Maka0 <Maka0[AT]yurei.net> +Makoto Shimamura <makoto.shimamura[AT]toshiba.co.jp> Malcolm Walters <malcolm.walters[AT]acano.com> Marc Bevand <mbevand[AT]google.com> Marc Fournier <marc.fournier[AT]camptocamp.com> @@ -4151,6 +4152,7 @@ Michael Cistera <michael.cistera[AT]netscout.com> Michael McConville <mmcco[AT]mykolab.com> Michael Oed <michael.oed[AT]gmail.com> Michael Pergament <mpergament[AT]googlemail.com> +Michael Sweet <michael.r.sweet[AT]gmail.com> Michael Vigovsky <upliner[AT]gmail.com> Michal Pazdera <michal.pazdera[AT]gmail.com> Michal Prívozník <mprivozn[AT]redhat.com> diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c index b9e4cbde9e..a87b5df86c 100644 --- a/epan/dissectors/usb.c +++ b/epan/dissectors/usb.c @@ -1142,6 +1142,7 @@ static const value_string usb_vendors_vals[] = { { 0x0993, "Gemstar eBook Group, Ltd" }, { 0x0996, "Integrated Telecom Express, Inc." }, { 0x099a, "Zippy Technology Corp." }, + { 0x099e, "Trimble Navigation, Ltd" }, { 0x09a3, "PairGain Technologies" }, { 0x09a4, "Contech Research, Inc." }, { 0x09a5, "VCON Telecommunications" }, @@ -1166,6 +1167,7 @@ static const value_string usb_vendors_vals[] = { { 0x09c4, "ACTiSYS Corp." }, { 0x09c5, "Memory Corp." }, { 0x09ca, "BMC Messsysteme GmbH" }, + { 0x09cb, "FLIR Systems" }, { 0x09cc, "Workbit Corp." }, { 0x09cd, "Psion Dacom Home Networks, Ltd" }, { 0x09ce, "City Electronics, Ltd" }, @@ -1173,7 +1175,7 @@ static const value_string usb_vendors_vals[] = { { 0x09d1, "NeoMagic, Inc." }, { 0x09d2, "Vreelin Engineering, Inc." }, { 0x09d3, "Com One" }, - { 0x09d7, "Novatel Wireless" }, + { 0x09d7, "NovAtel Inc." }, { 0x09d9, "KRF Tech, Ltd" }, { 0x09da, "A4Tech Co., Ltd." }, { 0x09db, "Measurement Computing Corp." }, @@ -1562,7 +1564,6 @@ static const value_string usb_vendors_vals[] = { { 0x0cc4, "emsys GmbH" }, { 0x0cc5, "Sendo" }, { 0x0cc6, "Intermagic Corp." }, - { 0x0cc7, "Kontron Medical AG" }, { 0x0cc8, "Technotools Corp." }, { 0x0cc9, "BroadMAX Technologies, Inc." }, { 0x0cca, "Amphenol" }, @@ -1579,7 +1580,7 @@ static const value_string usb_vendors_vals[] = { { 0x0ce9, "Pico Technology" }, { 0x0cf1, "e-Conn Electronic Co., Ltd" }, { 0x0cf2, "ENE Technology, Inc." }, - { 0x0cf3, "Atheros Communications, Inc." }, + { 0x0cf3, "Qualcomm Atheros Communications" }, { 0x0cf4, "Fomtex Corp." }, { 0x0cf5, "Cellink Co., Ltd" }, { 0x0cf6, "Compucable Corp." }, @@ -1856,6 +1857,7 @@ static const value_string usb_vendors_vals[] = { { 0x0f0c, "CAS Corp." }, { 0x0f0d, "Hori Co., Ltd" }, { 0x0f0e, "Energy Full Corp." }, + { 0x0f0f, "Silego Technology Inc" }, { 0x0f11, "LD Didactic GmbH" }, { 0x0f12, "Mars Engineering Corp." }, { 0x0f13, "Acetek Technology Co., Ltd" }, @@ -3076,7 +3078,9 @@ static const value_string usb_products_vals[] = { { 0x03eb2122, "XMEGA-A1 Explained evaluation kit" }, { 0x03eb2140, "AVR JTAGICE3 (v3.x) Debugger and Programmer" }, { 0x03eb2141, "ICE debugger" }, + { 0x03eb2145, "ATMEGA328P-XMINI (CDC ACM)" }, { 0x03eb2310, "EVK11xx evaluation board" }, + { 0x03eb2404, "The Micro" }, { 0x03eb2fe4, "ATxmega32A4U DFU bootloader" }, { 0x03eb2fe6, "Cactus V6 (DFU)" }, { 0x03eb2fea, "Cactus RF60 (DFU)" }, @@ -3329,6 +3333,7 @@ static const value_string usb_products_vals[] = { { 0x03f02205, "ScanJet 3500c" }, { 0x03f02212, "OfficeJet Pro L7600" }, { 0x03f02217, "color LaserJet 9500 MFP" }, + { 0x03f0222a, "LaserJet Pro MFP M125nw" }, { 0x03f02302, "PhotoSmart 7600 series" }, { 0x03f02304, "DeskJet 656c" }, { 0x03f02305, "ScanJet 3970c" }, @@ -3600,6 +3605,7 @@ static const value_string usb_products_vals[] = { { 0x03f08802, "HP PhotoSmart R967" }, { 0x03f08804, "DeskJet 6980 series" }, { 0x03f08904, "DeskJet 6940 series" }, + { 0x03f08911, "Deskjet 1050 J410" }, { 0x03f08b02, "HP PhotoSmart E327" }, { 0x03f08c02, "HP PhotoSmart E427" }, { 0x03f08c07, "Digital Stereo Headset" }, @@ -5033,7 +5039,7 @@ static const value_string usb_products_vals[] = { { 0x045e0080, "Digital Media Pro Keyboard" }, { 0x045e0083, "Basic Optical Mouse" }, { 0x045e0084, "Basic Optical Mouse" }, - { 0x045e008a, "Wireless Keyboard and Mouse" }, + { 0x045e008a, "Wireless Optical Desktop Receiver 2.0A" }, { 0x045e008b, "Dual Receiver Wireless Mouse (IntelliPoint)" }, { 0x045e008c, "Wireless Intellimouse Explorer 2.0" }, { 0x045e0095, "IntelliMouse Explorer 4.0 (IntelliPoint)" }, @@ -5653,6 +5659,7 @@ static const value_string usb_products_vals[] = { { 0x046dc31b, "Compact Keyboard K300" }, { 0x046dc31c, "Keyboard K120" }, { 0x046dc31d, "Media Keyboard K200" }, + { 0x046dc332, "G502 Proteus Spectrum Optical Mouse" }, { 0x046dc401, "TrackMan Marble Wheel" }, { 0x046dc402, "Marble Mouse (2-button)" }, { 0x046dc403, "Turbo TrackMan Marble FX" }, @@ -6010,6 +6017,7 @@ static const value_string usb_products_vals[] = { { 0x04820108, "Digital Camera Device" }, { 0x04820203, "AH-K3001V" }, { 0x04820204, "iBurst Terminal" }, + { 0x04820408, "FS-1320D Printer" }, { 0x04830137, "BeWAN ADSL USB ST (blue or green)" }, { 0x04830138, "Unicorn II (ST70138B + MTC-20174TQ chipset)" }, { 0x04831307, "Cytronix 6in1 Card Reader" }, @@ -6118,6 +6126,7 @@ static const value_string usb_products_vals[] = { { 0x0499103c, "MOTIF-RACK ES" }, { 0x04991054, "S90XS Keyboard/Music Synthesizer" }, { 0x0499160f, "P-105" }, + { 0x04991613, "Clavinova CLP535" }, { 0x04992000, "DGP-7" }, { 0x04992001, "DGP-5" }, { 0x04993001, "YST-MS55D USB Speaker" }, @@ -6364,6 +6373,7 @@ static const value_string usb_products_vals[] = { { 0x04a910c2, "PIXMA iP1800 Printer" }, { 0x04a910c4, "Pixma iP4500 Printer" }, { 0x04a910c9, "PIXIMA iP4600 Printer" }, + { 0x04a910e3, "PIXMA iX6850 Printer" }, { 0x04a91404, "W6400PG" }, { 0x04a91405, "W8400PG" }, { 0x04a9150f, "BIJ2350 PCL" }, @@ -7035,6 +7045,7 @@ static const value_string usb_products_vals[] = { { 0x04b44381, "SCAPS USC-1 Scanner Controller" }, { 0x04b44611, "Storage Adapter FX2 (CY)" }, { 0x04b44616, "Flash Disk (TPP)" }, + { 0x04b44624, "DS-Xtreme Flash Card" }, { 0x04b45201, "Combi Keyboard-Hub (Hub)" }, { 0x04b45202, "Combi Keyboard-Hub (Keyboard)" }, { 0x04b45500, "HID->COM RS232 Adapter" }, @@ -7118,6 +7129,7 @@ static const value_string usb_products_vals[] = { { 0x04b80142, "GT-F730 [GT-S630/Perfection V33/V330 Photo]" }, { 0x04b80143, "GT-S55" }, { 0x04b80144, "GT-S85" }, + { 0x04b80151, "Perfection V800 Photo" }, { 0x04b80202, "Receipt Printer M129C/TM-T70" }, { 0x04b80401, "CP 800 Digital Camera" }, { 0x04b80402, "PhotoPC 850z" }, @@ -7337,6 +7349,7 @@ static const value_string usb_products_vals[] = { { 0x04c510fe, "S500" }, { 0x04c51140, "FOMA F903iX HIGH-SPEED" }, { 0x04c51150, "fi-6230" }, + { 0x04c5125a, "PalmSecure Sensor Device - MP" }, { 0x04c5201d, "SATA 3.0 6Gbit/s Adaptor [GROOVY]" }, { 0x04c80720, "Digital Color Camera" }, { 0x04c80721, "e-miniD Camera" }, @@ -7347,10 +7360,12 @@ static const value_string usb_products_vals[] = { { 0x04c80729, "Revio C2 Digital Camera" }, { 0x04c8072c, "Revio KD20M" }, { 0x04c8072d, "Revio KD410Z" }, + { 0x04ca004b, "Keyboard" }, { 0x04ca004f, "SK-9020 keyboard" }, { 0x04ca1766, "HID Monitor Controls" }, { 0x04ca2004, "Bluetooth 4.0 [Broadcom BCM20702A0]" }, { 0x04ca2006, "Broadcom BCM43142A0 Bluetooth Device" }, + { 0x04ca2007, "Broadcom BCM43142A0 Bluetooth Device" }, { 0x04ca3005, "Atheros Bluetooth" }, { 0x04ca300b, "Atheros AR3012 Bluetooth" }, { 0x04ca300d, "Atheros AR3012 Bluetooth" }, @@ -7550,6 +7565,7 @@ static const value_string usb_products_vals[] = { { 0x04d92832, "HT82A832R Audio MCU" }, { 0x04d92834, "HT82A834R Audio MCU" }, { 0x04d9a01c, "wireless multimedia keyboard with trackball [Trust ADURA 17911]" }, + { 0x04d9a050, "Chatman V1" }, { 0x04d9a055, "Keyboard" }, { 0x04da0901, "LS-120 Camera" }, { 0x04da0912, "SDR-S10" }, @@ -7725,6 +7741,7 @@ static const value_string usb_products_vals[] = { { 0x04e81003, "MP3 Player and Recorder" }, { 0x04e81006, "SDC-200Z" }, { 0x04e8130c, "NX100" }, + { 0x04e81323, "WB700 Camera" }, { 0x04e81f05, "S2 Portable [JMicron] (500GB)" }, { 0x04e81f06, "HX-MU064DA portable harddisk" }, { 0x04e82018, "WIS09ABGN LinkStick Wireless LAN Adapter" }, @@ -8045,6 +8062,7 @@ static const value_string usb_products_vals[] = { { 0x04f2b1b9, "Asus Integrated Webcam" }, { 0x04f2b1cf, "Lenovo Integrated Camera" }, { 0x04f2b1d6, "CNF9055 Toshiba Webcam" }, + { 0x04f2b1d8, "1.3M Webcam" }, { 0x04f2b1e4, "Toshiba Integrated Webcam" }, { 0x04f2b213, "Fujitsu Integrated Camera" }, { 0x04f2b217, "Lenovo Integrated Camera (0.3MP)" }, @@ -9130,6 +9148,7 @@ static const value_string usb_products_vals[] = { { 0x05572009, "UC-210T Ethernet" }, { 0x05572011, "UC-2324 4xSerial Ports [mos7840]" }, { 0x05572202, "CS124U Miniview II KVM Switch" }, + { 0x05572212, "Keyboard/Mouse" }, { 0x05572213, "CS682 2-Port USB 2.0 DVI KVM Switch" }, { 0x05572221, "Winbond Hermon" }, { 0x05572404, "4-port switch" }, @@ -9138,7 +9157,7 @@ static const value_string usb_products_vals[] = { { 0x05574000, "DSB-650 10Mbps Ethernet [klsi]" }, { 0x05577000, "Hub" }, { 0x05577820, "UC-2322 2xSerial Ports [mos7820]" }, - { 0x05578021, "CS1764A [CubiQ DVI KVMP Switch]" }, + { 0x05578021, "Hub" }, { 0x05581009, "GW Instek GDS-1000 Oscilloscope" }, { 0x0558100a, "GW Instek GDS-1000A Oscilloscope" }, { 0x05582009, "GW Instek GDS-2000 Oscilloscope" }, @@ -10049,6 +10068,7 @@ static const value_string usb_products_vals[] = { { 0x05ac0259, "Internal Keyboard/Trackpad" }, { 0x05ac0263, "Apple Internal Keyboard / Trackpad (MacBook Retina)" }, { 0x05ac0267, "Magic Keyboard A1644" }, + { 0x05ac0269, "Magic Mouse 2 (Lightning connector)" }, { 0x05ac0273, "Internal Keyboard/Trackpad (ISO)" }, { 0x05ac0301, "USB Mouse [Mitsumi, M4848]" }, { 0x05ac0302, "Optical Mouse [Fujitsu]" }, @@ -10593,6 +10613,7 @@ static const value_string usb_products_vals[] = { { 0x05e30741, "microSD Card Reader" }, { 0x05e30743, "SDXC and microSDXC CardReader" }, { 0x05e30745, "Logilink CR0012" }, + { 0x05e30748, "All-in-One Cardreader" }, { 0x05e30751, "microSD Card Reader" }, { 0x05e30760, "USB 2.0 Card Reader/Writer" }, { 0x05e30761, "Genesys Mass Storage Device" }, @@ -10649,6 +10670,7 @@ static const value_string usb_products_vals[] = { { 0x05fd262a, "3dfx HammerHead FX" }, { 0x05fd262f, "HammerHead Fx" }, { 0x05fddaae, "Game Shark" }, + { 0x05fddbae, "Datel XBoxMC" }, { 0x05fe0001, "Mouse" }, { 0x05fe0003, "Cypress USB Mouse" }, { 0x05fe0005, "Viewmaster 4D Browser Mouse" }, @@ -10773,6 +10795,7 @@ static const value_string usb_products_vals[] = { { 0x064ee263, "HP TrueVision HD Integrated Webcam" }, { 0x064ef102, "Lenovo Integrated Webcam [R5U877]" }, { 0x064ef103, "Lenovo Integrated Webcam [R5U877]" }, + { 0x064ef209, "HP Webcam" }, { 0x064ef300, "UVC 0.3M Webcam" }, { 0x064f03e9, "CmStick (article no. 1001)" }, { 0x064f03f2, "CmStick/M (article no. 1010)" }, @@ -11783,6 +11806,8 @@ static const value_string usb_products_vals[] = { { 0x0781557d, "Cruzer Force (64GB)" }, { 0x07815580, "SDCZ80 Flash Drive" }, { 0x07815581, "Ultra" }, + { 0x07815583, "Ultra Fit" }, + { 0x07815591, "Ultra Flair" }, { 0x07815e10, "Encrypted" }, { 0x07816100, "Ultra II SD Plus 2GB" }, { 0x07817100, "Cruzer Mini" }, @@ -12914,6 +12939,8 @@ static const value_string usb_products_vals[] = { { 0x091e0003, "GPS (various models)" }, { 0x091e0004, "iQue 3600" }, { 0x091e0200, "Data Card Programmer (install)" }, + { 0x091e086e, "Forerunner 735XT" }, + { 0x091e097f, "Forerunner 235" }, { 0x091e1200, "Data Card Programmer" }, { 0x091e21a5, "etrex Cx (msc)" }, { 0x091e2236, "nuvi 360" }, @@ -12974,6 +13001,7 @@ static const value_string usb_products_vals[] = { { 0x09300019, "Toshiba Gigabeat T" }, { 0x0930001a, "Toshiba Gigabeat MEU201" }, { 0x0930001d, "Toshiba Gigabeat MET401" }, + { 0x093001bf, "2.5\"External Hard Disk" }, { 0x09300200, "Integrated Bluetooth (Taiyo Yuden)" }, { 0x0930021c, "Atheros AR3012 Bluetooth" }, { 0x09300301, "PCX1100U Cable Modem (WDM)" }, @@ -13148,6 +13176,7 @@ static const value_string usb_products_vals[] = { { 0x09557030, "Tegra 3 (recovery mode)" }, { 0x095570a9, "nVidia CM9-Adam" }, { 0x09557100, "Tegra Device" }, + { 0x09557210, "SHIELD Controller" }, { 0x09557820, "Tegra 2 AC100 developer mode" }, { 0x0955b400, "SHIELD (debug)" }, { 0x0955b401, "SHIELD" }, @@ -13169,7 +13198,13 @@ static const value_string usb_products_vals[] = { { 0x095a3003, "Express Ethernet" }, { 0x095d0001, "Polycom ViaVideo" }, { 0x09670204, "WarpLink 802.11b Adapter" }, + { 0x096e0005, "ePass2000" }, { 0x096e0120, "Microcosm Ltd Dinkey" }, + { 0x096e0305, "ePass2000Auto" }, + { 0x096e0309, "ePass3000GM" }, + { 0x096e0401, "ePass3000" }, + { 0x096e0702, "ePass3003" }, + { 0x096e0703, "ePass3003Auto" }, { 0x096e0802, "ePass2000 (G&D STARCOS SPK 2.4)" }, { 0x096e0807, "ePass2003" }, { 0x09712000, "i1 Pro" }, @@ -13226,6 +13261,14 @@ static const value_string usb_products_vals[] = { { 0x09c30014, "ActivIdentity ActivKey SIM USB Token" }, { 0x09c40011, "ACT-IR2000U IrDA Dongle" }, { 0x09ca5544, "PIO" }, + { 0x09cb1001, "Network Adapter" }, + { 0x09cb1002, "Ex-Series RNDIS interface" }, + { 0x09cb1004, "Ex-Series UVC interface" }, + { 0x09cb1005, "Ex-Series RNDIS and UVC interface" }, + { 0x09cb1006, "Ex-Series RNDIS and MSD interface" }, + { 0x09cb1007, "Ex-Series UVC and MSD interface" }, + { 0x09cb1008, "Serial Port" }, + { 0x09cb1996, "FLIR ONE Camera" }, { 0x09cc0404, "BAFO USB-ATA/ATAPI Bridge Controller" }, { 0x09cd2001, "Psion WaveFinder DAB radio receiver" }, { 0x09d30001, "ISDN TA / Light Rider 128K" }, @@ -13241,6 +13284,7 @@ static const value_string usb_products_vals[] = { { 0x09da024f, "RF Receiver and G6-20D Wireless Optical Mouse" }, { 0x09da0260, "KV-300H Isolation Keyboard" }, { 0x09da032b, "Wireless Mouse (Battery Free)" }, + { 0x09da1068, "Bloody A90 Mouse" }, { 0x09da8090, "X-718BK Oscar Optical Gaming Mouse" }, { 0x09da9033, "X-718BK Optical Mouse" }, { 0x09da9066, "F3 V-Track Gaming Mouse" }, @@ -13422,7 +13466,9 @@ static const value_string usb_products_vals[] = { { 0x0a5c2150, "BCM2046 Bluetooth Device" }, { 0x0a5c2151, "Bluetooth" }, { 0x0a5c2154, "BCM92046DG-CL1ROM Bluetooth 2.1 UHE Dongle" }, + { 0x0a5c216a, "BCM43142A0 Bluetooth" }, { 0x0a5c216c, "BCM43142A0 Bluetooth Device" }, + { 0x0a5c216d, "BCM43142A0 Bluetooth 4.0" }, { 0x0a5c216f, "BCM20702A0 Bluetooth" }, { 0x0a5c217d, "HP Bluethunder" }, { 0x0a5c217f, "BCM2045B (BDC-2.1)" }, @@ -13451,6 +13497,7 @@ static const value_string usb_products_vals[] = { { 0x0a5c5803, "BCM5880 Secure Applications Processor with secure keyboard" }, { 0x0a5c5804, "BCM5880 Secure Applications Processor with fingerprint swipe sensor" }, { 0x0a5c6300, "Pirelli Remote NDIS Device" }, + { 0x0a5c6410, "BCM20703A1 Bluetooth 4.1 + LE" }, { 0x0a5cbd11, "TiVo AG0100 802.11bg Wireless Adapter [Broadcom BCM4320]" }, { 0x0a5cbd13, "BCM4323 802.11abgn Wireless Adapter" }, { 0x0a5cbd16, "BCM4319 802.11bgn Wireless Adapter" }, @@ -13730,6 +13777,8 @@ static const value_string usb_products_vals[] = { { 0x0b0517c9, "USB-AC53 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]" }, { 0x0b0517cb, "Broadcom BCM20702A0 Bluetooth" }, { 0x0b0517d1, "AC51 802.11a/b/g/n/ac Wireless Adapter [Mediatek MT7610/Ralink RT2870]" }, + { 0x0b05180a, "Broadcom BCM20702 Single-Chip Bluetooth 4.0 + LE" }, + { 0x0b051825, "Qualcomm Bluetooth 4.1" }, { 0x0b054c80, "Asus TF300 Transformer" }, { 0x0b054c81, "Asus TF300 Transformer (USB debug mode)" }, { 0x0b054c90, "Asus TF700 Transformer" }, @@ -13756,10 +13805,15 @@ static const value_string usb_products_vals[] = { { 0x0b0c003f, "Todos C400 smartcard controller (Handelsbanken card reader)" }, { 0x0b0c0050, "Argos Mini II Smart Card Reader (CCID)" }, { 0x0b0d0000, "CenturyCD" }, + { 0x0b0e0348, "Jabra UC VOICE 550a MS" }, { 0x0b0e034c, "Jabra UC Voice 750 MS" }, + { 0x0b0e0410, "Jabra SPEAK 410" }, { 0x0b0e0420, "Jabra SPEAK 510" }, { 0x0b0e094d, "GN Netcom / Jabra REVO Wireless" }, + { 0x0b0e1017, "Jabra PRO 930" }, { 0x0b0e1022, "Jabra PRO 9450, Type 9400BS (DECT Headset)" }, + { 0x0b0e1041, "Jabra PRO 9460" }, + { 0x0b0e1900, "Jabra Biz 1900" }, { 0x0b0e2007, "GN 2000 Stereo Corded Headset" }, { 0x0b0e620c, "Jabra BT620s" }, { 0x0b0e9330, "Jabra GN9330 Headset" }, @@ -13768,6 +13822,7 @@ static const value_string usb_products_vals[] = { { 0x0b28100c, "Kenwood Media Keg HD10GB7 Sport Player" }, { 0x0b300006, "SM Media-Shuttle Card Reader" }, { 0x0b330020, "ShuttleXpress" }, + { 0x0b330030, "ShuttlePro v2" }, { 0x0b330700, "RollerMouse Pro" }, { 0x0b380003, "Keyboard" }, { 0x0b380010, "107-Key Keyboard" }, @@ -13816,6 +13871,7 @@ static const value_string usb_products_vals[] = { { 0x0b483011, "TT-connect S2-4600" }, { 0x0b483012, "TT-connect CT2-4650 CI" }, { 0x0b483014, "TT-TVStick CT2-4400" }, + { 0x0b483015, "TT-connect CT2-4650 CI" }, { 0x0b49064f, "Trance Vibrator" }, { 0x0b4b0100, "D'music MP3 Player" }, { 0x0b4d110a, "Graphtec CC200-20" }, @@ -13854,7 +13910,7 @@ static const value_string usb_products_vals[] = { { 0x0b957720, "AX88772" }, { 0x0b95772a, "AX88772A Fast Ethernet" }, { 0x0b95772b, "AX88772B" }, - { 0x0b957e2b, "AX88772B" }, + { 0x0b957e2b, "AX88772B Fast Ethernet Controller" }, { 0x0b977732, "Smart Card Reader" }, { 0x0b977761, "Oz776 1.1 Hub" }, { 0x0b977762, "Oz776 SmartCard Reader" }, @@ -14072,9 +14128,12 @@ static const value_string usb_products_vals[] = { { 0x0bb40ca5, "Android Phone [Evo Shift 4G]" }, { 0x0bb40ca8, "HTC EVO 4G LTE (second ID)" }, { 0x0bb40cae, "T-Mobile MyTouch 4G Slide [Doubleshot]" }, + { 0x0bb40de5, "One (M7)" }, { 0x0bb40dea, "M7_UL [HTC One]" }, { 0x0bb40f25, "One M8" }, + { 0x0bb40f63, "Desire 610 Via MTP" }, { 0x0bb40f64, "Desire 601" }, + { 0x0bb40fb4, "Remote NDIS based Device" }, { 0x0bb40ff8, "Desire HD (Tethering Mode)" }, { 0x0bb40ff9, "Desire / Desire HD / Hero / Thunderbolt (Charge Mode)" }, { 0x0bb40ffe, "Desire HD (modem mode)" }, @@ -14088,6 +14147,7 @@ static const value_string usb_products_vals[] = { { 0x0bc22100, "FreeAgent Go" }, { 0x0bc22200, "FreeAgent Go FW" }, { 0x0bc22300, "Expansion Portable" }, + { 0x0bc2231a, "Expansion Portable" }, { 0x0bc22320, "USB 3.0 bridge [Portable Expansion Drive]" }, { 0x0bc22321, "Expansion Portable" }, { 0x0bc22340, "FreeAgent External Hard Drive" }, @@ -14101,6 +14161,7 @@ static const value_string usb_products_vals[] = { { 0x0bc25021, "FreeAgent GoFlex USB 2.0" }, { 0x0bc25030, "FreeAgent GoFlex Upgrade Cable STAE104" }, { 0x0bc25031, "FreeAgent GoFlex USB 3.0" }, + { 0x0bc25032, "SATA cable" }, { 0x0bc25070, "FreeAgent GoFlex Desk" }, { 0x0bc25071, "FreeAgent GoFlex Desk" }, { 0x0bc250a1, "FreeAgent GoFlex Desk" }, @@ -14113,7 +14174,9 @@ static const value_string usb_products_vals[] = { { 0x0bc2ab00, "Slim Portable Drive" }, { 0x0bc2ab20, "Backup Plus Portable Drive" }, { 0x0bc2ab21, "Backup Plus Slim" }, + { 0x0bc2ab24, "Backup Plus Portable Drive" }, { 0x0bc2ab31, "Backup Plus Desktop Drive (5TB)" }, + { 0x0bc2ab34, "Backup Plus" }, { 0x0bc30001, "UMTS-TDD (TD-CDMA) modem" }, { 0x0bc70001, "ActiveHome (ACPI-compliant)" }, { 0x0bc70002, "Firecracker Interface (ACPI-compliant)" }, @@ -14136,6 +14199,7 @@ static const value_string usb_products_vals[] = { { 0x0bda0106, "Mass Storage Device" }, { 0x0bda0107, "Mass Storage Device" }, { 0x0bda0108, "Mass Storage Device" }, + { 0x0bda0109, "microSDXC Card Reader [Hama 00091047]" }, { 0x0bda0111, "RTS5111 Card Reader Controller" }, { 0x0bda0113, "Mass Storage Device" }, { 0x0bda0115, "Mass Storage Device (Multicard Reader)" }, @@ -14148,7 +14212,7 @@ static const value_string usb_products_vals[] = { { 0x0bda0139, "RTS5139 Card Reader Controller" }, { 0x0bda0151, "Mass Storage Device (Multicard Reader)" }, { 0x0bda0152, "Mass Storage Device" }, - { 0x0bda0153, "Mass Storage Device" }, + { 0x0bda0153, "3-in-1 (SD/SDHC/SDXC) Card Reader" }, { 0x0bda0156, "Mass Storage Device" }, { 0x0bda0157, "Mass Storage Device" }, { 0x0bda0158, "USB 2.0 multicard reader" }, @@ -14163,15 +14227,21 @@ static const value_string usb_products_vals[] = { { 0x0bda0184, "RTS5182 Card Reader" }, { 0x0bda0186, "Card Reader" }, { 0x0bda0301, "multicard reader" }, + { 0x0bda0307, "Card Reader" }, { 0x0bda1724, "RTL8723AU 802.11n WLAN Adapter" }, { 0x0bda2831, "RTL2831U DVB-T" }, { 0x0bda2832, "RTL2832U DVB-T" }, { 0x0bda2838, "RTL2838 DVB-T" }, { 0x0bda5401, "RTL 8153 USB 3.0 hub with gigabit ethernet" }, + { 0x0bda570c, "Asus laptop camera" }, { 0x0bda5730, "HP 2.0MP High Definition Webcam" }, { 0x0bda5775, "HP \"Truevision HD\" laptop camera" }, + { 0x0bda57b3, "Acer 640 \\xc3\\x97 480 laptop camera" }, + { 0x0bda57da, "Built-In Video Camera" }, { 0x0bda8150, "RTL8150 Fast Ethernet Adapter" }, { 0x0bda8151, "RTL8151 Adapteon Business Mobile Networks BV" }, + { 0x0bda8152, "RTL8152 Fast Ethernet Adapter" }, + { 0x0bda8153, "RTL8153 Gigabit Ethernet Adapter" }, { 0x0bda8171, "RTL8188SU 802.11n WLAN Adapter" }, { 0x0bda8172, "RTL8191SU 802.11n WLAN Adapter" }, { 0x0bda8174, "RTL8192SU 802.11n WLAN Adapter" }, @@ -14181,6 +14251,7 @@ static const value_string usb_products_vals[] = { { 0x0bda817f, "RTL8188RU 802.11n WLAN Adapter" }, { 0x0bda8187, "RTL8187 Wireless Adapter" }, { 0x0bda8189, "RTL8187B Wireless 802.11g 54Mbps Network Adapter" }, + { 0x0bda818b, "ACT-WNP-UA-005 802.11b/g/n WLAN Adapter" }, { 0x0bda8192, "RTL8191SU 802.11n Wireless Adapter" }, { 0x0bda8193, "RTL8192DU 802.11an WLAN Adapter" }, { 0x0bda8197, "RTL8187B Wireless Adapter" }, @@ -14198,6 +14269,7 @@ static const value_string usb_products_vals[] = { { 0x0bdb1909, "F3307 v2 Mobile Broadband Module" }, { 0x0bdb190a, "F3307 Mobile Broadband Module" }, { 0x0bdb190b, "C3607w v2 Mobile Broadband Module" }, + { 0x0bdb1926, "H5321 gw Mobile Broadband Driver" }, { 0x0bed1100, "CASHFLOW SC" }, { 0x0bed1101, "Series 2000 Combo Acceptor" }, { 0x0bf10001, "netMod Driver Ver 2.4.17 (CAPI)" }, @@ -14215,6 +14287,7 @@ static const value_string usb_products_vals[] = { { 0x0bf8100c, "Keyboard FSC KBPC PX" }, { 0x0bf8100f, "miniCard D2301 802.11bg Wireless Module [SiS 163U]" }, { 0x0bf81017, "Keyboard KB SCR" }, + { 0x0bf8101f, "Fujitsu Full HD Pro Webcam" }, { 0x0bfd0004, "USBcan II" }, { 0x0bfd000b, "Leaf Light HS" }, { 0x0bfd000e, "Leaf SemiPro HS" }, @@ -14415,6 +14488,10 @@ static const value_string usb_products_vals[] = { { 0x0c456480, "Sonix 1.3 MP Laptop Integrated Webcam" }, { 0x0c45648b, "Integrated Webcam" }, { 0x0c4564bd, "Sony Visual Communication Camera" }, + { 0x0c4564d2, "Integrated Webcam" }, + { 0x0c45651b, "HP Webcam" }, + { 0x0c456705, "Integrated HD Webcam" }, + { 0x0c456710, "Integrated Webcam" }, { 0x0c457401, "TEMPer Temperature Sensor" }, { 0x0c457402, "TEMPerHUM Temperature & Humidity Sensor" }, { 0x0c457403, "Foot Switch" }, @@ -14533,6 +14610,8 @@ static const value_string usb_products_vals[] = { { 0x0ca6107e, "Reader Controller" }, { 0x0ca62010, "myPad110 PC/SC Smart Card Reader" }, { 0x0ca63050, "EZ710 Smart Card Reader" }, + { 0x0cad1030, "APX Series Radio" }, + { 0x0cad1602, "IMPRES Battery Data Reader" }, { 0x0cad9001, "PowerPad Pocket PC\\xc2\\xa0Device" }, { 0x0caf2507, "Hi-Speed USB-to-IDE Bridge Controller" }, { 0x0caf2515, "Flash Disk Embedded Hub" }, @@ -14574,12 +14653,15 @@ static const value_string usb_products_vals[] = { { 0x0ccd0078, "Cinergy T XXS" }, { 0x0ccd0086, "Cinergy Hybrid XE" }, { 0x0ccd008e, "Cinergy HTC XS" }, + { 0x0ccd0096, "Grabby" }, { 0x0ccd0097, "Cinergy T RC MKII" }, { 0x0ccd0099, "AfaTech 9015 [Cinergy T Stick Dual]" }, { 0x0ccd00a5, "Cinergy Hybrid Stick" }, { 0x0ccd00a9, "RTL2838 DVB-T COFDM Demodulator [TerraTec Cinergy T Stick Black]" }, { 0x0ccd00b3, "NOXON DAB/DAB+ Stick" }, { 0x0ccd00e0, "NOXON DAB/DAB+ Stick V2" }, + { 0x0ccd0102, "Cinergy S2 Stick" }, + { 0x0ccd0105, "Cinergy S2 Box" }, { 0x0ccd10a7, "TerraTec G3" }, { 0x0cd40101, "BeolinkPC2" }, { 0x0cd50003, "U3" }, @@ -14643,12 +14725,15 @@ static const value_string usb_products_vals[] = { { 0x0cf33002, "AR3011 Bluetooth" }, { 0x0cf33004, "AR3012 Bluetooth 4.0" }, { 0x0cf33005, "AR3011 Bluetooth" }, + { 0x0cf33007, "AR3012 Bluetooth 4.0 (no firmware)" }, { 0x0cf33008, "Bluetooth (AR3011)" }, + { 0x0cf3311f, "AR3012 Bluetooth" }, { 0x0cf37015, "TP-Link TL-WN821N v3 / TL-WN822N v2 802.11n [Atheros AR7010+AR9287]" }, { 0x0cf39170, "AR9170 802.11n" }, { 0x0cf39271, "AR9271 802.11n" }, { 0x0cf3b002, "Ubiquiti WiFiStation 802.11n [Atheros AR9271]" }, { 0x0cf3b003, "Ubiquiti WiFiStationEXT 802.11n [Atheros AR9271]" }, + { 0x0cf3e006, "Dell Wireless 1802 Bluetooth 4.0 LE" }, { 0x0cf80750, "Claritel-i750 - vp" }, { 0x0cfc2301, "Magicolor 2300 DL" }, { 0x0cfc2350, "Magicolor 2350EN/3300" }, @@ -14877,12 +14962,14 @@ static const value_string usb_products_vals[] = { { 0x0db70002, "Goldpfeil P-LAN" }, { 0x0dba1000, "Mbox 1 [Mbox]" }, { 0x0dba3000, "Mbox 2" }, + { 0x0dbab011, "Eleven Rack" }, { 0x0dbc0003, "AND Serial Cable [AND Smart Cable]" }, { 0x0dbf0002, "SmartDongle Security Key" }, { 0x0dbf0200, "HDD Storage Solution" }, { 0x0dbf021b, "USB-2.0 IDE Adapter" }, { 0x0dbf0300, "Storage Adapter" }, { 0x0dbf0333, "Storage Adapter" }, + { 0x0dbf0502, "FSC Storagebird XL hard disk" }, { 0x0dbf0707, "ZIV Drive" }, { 0x0dc30801, "ASEDrive III" }, { 0x0dc30802, "ASEDrive IIIe" }, @@ -14970,8 +15057,10 @@ static const value_string usb_products_vals[] = { { 0x0df6005d, "WLA-2000 v1.001 WLAN [RTL8191SU]" }, { 0x0df60060, "WLA-4000 802.11bgn [Ralink RT3072]" }, { 0x0df60062, "WLA-5000 802.11abgn [Ralink RT3572]" }, + { 0x0df6006f, "WLA-5100" }, { 0x0df60072, "AX88179 Gigabit Ethernet [Sitecom]" }, { 0x0df6061c, "LN-028 Network USB 2.0 Adapter" }, + { 0x0df6214a, "IDE/SATA Combo Adapter [CN-330]" }, { 0x0df621f4, "44 St Bluetooth Device" }, { 0x0df62200, "Sitecom bluetooth2.0 class 2 dongle CN-512" }, { 0x0df62208, "Sitecom bluetooth2.0 class 2 dongle CN-520" }, @@ -15033,11 +15122,8 @@ static const value_string usb_products_vals[] = { { 0x0e210931, "Cowon iAudio X7 (MTP mode)" }, { 0x0e210941, "Cowon iAudio C2 (MTP mode)" }, { 0x0e210952, "Cowon iAudio 10 (MTP mode)" }, - { 0x0e360008, "Handyscope HS3" }, - { 0x0e360009, "Handyscope HS3 (br)" }, - { 0x0e36000a, "Handyscope HS4" }, - { 0x0e36000b, "Handyscope HS4 (br)" }, - { 0x0e36000e, "Handyscope HS4-DIFF" }, + { 0x0e360009, "Handyscope HS3" }, + { 0x0e36000b, "Handyscope HS4" }, { 0x0e36000f, "Handyscope HS4-DIFF (br)" }, { 0x0e360010, "Handyscope HS2" }, { 0x0e360011, "TiePieSCOPE HS805 (br)" }, @@ -15142,8 +15228,10 @@ static const value_string usb_products_vals[] = { { 0x0e8d0003, "MT6227 phone" }, { 0x0e8d0004, "MT6227 phone" }, { 0x0e8d0023, "S103" }, + { 0x0e8d00a5, "GSM modem [Medion Surfstick Model:S4222]" }, { 0x0e8d1806, "Samsung SE-208 Slim Portable DVD Writer" }, { 0x0e8d1836, "Samsung SE-S084 Super WriteMaster Slim External DVD writer" }, + { 0x0e8d1956, "Samsung SE-506 Portable BluRay Disc Writer" }, { 0x0e8d2000, "MT65xx Preloader" }, { 0x0e8d3329, "Qstarz BT-Q1000XT" }, { 0x0e8d763e, "MT7630e Bluetooth Adapter" }, @@ -15194,6 +15282,8 @@ static const value_string usb_products_vals[] = { { 0x0ef52366, "Flash Disk" }, { 0x0f030001, "Alpha 1200Sx" }, { 0x0f0d0011, "Real Arcade Pro 3" }, + { 0x0f0f0006, "GreenPak Universal Dev Board (Active Mode)" }, + { 0x0f0f8006, "GreenPak Universal Dev Board (Reset Mode)" }, { 0x0f111000, "CASSY-S" }, { 0x0f111010, "Pocket-CASSY" }, { 0x0f111020, "Mobile-CASSY" }, @@ -15209,6 +15299,7 @@ static const value_string usb_products_vals[] = { { 0x0f112030, "Converter Control Unit" }, { 0x0f112040, "Machine Test System" }, { 0x0f140012, "Vital'Act 3S" }, + { 0x0f140038, "XIRING Smart Card Terminal LEO V2" }, { 0x0f180002, "CCD" }, { 0x0f180006, "Focuser" }, { 0x0f180007, "Filter Wheel" }, @@ -15314,6 +15405,12 @@ static const value_string usb_products_vals[] = { { 0x0fce0181, "SONY SO-05D Xperia SX MTP" }, { 0x0fce0182, "SONY LT30p Xperia T MTP" }, { 0x0fce0186, "SONY LT25i Xperia V MTP" }, + { 0x0fce0188, "ST26i" }, + { 0x0fce019c, "C6833" }, + { 0x0fce019e, "C6903" }, + { 0x0fce01a5, "SO-04F" }, + { 0x0fce01a7, "D5503" }, + { 0x0fce01ba, "D6603 [Xperia Z3]" }, { 0x0fce01bb, "D5803 [Xperia Z3 Compact] (MTP mode)" }, { 0x0fce0dde, "Xperia Mini Pro Bootloader" }, { 0x0fce1010, "WMC Modem" }, @@ -15364,6 +15461,7 @@ static const value_string usb_products_vals[] = { { 0x0fce5182, "SONY LT30p Xperia T MTP+ADB" }, { 0x0fce5186, "SONY LT25i Xperia V MTP+ADB" }, { 0x0fce518c, "C1605 [Xperia E dual] MTD mode" }, + { 0x0fce51a7, "D5503 (Xperia Z1 Compact)" }, { 0x0fce614f, "Xperia X12 (debug mode)" }, { 0x0fce6166, "Xperia Mini Pro" }, { 0x0fce618c, "C1605 [Xperia E dual] MSC mode" }, @@ -15431,6 +15529,12 @@ static const value_string usb_products_vals[] = { { 0x0fcee166, "Xperia Mini Pro" }, { 0x0fcee167, "XPERIA mini" }, { 0x0fcee19b, "C2005 [Xperia M dual] (Mass Storage)" }, + { 0x0fcee1a9, "D5303" }, + { 0x0fcee1aa, "D2303" }, + { 0x0fcee1ad, "D5103" }, + { 0x0fcee1b0, "D6708" }, + { 0x0fcee1b5, "D2004" }, + { 0x0fcee1ba, "D6683" }, { 0x0fcef0fa, "MN800 / Smartwatch 2 (DFU mode)" }, { 0x0fcf1003, "ANT Development Board" }, { 0x0fcf1004, "ANTUSB Stick" }, diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers index 61a73be951..c9b58cb761 100644 --- a/epan/enterprise-numbers +++ b/epan/enterprise-numbers @@ -1,6 +1,6 @@ PRIVATE ENTERPRISE NUMBERS -(last updated 2016-09-02) +(last updated 2016-09-09) SMI Network Management Private Enterprise Codes: @@ -33511,8 +33511,8 @@ Decimal p.agsten&tk-online.net 8389 Ergon Informatik - Dominik Seitz - dominik.seitz&ergon.ch + Marc Buetikofer + airlock-iana-contact&ergon.ch 8390 Mettler Toledo Jeff Griffith @@ -180497,8 +180497,8 @@ Decentralization / Helenic Public Administra tim.nilimaa-svard&lumagate.com 45229 nyantec UG (haftungsbeschränkt) - Lars Petersen - lars&nyantec.com + Mikael Voss + mvs&nyantec.com 45230 RCD Radiokomunikace spol. s r. o. Vaclav Korecek @@ -193407,6 +193407,122 @@ Decentralization / Helenic Public Administra Wasatornet AB Victoria Eriksson victoria.eriksson&skogstjanst.se +48457 + KaX Pvt. Ltd + Samohan Kumar + kaxpvtltd&gmail.com +48458 + Otsuka America Pharmaceutical, Inc. + David Sullivan + david.sullivan&otsuka-us.com +48459 + Condast GmbH + Frank Brieger + frank.brieger&condast.de +48460 + Rotronic AG + Bruno Niklaus + bruno.niklaus&rotronic.ch +48461 + StudentBridge LLC + Sergii Koval + skoval&studentbridge.com +48462 + Insight media Devlopment. + Khandoker Golam Morsheed + gmorsheed&gmail.com +48463 + Fitworks Co., Ltd. + Hisaaki Takeuchi + iana&fit-works.co.jp +48464 + ANF AC Panamá, S.R.L. + Florencio Díaz + fdiaz&anf.es +48465 + Gestión Tributaria Territorial, S. A. + José Joaquín Callado Leal + jcallado>t.es +48466 + Chambre des Députés Luxembourg + Nicolas Dubois + chdcontact&chd.lu +48467 + Imperial College Healthcare + Yusuf Mangera + yusuf.mangera&imperial.nhs.uk +48468 + Lianozovo Electromechanical Plant + Rinat Gadelshin + gadelshin.r.n&topaz-atcs.com +48469 + Cancer Care Specialists + Wesley Falconer + wesley.falconer&etransmedia.com +48470 + Örnfrakt + Jan-Eric Lindberg + jan-eric.lindberg&ornfrakt.se +48471 + British Amateur Television Club + Philip Crump + phil&philcrump.co.uk +48472 + swissEmbedded GmbH + Dr. Daniel Haensse + info&swissembedded.com +48473 + mh2net, z.s. + Radim Horak + radim.horak&mh2net.cz +48474 + Klynt Industries + Dave McCarthy + dave&klynt.com +48475 + SIA Rigas udens + Andris Smits + andris.smits&rigasudens.lv +48476 + Zen Swipe, Inc. + Eric Lee + webmaster&zenswipe.com +48477 + Nuix North America Inc + Justin Capella + justin.capella&nuix.com +48478 + Hainan Goodstart Network Technology Co. Ltd. + gong ze + gongze&goodstart.com.cn +48479 + Sunshine Sugar + William Wood + itregistrations&sunshinesugar.com.au +48480 + finally safe GmbH + Dominique Petersen + infra&finally-safe.com +48481 + Falu Energi & Vatten AB + Daniel Ahlberg + daniel.ahlberg&fev.se +48482 + Linaro Ltd + Dave Pigott + dave.pigott&linaro.org +48483 + RecordSure Ltd. + Jacint Toth + jacint.toth&recordsure.com +48484 + topsystem Systemhaus GmbH + Karl-Heinz Gross + khg&topsystem.de +48485 + ITEC Training Solutions Ltd + Simon Watts + s.watts&itecskills.co.uk End of Document diff --git a/epan/sminmpec.c b/epan/sminmpec.c index dd11cfbc5d..42317f38eb 100644 --- a/epan/sminmpec.c +++ b/epan/sminmpec.c @@ -48477,6 +48477,35 @@ const value_string sminmpec_values[] = { { 48454, "Riddarhuset O G Paulis Donationsfond" }, { 48455, "Link\0303\0266pings Skogstj\0303\0244nst AB" }, { 48456, "Wasatornet AB" }, + { 48457, "KaX Pvt. Ltd" }, + { 48458, "Otsuka America Pharmaceutical, Inc. " }, + { 48459, "Condast GmbH" }, + { 48460, "Rotronic AG" }, + { 48461, "StudentBridge LLC" }, + { 48462, "Insight media Devlopment." }, + { 48463, "Fitworks Co., Ltd." }, + { 48464, "ANF AC Panam\0303\0241, S.R.L." }, + { 48465, "Gesti\0303\0263n Tributaria Territorial, S. A." }, + { 48466, "Chambre des D\0303\0251put\0303\0251s Luxembourg" }, + { 48467, "Imperial College Healthcare" }, + { 48468, "Lianozovo Electromechanical Plant" }, + { 48469, "Cancer Care Specialists" }, + { 48470, "\0303\0226rnfrakt" }, + { 48471, "British Amateur Television Club" }, + { 48472, "swissEmbedded GmbH" }, + { 48473, "mh2net, z.s." }, + { 48474, "Klynt Industries" }, + { 48475, "SIA Rigas udens" }, + { 48476, "Zen Swipe, Inc." }, + { 48477, "Nuix North America Inc" }, + { 48478, "Hainan Goodstart Network Technology Co. Ltd. " }, + { 48479, "Sunshine Sugar" }, + { 48480, "finally safe GmbH" }, + { 48481, "Falu Energi & Vatten AB" }, + { 48482, "Linaro Ltd" }, + { 48483, "RecordSure Ltd." }, + { 48484, "topsystem Systemhaus GmbH" }, + { 48485, "ITEC Training Solutions Ltd" }, { 0, NULL} }; @@ -1112,7 +1112,7 @@ 00:04:1F SonyInte # Sony Interactive Entertainment Inc. 00:04:20 SlimDevi # Slim Devices, Inc. 00:04:21 OcularNe # Ocular Networks -00:04:22 GordonKa # Gordon Kapes, Inc. +00:04:22 StudioTe # Studio Technologies, Inc 00:04:23 Intel # Intel Corporation 00:04:24 TmcSRL # TMC s.r.l. 00:04:25 Atmel # Atmel Corporation @@ -3003,7 +3003,7 @@ 00:0B:9E YasingTe # Yasing Technology Corp. 00:0B:9F NeueElsa # Neue ELSA GmbH 00:0B:A0 T&LInfor # T&L Information Inc. -00:0B:A1 Syscom # SYSCOM Ltd. +00:0B:A1 Fujikura # Fujikura Solutions Ltd. 00:0B:A2 Sumitomo # Sumitomo Electric Industries,Ltd 00:0B:A3 SiemensI # Siemens AG, I&S 00:0B:A4 ShironSa # Shiron Satellite Communications Ltd. (1996) @@ -17269,6 +17269,7 @@ 04:B0:E7 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 04:B3:B6 SeamapUk # Seamap (UK) Ltd 04:B4:66 Bsp # BSP Co., Ltd. +04:B6:48 Zenner 04:BA:36 LiSengTe # Li Seng Technology Ltd 04:BB:F9 Pavilion # Pavilion Data Systems Inc 04:BD:70 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD @@ -17852,6 +17853,7 @@ 10:5F:49 CiscoSpv # Cisco SPVTG 10:60:4B HewlettP # Hewlett Packard 10:62:C9 Adatis # Adatis GmbH & Co. KG +10:62:EB D-LinkIn # D-Link International 10:64:E2 AdfwebCo # ADFweb.com s.r.l. 10:65:A3 CoreBran # Core Brands LLC 10:65:CF Iqsim @@ -18305,6 +18307,7 @@ 1C:44:19 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 1C:45:93 TexasIns # Texas Instruments 1C:48:40 ImsMesss # IMS Messsysteme GmbH +1C:48:CE Guangdon # GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD 1C:48:F9 GnNetcom # GN Netcom A/S 1C:49:7B GemtekTe # Gemtek Technology Co., Ltd. 1C:4A:F7 Amon # AMON INC @@ -19391,6 +19394,7 @@ 34:4B:3D Fiberhom # Fiberhome Telecommunication Technologies Co.,LTD 34:4B:50 Zte # zte corporation 34:4C:A4 Amazipoi # amazipoint technology Ltd. +34:4C:C8 Echodyne # Echodyne Corp 34:4D:EA Zte # zte corporation 34:4D:F7 LgElectr # LG Electronics (Mobile Communications) 34:4F:3F Io-Power # IO-Power Technology Co., Ltd. @@ -21201,6 +21205,7 @@ 54:13:79 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 54:14:73 Wingtech # Wingtech Group (HongKong）Limited 54:14:FD Orbbec3d # Orbbec 3D Technology International +54:19:C8 VivoMobi # vivo Mobile Communication Co., Ltd. 54:1B:5D Techno-I # Techno-Innov 54:1D:FB Freestyl # Freestyle Energy Ltd 54:1E:56 JuniperN # Juniper Networks @@ -21342,6 +21347,7 @@ 54:F6:C5 FujianSt # FUJIAN STAR-NET COMMUNICATION CO.,LTD 54:F8:76 Abb # ABB AG 54:FA:3E SamsungE # Samsung Electronics Co.,Ltd +54:FA:96 Nokia 54:FB:58 Wiseware # WISEWARE, Lda 54:FD:BF ScheidtB # Scheidt & Bachmann GmbH 54:FF:82 DavitSol # Davit Solution co. @@ -21714,6 +21720,7 @@ 60:38:0E AlpsElec # ALPS ELECTRIC CO.,LTD. 60:38:E0 BelkinIn # Belkin International Inc. 60:39:1F Abb # ABB Ltd +60:3E:7B Gafachi # Gafachi, Inc. 60:3E:CA Cambridg # Cambridge Medical Robotics Ltd 60:3F:C5 Cox # COX CO., LTD 60:42:7F Shenzhen # SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LTD @@ -21852,6 +21859,7 @@ 64:10:84 HexiumTe # HEXIUM Technical Development Co., Ltd. 64:12:25 Cisco # Cisco Systems, Inc 64:12:69 ArrisGro # ARRIS Group, Inc. +64:13:6C Zte # zte corporation 64:16:7F Polycom 64:16:8D Cisco # Cisco Systems, Inc 64:16:F0 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD @@ -22082,6 +22090,7 @@ 68:87:6B InqMobil # INQ Mobile Limited 68:89:C1 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 68:8A:B5 EdpServi # EDP Servicos +68:8A:F0 Zte # zte corporation 68:8F:84 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 68:91:D0 IeeeRegi # IEEE Registration Authority 68:91:D0:00:00:00/28 CentralR # Central Railway Manufacturing @@ -22489,6 +22498,7 @@ 70:B3:D5:07:D0:00/36 Panorami # PANORAMIC POWER 70:B3:D5:07:E0:00/36 EntecEle # ENTEC Electric & Electronic CO., LTD 70:B3:D5:08:10:00/36 IstTechn # IST Technologies (SHENZHEN) Limited +70:B3:D5:08:30:00/36 ZaoZeo # ZAO ZEO 70:B3:D5:08:70:00/36 TempusFu # Tempus Fugit Consoles bvba 70:B3:D5:08:80:00/36 Optiscan # OptiScan Biomedical Corp. 70:B3:D5:08:E0:00/36 BeijingC # Beijing CONvision Technology Co.,Ltd @@ -22522,6 +22532,7 @@ 70:B3:D5:0C:D0:00/36 AmlOcean # AML Oceanographic 70:B3:D5:0C:E0:00/36 Innomind # Innominds Software Inc 70:B3:D5:0D:20:00/36 Unmanned # UNMANNED SPA +70:B3:D5:0D:30:00/36 TsatAs # TSAT AS 70:B3:D5:0D:60:00/36 TattileS # TATTILE SRL 70:B3:D5:0D:70:00/36 RussianT # Russian Telecom Equipment Company 70:B3:D5:0D:80:00/36 LaserIma # Laser Imagineering GmbH @@ -22684,6 +22695,7 @@ 70:B3:D5:29:F0:00/36 CodeHard # Code Hardware SA 70:B3:D5:2A:50:00/36 Taitotek # Taitotekniikka 70:B3:D5:2A:70:00/36 Plasmabi # Plasmability, LLC +70:B3:D5:2A:C0:00/36 NewImagi # New Imaging Technologies 70:B3:D5:2B:30:00/36 Has # HAS co.,ltd. 70:B3:D5:2B:90:00/36 Belectri # BELECTRIC GmbH 70:B3:D5:2B:A0:00/36 ActiveBr # Active Brains @@ -22718,6 +22730,7 @@ 70:B3:D5:30:80:00/36 DsdMicro # DSD MICROTECHNOLOGY,INC. 70:B3:D5:30:C0:00/36 SiconSrl # Sicon srl 70:B3:D5:31:30:00/36 DiehlCon # DIEHL Controls +70:B3:D5:31:70:00/36 IotopiaS # Iotopia Solutions 70:B3:D5:31:E0:00/36 Gillam-F # GILLAM-FEI S.A. 70:B3:D5:32:30:00/36 TattileS # TATTILE SRL 70:B3:D5:32:40:00/36 ThalesNe # Thales Nederland BV @@ -22802,6 +22815,7 @@ 70:B3:D5:3E:30:00/36 Head 70:B3:D5:3E:40:00/36 NeptecTe # Neptec Technologies Corp. 70:B3:D5:3E:50:00/36 Ateme +70:B3:D5:3E:80:00/36 CosmosWe # COSMOS web Co., Ltd. 70:B3:D5:3E:90:00/36 ApolloGi # APOLLO GIKEN Co.,Ltd. 70:B3:D5:3E:D0:00/36 UltraEle # Ultra Electronics Sonar System Division 70:B3:D5:3E:F0:00/36 VtronPty # Vtron Pty Ltd @@ -23282,10 +23296,12 @@ 70:B3:D5:95:90:00/36 ZulexInt # Zulex International Co.,Ltd. 70:B3:D5:95:A0:00/36 SigmannE # Sigmann Elektronik GmbH 70:B3:D5:96:F0:00/36 4cam # 4CAM GmbH +70:B3:D5:97:30:00/36 Autonomi # Autonomic Controls, Inc. 70:B3:D5:97:40:00/36 JirehInd # Jireh Industries Ltd. 70:B3:D5:97:50:00/36 CoesterA # Coester Automação Ltda 70:B3:D5:97:60:00/36 AtonarpM # Atonarp Micro-Systems India Pvt. Ltd. 70:B3:D5:97:C0:00/36 Nu-TekPo # Nu-Tek Power Controls and Automation +70:B3:D5:97:F0:00/36 Bistos # BISTOS.,Co.,Ltd 70:B3:D5:98:60:00/36 AplexTec # Aplex Technology Inc. 70:B3:D5:98:70:00/36 Axis # AXIS CORPORATION 70:B3:D5:98:90:00/36 Dcns @@ -23393,6 +23409,7 @@ 70:B3:D5:AA:C0:00/36 Sensotec # SensoTec GmbH 70:B3:D5:AA:D0:00/36 Bartec # Bartec GmbH 70:B3:D5:AA:E0:00/36 NuvizOy # Nuviz Oy +70:B3:D5:AB:00:00/36 OsrR&DIs # OSR R&D ISRAEL LTD 70:B3:D5:AB:40:00/36 SysTecEl # SYS TEC electronic GmbH 70:B3:D5:AB:50:00/36 Broadsof # BroadSoft Inc 70:B3:D5:AB:70:00/36 Siglead # SIGLEAD INC @@ -23659,6 +23676,7 @@ 70:B3:D5:D9:70:00/36 BrsSiste # BRS Sistemas Eletronicos 70:B3:D5:D9:B0:00/36 RussianT # Russian Telecom Equipment Company 70:B3:D5:D9:C0:00/36 Subiniti # Subinitial LLC +70:B3:D5:D9:D0:00/36 Electroi # Electroimpact, Inc. 70:B3:D5:D9:E0:00/36 GrupoEpe # Grupo Epelsa S.L. 70:B3:D5:DA:10:00/36 QprelSrl # Qprel srl 70:B3:D5:DA:80:00/36 TagarnoA # Tagarno AS @@ -24323,7 +24341,7 @@ 78:F7:D0 Silverbr # Silverbrook Research 78:F8:82 LgElectr # LG Electronics (Mobile Communications) 78:F9:44 Private -78:FC:14 BCommuni # B Communications Pty Ltd +78:FC:14 FamilyZo # Family Zone Cyber Safety Ltd 78:FD:94 Apple # Apple, Inc. 78:FE:3D JuniperN # Juniper Networks 78:FE:41 SocusNet # Socus networks @@ -25006,6 +25024,7 @@ 88:68:5C Shenzhen # Shenzhen ChuangDao & Perpetual Eternal Technology Co.,Ltd 88:6A:B1 VivoMobi # vivo Mobile Communication Co., Ltd. 88:6B:0F Bluegiga # Bluegiga Technologies OY +88:6B:44 SunnovoI # Sunnovo International Limited 88:6B:76 ChinaHop # CHINA HOPEFUL GROUP HOPEFUL ELECTRIC CO.,LTD 88:70:33 Hangzhou # Hangzhou Silan Microelectronic Inc 88:70:8C LenovoMo # Lenovo Mobile Communication Technology Ltd. @@ -25196,6 +25215,7 @@ 8C:99:E6 TctMobil # TCT mobile ltd 8C:A0:48 BeijingN # Beijing NeTopChip Technology Co.,LTD 8C:A2:FD Starry # Starry, Inc. +8C:A5:A1 Oregano- # Oregano Systems - Design & Consulting GmbH 8C:A6:DF Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 8C:A9:82 IntelCor # Intel Corporate 8C:AB:8E Shanghai # Shanghai Feixun Communication Co.,Ltd. @@ -25229,6 +25249,7 @@ 8C:DE:99 Comlab # Comlab Inc. 8C:DF:9D Nec # NEC Corporation 8C:E0:81 Zte # zte corporation +8C:E1:17 Zte # zte corporation 8C:E2:DA CircleMe # Circle Media Inc 8C:E7:48 Private 8C:E7:8C DkNetwor # DK Networks @@ -25496,7 +25517,7 @@ 94:8B:03 EagetInn # EAGET Innovation and Technology Co., Ltd. 94:8D:50 BeamexOy # Beamex Oy Ab 94:8E:89 Industri # INDUSTRIAS UNIDAS SA DE CV -94:8F:EE HughesTe # Hughes Telematics, Inc. +94:8F:EE VerizonT # Verizon Telematics 94:92:BC SyntechH # SYNTECH(HK) TECHNOLOGY LIMITED 94:94:26 Apple # Apple, Inc. 94:95:A0 Google # Google, Inc. @@ -25507,6 +25528,7 @@ 94:9F:3E Sonos # Sonos, Inc. 94:9F:3F OptekDig # Optek Digital Technology company limited 94:9F:B4 ChengduJ # ChengDu JiaFaAnTai Technology Co.,Ltd +94:A0:4E BostexTe # Bostex Technology Co., LTD 94:A1:A2 AmpakTec # AMPAK Technology, Inc. 94:A7:B7 Zte # zte corporation 94:A7:BC Bodymedi # BodyMedia, Inc. @@ -25729,6 +25751,7 @@ 98:F0:58 Lynxspri # Lynxspring, Incl. 98:F0:AB Apple # Apple, Inc. 98:F1:70 MurataMa # Murata Manufacturing Co., Ltd. +98:F1:99 NecPlatf # NEC Platforms, Ltd. 98:F4:28 Zte # zte corporation 98:F5:37 Zte # zte corporation 98:F5:A9 OhsungEl # OHSUNG ELECTRONICS CO.,LTD. @@ -26110,6 +26133,7 @@ A4:01:30 Abisyste # ABIsystems Co., LTD A4:02:B9 IntelCor # Intel Corporate A4:05:9E StaInfin # STA Infinity LLP A4:08:EA MurataMa # Murata Manufacturing Co., Ltd. +A4:08:F5 Sagemcom # Sagemcom Broadband SAS A4:09:CB AlfredKa # Alfred Kaercher GmbH & Co KG A4:0B:ED CarryTec # Carry Technology Co.,Ltd A4:0C:C3 Cisco # Cisco Systems, Inc @@ -26192,9 +26216,19 @@ A4:56:02 Fenglian # fenglian Technology Co.,Ltd. A4:56:1B Mcot # MCOT Corporation A4:56:30 Cisco # Cisco Systems, Inc A4:58:0F IeeeRegi # IEEE Registration Authority +A4:58:0F:00:00:00/28 Innopro +A4:58:0F:10:00:00/28 StoneLoc # Stone Lock Global, Inc. +A4:58:0F:30:00:00/28 Engineer # Engineered SA +A4:58:0F:40:00:00/28 Shenzhen # Shenzhen City billion Leiden science and Technology Co., Ltd. A4:58:0F:50:00:00/28 CoasiaMi # CoAsia Microelectronics Corp. +A4:58:0F:60:00:00/28 Astro # Astro, Inc +A4:58:0F:70:00:00/28 Changsha # Changsha Tai Hui Network Technology Co.,Ltd +A4:58:0F:80:00:00/28 AirLiqui # AIR LIQUIDE MEDICAL SYSTEMS A4:58:0F:90:00:00/28 KseniaSe # Ksenia Security srl +A4:58:0F:A0:00:00/28 Guangzho # GUANGZHOU OPTICAL BRIDGE COMMUNICATION EQUIPMENT CO.,LTD. +A4:58:0F:B0:00:00/28 AbbPghv # ABB AB PGHV A4:58:0F:C0:00:00/28 Homebeav # Homebeaver +A4:58:0F:D0:00:00/28 EyeIoLlc # EYE IO, LLC A4:5A:1C Smart-El # smart-electronic GmbH A4:5C:27 Nintendo # Nintendo Co., Ltd. A4:5D:36 HewlettP # Hewlett Packard @@ -26578,6 +26612,7 @@ AC:C2:EC CltIntLI # CLT INT'L IND. CORP. AC:C3:3A SamsungE # Samsung Electronics Co.,Ltd AC:C5:1B ZhuhaiPa # Zhuhai Pantum Electronics Co., Ltd. AC:C5:95 Graphite # Graphite Systems +AC:C6:62 Mitrasta # MitraStar Technology Corp. AC:C6:98 KohzuPre # Kohzu Precision Co., Ltd. AC:C7:3F Vitsmo # VITSMO CO., LTD. AC:C9:35 Ness # Ness Corporation @@ -27110,6 +27145,7 @@ B8:E6:25 2wire # 2Wire Inc B8:E7:79 9solutio # 9Solutions Oy B8:E8:56 Apple # Apple, Inc. B8:E9:37 Sonos # Sonos, Inc. +B8:EC:A3 ZyxelCom # ZyXEL Communications Corporation B8:EE:65 LiteonTe # Liteon Technology Corporation B8:EE:79 YwireTec # YWire Technologies, Inc. B8:F0:80 Sps # SPS, INC. @@ -27319,6 +27355,7 @@ C0:14:3D HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. C0:18:85 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. C0:1A:DA Apple # Apple, Inc. C0:1E:9B PixaviAs # Pixavi AS +C0:21:0D Shenzhen # SHENZHEN RF-LINK TECHNOLOGY CO.,LTD. C0:22:50 Private C0:25:06 Avm # AVM GmbH C0:25:5C Cisco # Cisco Systems, Inc @@ -27918,6 +27955,7 @@ CC:96:A0 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD CC:9E:00 Nintendo # Nintendo Co., Ltd. CC:9F:35 Transbit # Transbit Sp. z o.o. CC:A0:E5 DzgMeter # DZG Metering GmbH +CC:A2:19 Shenzhen # SHENZHEN ALONG INVESTMENT CO.,LTD CC:A2:23 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD CC:A2:60 SichuanT # SICHUAN TIANYI COMHEART TELECOMCO.,LTD CC:A3:74 Guangdon # Guangdong Guanglian Electronic Technology Co.Ltd @@ -28643,6 +28681,7 @@ DC:CE:C1 Cisco # Cisco Systems, Inc DC:CF:94 BeijingR # Beijing Rongcheng Hutong Technology Co., Ltd. DC:CF:96 SamsungE # Samsung Electronics Co.,Ltd DC:D0:F7 Bentek # Bentek Systems Ltd. +DC:D2:55 KinpoEle # Kinpo Electronics, Inc. DC:D2:FC HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD DC:D3:21 Humax # HUMAX Co., Ltd. DC:D5:2A SunnyHea # Sunny Heart Limited @@ -29844,6 +29883,7 @@ FC:0A:81 ZebraTec # Zebra Technologies Inc FC:0F:4B TexasIns # Texas Instruments FC:0F:E6 SonyInte # Sony Interactive Entertainment Inc. FC:10:BD ControlS # Control Sistematizado S.A. +FC:10:C6 TaicangT # Taicang T&W Electronics FC:11:86 Logic3 # Logic3 plc FC:13:49 GlobalAp # Global Apps Corp. FC:15:B4 HewlettP # Hewlett Packard @@ -29873,6 +29913,7 @@ FC:33:5F Polyera FC:35:98 Favite # Favite Inc. FC:35:E6 Visteon # Visteon corp FC:37:2B SichuanT # SICHUAN TIANYI COMHEART TELECOMCO.,LTD +FC:3C:E9 Tsington # Tsingtong Technologies Co, Ltd. FC:3D:93 Longchee # LONGCHEER TELECOMMUNICATION LIMITED FC:3F:7C HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD FC:3F:AB HenanLan # Henan Lanxin Technology Co., Ltd diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts index b3c72beb00..a68ccfbb4c 100644 --- a/ui/qt/wireshark_de.ts +++ b/ui/qt/wireshark_de.ts @@ -733,211 +733,214 @@ <context> <name>CaptureFileDialog</name> <message> - <location filename="capture_file_dialog.cpp" line="173"/> + <location filename="capture_file_dialog.cpp" line="140"/> <source>This capture file contains comments.</source> <translation>Diese Mitschnittdatei enthält Kommentare.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="183"/> + <location filename="capture_file_dialog.cpp" line="150"/> <source>The file format you chose doesn't support comments. Do you want to save the capture in a format that supports comments or discard the comments and save in the format you chose?</source> <translation>Das ausgewählte Dateiformat unterstützt keine Kommentare. Möchten Sie den Mitschnitt in einem Dateiformat abspeichern das Kommentare unterstützt, oder wollen Sie die Kommentare verwerfen und im ausgewählten Format abspeichern?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="187"/> - <location filename="capture_file_dialog.cpp" line="196"/> + <location filename="capture_file_dialog.cpp" line="154"/> + <location filename="capture_file_dialog.cpp" line="163"/> <source>Discard comments and save</source> <translation>Kommentare verwerfen und speichern</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="188"/> + <location filename="capture_file_dialog.cpp" line="155"/> <source>Save in another format</source> <translation>In einem anderen Format speichern</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="193"/> + <location filename="capture_file_dialog.cpp" line="160"/> <source>No file format in which it can be saved supports comments. Do you want to discard the comments and save in the format you chose?</source> <translation>Kein mögliches Dateiformat unterstützt Kommentare. Möchten Sie die Kommentare verwerfen und in dem ausgewählten Format speichern?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="412"/> + <location filename="capture_file_dialog.cpp" line="379"/> <source>All Files (</source> <translation>Alle Dateien (</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="418"/> + <location filename="capture_file_dialog.cpp" line="385"/> <source>All Capture Files</source> <translation>Alle Mitschnittdateien</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="454"/> + <location filename="capture_file_dialog.cpp" line="420"/> <source>Format:</source> <translation>Format:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="459"/> + <location filename="capture_file_dialog.cpp" line="425"/> <source>Size:</source> <translation>Größe:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="464"/> + <location filename="capture_file_dialog.cpp" line="430"/> + <source>Start / elapsed:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="476"/> + <source>Automatically detect file type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="772"/> + <source>%1, error after %2 packets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="779"/> + <source>%1, timed out at %2 packets</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Packets:</source> - <translation>Pakete:</translation> + <translation type="vanished">Pakete:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="469"/> <source>First Packet:</source> - <translation>Erstes Paket:</translation> + <translation type="vanished">Erstes Paket:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="474"/> <source>Elapsed Time:</source> - <translation>Verstrichene Zeit:</translation> + <translation type="vanished">Verstrichene Zeit:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="486"/> + <location filename="capture_file_dialog.cpp" line="442"/> <source>Prepend packets</source> <translation>Pakete vorne einfügen</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="487"/> + <location filename="capture_file_dialog.cpp" line="443"/> <source>Insert packets from the selected file before the current file. Packet timestamps will be ignored.</source> <translation>Pakete aus der ausgewählten Datei vor der aktuellen Datei einfügen. Der Zeitstempel der Pakete wird dabei ignoriert.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="490"/> + <location filename="capture_file_dialog.cpp" line="446"/> <source>Merge chronologically</source> <translation>Chronologisch zusammenführen</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="491"/> + <location filename="capture_file_dialog.cpp" line="447"/> <source>Insert packets in chronological order.</source> <translation>Pakete in chronologischer Reihenfolge einfügen</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="495"/> + <location filename="capture_file_dialog.cpp" line="451"/> <source>Append packets</source> <translation>Pakete anfügen</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="496"/> + <location filename="capture_file_dialog.cpp" line="452"/> <source>Insert packets from the selected file after the current file. Packet timestamps will be ignored.</source> <translation>Pakete aus der ausgewählten Datei nach der aktuellen Datei anfügen. Die Zeitstempel der Pakete werden ignoriert.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="511"/> + <location filename="capture_file_dialog.cpp" line="467"/> <source>Read filter:</source> <translation>Lesefilter:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="520"/> <source>Automatic</source> - <translation>Automatisch</translation> + <translation type="vanished">Automatisch</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="529"/> <source>&MAC name resolution</source> - <translation>&MAC-Namensauflösung</translation> + <translation type="vanished">&MAC-Namensauflösung</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="533"/> <source>&Transport name resolution</source> - <translation>&Transportschicht-Namensauflösung</translation> + <translation type="vanished">&Transportschicht-Namensauflösung</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="537"/> <source>&Network name resolution</source> - <translation>&Netzwerk-Namensauflösung</translation> + <translation type="vanished">&Netzwerk-Namensauflösung</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="541"/> <source>&External name resolver</source> - <translation>&Externe Namensauflösung</translation> + <translation type="vanished">&Externe Namensauflösung</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="547"/> + <location filename="capture_file_dialog.cpp" line="485"/> <source>Compress with g&zip</source> <translation>Mit g&zip komprimieren</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="578"/> + <location filename="capture_file_dialog.cpp" line="516"/> <source>Open Capture File</source> <oldsource>Wireshark: Open Capture File</oldsource> <translation>Mitschnittdatei öffnen</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="614"/> + <location filename="capture_file_dialog.cpp" line="546"/> <source>Save Capture File As</source> <oldsource>Wireshark: Save Capture File As</oldsource> <translation>Mitschnittdatei speichern unter</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="620"/> + <location filename="capture_file_dialog.cpp" line="552"/> <source>Save as:</source> <translation>Speichern als:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="642"/> + <location filename="capture_file_dialog.cpp" line="574"/> <source>Export Specified Packets</source> <oldsource>Wireshark: Export Specified Packets</oldsource> <translation>Ausgewählte Pakete exportieren</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="646"/> + <location filename="capture_file_dialog.cpp" line="578"/> <source>Export as:</source> <translation>Exportieren als:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="675"/> + <location filename="capture_file_dialog.cpp" line="607"/> <source>Merge Capture File</source> <oldsource>Wireshark: Merge Capture File</oldsource> <translation>Mitschnittdatei zusammenführen</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="777"/> - <location filename="capture_file_dialog.cpp" line="778"/> - <location filename="capture_file_dialog.cpp" line="779"/> - <location filename="capture_file_dialog.cpp" line="780"/> - <location filename="capture_file_dialog.cpp" line="781"/> <source>-</source> - <translation>-</translation> + <translation type="vanished">-</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="788"/> + <location filename="capture_file_dialog.cpp" line="718"/> <source>directory</source> <translation>Verzeichnis</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="795"/> + <location filename="capture_file_dialog.cpp" line="725"/> <source>unknown file format</source> <translation>unbekanntes Dateiformat</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="797"/> + <location filename="capture_file_dialog.cpp" line="727"/> <source>error opening file</source> <translation>Fehler beim Öffnen der Datei</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="811"/> <source>%1 bytes</source> - <translation>%1 Byte</translation> + <translation type="vanished">%1 Byte</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="840"/> <source>error after reading %1 packets</source> - <translation>Fehler nach dem Lesen von %1 Paketen</translation> + <translation type="vanished">Fehler nach dem Lesen von %1 Paketen</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="846"/> <source>more than %1 (preview timeout)</source> - <translation>mehr als %1 (Vorschauzeitüberschreitung)</translation> + <translation type="vanished">mehr als %1 (Vorschauzeitüberschreitung)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="865"/> <source>?</source> - <translation>?</translation> + <translation type="vanished">?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="871"/> + <location filename="capture_file_dialog.cpp" line="806"/> <source>unknown</source> <translation>unbekannt</translation> </message> @@ -2654,13 +2657,13 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation> <context> <name>ExtcapOptionsDialog</name> <message> - <location filename="extcap_options_dialog.cpp" line="74"/> - <location filename="extcap_options_dialog.cpp" line="108"/> + <location filename="extcap_options_dialog.cpp" line="76"/> + <location filename="extcap_options_dialog.cpp" line="110"/> <source>Extcap Interface Options</source> <translation>Extcap-Schnittstellenoptionen</translation> </message> <message> - <location filename="extcap_options_dialog.cpp" line="78"/> + <location filename="extcap_options_dialog.cpp" line="80"/> <source>Start</source> <translation>Start</translation> </message> @@ -15163,6 +15166,11 @@ text-decoration: underline; <translation>Auf Anzeigenfilter einschränken</translation> </message> <message> + <location filename="traffic_table_dialog.ui" line="68"/> + <source><html><head/><body><p>Show absolute times in the start time column.</p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="traffic_table_dialog.ui" line="71"/> <source>Absolute start time</source> <translation type="unfinished"></translation> diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts index 7b404c6e00..4531ac2b70 100644 --- a/ui/qt/wireshark_en.ts +++ b/ui/qt/wireshark_en.ts @@ -729,211 +729,162 @@ <context> <name>CaptureFileDialog</name> <message> - <location filename="capture_file_dialog.cpp" line="173"/> + <location filename="capture_file_dialog.cpp" line="140"/> <source>This capture file contains comments.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="183"/> + <location filename="capture_file_dialog.cpp" line="150"/> <source>The file format you chose doesn't support comments. Do you want to save the capture in a format that supports comments or discard the comments and save in the format you chose?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="187"/> - <location filename="capture_file_dialog.cpp" line="196"/> + <location filename="capture_file_dialog.cpp" line="154"/> + <location filename="capture_file_dialog.cpp" line="163"/> <source>Discard comments and save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="188"/> + <location filename="capture_file_dialog.cpp" line="155"/> <source>Save in another format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="193"/> + <location filename="capture_file_dialog.cpp" line="160"/> <source>No file format in which it can be saved supports comments. Do you want to discard the comments and save in the format you chose?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="412"/> + <location filename="capture_file_dialog.cpp" line="379"/> <source>All Files (</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="418"/> + <location filename="capture_file_dialog.cpp" line="385"/> <source>All Capture Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="454"/> + <location filename="capture_file_dialog.cpp" line="420"/> <source>Format:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="459"/> + <location filename="capture_file_dialog.cpp" line="425"/> <source>Size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="464"/> - <source>Packets:</source> + <location filename="capture_file_dialog.cpp" line="430"/> + <source>Start / elapsed:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="469"/> - <source>First Packet:</source> + <location filename="capture_file_dialog.cpp" line="476"/> + <source>Automatically detect file type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="474"/> - <source>Elapsed Time:</source> + <location filename="capture_file_dialog.cpp" line="772"/> + <source>%1, error after %2 packets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="486"/> + <location filename="capture_file_dialog.cpp" line="779"/> + <source>%1, timed out at %2 packets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="442"/> <source>Prepend packets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="487"/> + <location filename="capture_file_dialog.cpp" line="443"/> <source>Insert packets from the selected file before the current file. Packet timestamps will be ignored.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="490"/> + <location filename="capture_file_dialog.cpp" line="446"/> <source>Merge chronologically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="491"/> + <location filename="capture_file_dialog.cpp" line="447"/> <source>Insert packets in chronological order.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="495"/> + <location filename="capture_file_dialog.cpp" line="451"/> <source>Append packets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="496"/> + <location filename="capture_file_dialog.cpp" line="452"/> <source>Insert packets from the selected file after the current file. Packet timestamps will be ignored.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="511"/> + <location filename="capture_file_dialog.cpp" line="467"/> <source>Read filter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="520"/> - <source>Automatic</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="529"/> - <source>&MAC name resolution</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="533"/> - <source>&Transport name resolution</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="537"/> - <source>&Network name resolution</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="541"/> - <source>&External name resolver</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="547"/> + <location filename="capture_file_dialog.cpp" line="485"/> <source>Compress with g&zip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="578"/> + <location filename="capture_file_dialog.cpp" line="516"/> <source>Open Capture File</source> <oldsource>Wireshark: Open Capture File</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="614"/> + <location filename="capture_file_dialog.cpp" line="546"/> <source>Save Capture File As</source> <oldsource>Wireshark: Save Capture File As</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="620"/> + <location filename="capture_file_dialog.cpp" line="552"/> <source>Save as:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="642"/> + <location filename="capture_file_dialog.cpp" line="574"/> <source>Export Specified Packets</source> <oldsource>Wireshark: Export Specified Packets</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="646"/> + <location filename="capture_file_dialog.cpp" line="578"/> <source>Export as:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="675"/> + <location filename="capture_file_dialog.cpp" line="607"/> <source>Merge Capture File</source> <oldsource>Wireshark: Merge Capture File</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="777"/> - <location filename="capture_file_dialog.cpp" line="778"/> - <location filename="capture_file_dialog.cpp" line="779"/> - <location filename="capture_file_dialog.cpp" line="780"/> - <location filename="capture_file_dialog.cpp" line="781"/> - <source>-</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="788"/> + <location filename="capture_file_dialog.cpp" line="718"/> <source>directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="795"/> + <location filename="capture_file_dialog.cpp" line="725"/> <source>unknown file format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="797"/> + <location filename="capture_file_dialog.cpp" line="727"/> <source>error opening file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="811"/> - <source>%1 bytes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="840"/> - <source>error after reading %1 packets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="846"/> - <source>more than %1 (preview timeout)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="865"/> - <source>?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="871"/> + <location filename="capture_file_dialog.cpp" line="806"/> <source>unknown</source> <translation type="unfinished"></translation> </message> @@ -2639,13 +2590,13 @@ PLEASE NOTE: One option MUST be selected.</source> <context> <name>ExtcapOptionsDialog</name> <message> - <location filename="extcap_options_dialog.cpp" line="74"/> - <location filename="extcap_options_dialog.cpp" line="108"/> + <location filename="extcap_options_dialog.cpp" line="76"/> + <location filename="extcap_options_dialog.cpp" line="110"/> <source>Extcap Interface Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="extcap_options_dialog.cpp" line="78"/> + <location filename="extcap_options_dialog.cpp" line="80"/> <source>Start</source> <translation type="unfinished"></translation> </message> @@ -14912,6 +14863,11 @@ a:hover { <translation type="unfinished"></translation> </message> <message> + <location filename="traffic_table_dialog.ui" line="68"/> + <source><html><head/><body><p>Show absolute times in the start time column.</p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="traffic_table_dialog.ui" line="71"/> <source>Absolute start time</source> <translation type="unfinished"></translation> diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts index b225daca3f..d24e58219f 100644 --- a/ui/qt/wireshark_fr.ts +++ b/ui/qt/wireshark_fr.ts @@ -733,211 +733,214 @@ <context> <name>CaptureFileDialog</name> <message> - <location filename="capture_file_dialog.cpp" line="173"/> + <location filename="capture_file_dialog.cpp" line="140"/> <source>This capture file contains comments.</source> <translation>Le fichier de capture contient des commentaires.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="183"/> + <location filename="capture_file_dialog.cpp" line="150"/> <source>The file format you chose doesn't support comments. Do you want to save the capture in a format that supports comments or discard the comments and save in the format you chose?</source> <translation>Le format de fichier que vous avez choisi ne supporte pas les commentaires. Voulez-vous enregistrer la capture dans un format qui prend en charge les commentaires ou ignorer les commentaires et les enregistrer dans le format que vous avez choisi?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="187"/> - <location filename="capture_file_dialog.cpp" line="196"/> + <location filename="capture_file_dialog.cpp" line="154"/> + <location filename="capture_file_dialog.cpp" line="163"/> <source>Discard comments and save</source> <translation>Ignorer commentaires et sauvegarder</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="188"/> + <location filename="capture_file_dialog.cpp" line="155"/> <source>Save in another format</source> <translation>Sauvegarder dans un autre format</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="193"/> + <location filename="capture_file_dialog.cpp" line="160"/> <source>No file format in which it can be saved supports comments. Do you want to discard the comments and save in the format you chose?</source> <translation>Le format de fichier dans lequel vous voulez sauvegarder ne prendre pas en charge les commentaires. Voulez-vous supprimer les commentaires et enregistrer dans le format que vous avez choisi?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="412"/> + <location filename="capture_file_dialog.cpp" line="379"/> <source>All Files (</source> <translation>Tous les Fichiers (</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="418"/> + <location filename="capture_file_dialog.cpp" line="385"/> <source>All Capture Files</source> <translation>Tous les fichiers de capture</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="454"/> + <location filename="capture_file_dialog.cpp" line="420"/> <source>Format:</source> <translation>Format:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="459"/> + <location filename="capture_file_dialog.cpp" line="425"/> <source>Size:</source> <translation>Taille:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="464"/> + <location filename="capture_file_dialog.cpp" line="430"/> + <source>Start / elapsed:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="476"/> + <source>Automatically detect file type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="772"/> + <source>%1, error after %2 packets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="779"/> + <source>%1, timed out at %2 packets</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Packets:</source> - <translation>Paquets:</translation> + <translation type="vanished">Paquets:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="469"/> <source>First Packet:</source> - <translation>Premier Paquet:</translation> + <translation type="vanished">Premier Paquet:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="474"/> <source>Elapsed Time:</source> - <translation>Temps écoulé</translation> + <translation type="vanished">Temps écoulé</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="486"/> + <location filename="capture_file_dialog.cpp" line="442"/> <source>Prepend packets</source> <translation>Ajout de paquets</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="487"/> + <location filename="capture_file_dialog.cpp" line="443"/> <source>Insert packets from the selected file before the current file. Packet timestamps will be ignored.</source> <translation>Insérer les paquets à partir du fichier sélectionné avant que le fichier actuel. Horodatage des paquets seront ignorés.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="490"/> + <location filename="capture_file_dialog.cpp" line="446"/> <source>Merge chronologically</source> <translation>Fusionner chronologiquement</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="491"/> + <location filename="capture_file_dialog.cpp" line="447"/> <source>Insert packets in chronological order.</source> <translation>Insérer des paquets dans l'ordre chronologique.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="495"/> + <location filename="capture_file_dialog.cpp" line="451"/> <source>Append packets</source> <translation>Ajout de paquets</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="496"/> + <location filename="capture_file_dialog.cpp" line="452"/> <source>Insert packets from the selected file after the current file. Packet timestamps will be ignored.</source> <translation>Insérer des paquets à partir du fichier sélectionné après le fichier en cours. Horodatage des paquets seront ignorés.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="511"/> + <location filename="capture_file_dialog.cpp" line="467"/> <source>Read filter:</source> <translation>Filtre de lecture:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="520"/> <source>Automatic</source> - <translation>Automatique</translation> + <translation type="vanished">Automatique</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="529"/> <source>&MAC name resolution</source> - <translation>Résolution d'adresse &MAC</translation> + <translation type="vanished">Résolution d'adresse &MAC</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="533"/> <source>&Transport name resolution</source> - <translation>Résolution du nom de &Transport</translation> + <translation type="vanished">Résolution du nom de &Transport</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="537"/> <source>&Network name resolution</source> - <translation>Résolution de nom &Réseau</translation> + <translation type="vanished">Résolution de nom &Réseau</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="541"/> <source>&External name resolver</source> - <translation>Résolution de nom &externe</translation> + <translation type="vanished">Résolution de nom &externe</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="547"/> + <location filename="capture_file_dialog.cpp" line="485"/> <source>Compress with g&zip</source> <translation>Compresser avec g&zip</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="578"/> + <location filename="capture_file_dialog.cpp" line="516"/> <source>Open Capture File</source> <oldsource>Wireshark: Open Capture File</oldsource> <translation>Ouvrir un fichier de capture</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="614"/> + <location filename="capture_file_dialog.cpp" line="546"/> <source>Save Capture File As</source> <oldsource>Wireshark: Save Capture File As</oldsource> <translation>Wireshark: Sauvegarder le fichier de capture sous </translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="620"/> + <location filename="capture_file_dialog.cpp" line="552"/> <source>Save as:</source> <translation>Sauvegarder sous:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="642"/> + <location filename="capture_file_dialog.cpp" line="574"/> <source>Export Specified Packets</source> <oldsource>Wireshark: Export Specified Packets</oldsource> <translation>Exporter les paquets séléctionnés</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="646"/> + <location filename="capture_file_dialog.cpp" line="578"/> <source>Export as:</source> <translation>Exporter sous:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="675"/> + <location filename="capture_file_dialog.cpp" line="607"/> <source>Merge Capture File</source> <oldsource>Wireshark: Merge Capture File</oldsource> <translation>Fusionner des captures</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="777"/> - <location filename="capture_file_dialog.cpp" line="778"/> - <location filename="capture_file_dialog.cpp" line="779"/> - <location filename="capture_file_dialog.cpp" line="780"/> - <location filename="capture_file_dialog.cpp" line="781"/> <source>-</source> - <translation>-</translation> + <translation type="vanished">-</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="788"/> + <location filename="capture_file_dialog.cpp" line="718"/> <source>directory</source> <translation>dossier</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="795"/> + <location filename="capture_file_dialog.cpp" line="725"/> <source>unknown file format</source> <translation>Format du fichier inconnu</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="797"/> + <location filename="capture_file_dialog.cpp" line="727"/> <source>error opening file</source> <translation>erreur pour ouvrir le fichier</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="811"/> <source>%1 bytes</source> - <translation>%1 octets</translation> + <translation type="vanished">%1 octets</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="840"/> <source>error after reading %1 packets</source> - <translation>erreur après avoir lu %1 paquets</translation> + <translation type="vanished">erreur après avoir lu %1 paquets</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="846"/> <source>more than %1 (preview timeout)</source> - <translation>plus de %1 (aperçu timeout)</translation> + <translation type="vanished">plus de %1 (aperçu timeout)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="865"/> <source>?</source> - <translation>?</translation> + <translation type="vanished">?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="871"/> + <location filename="capture_file_dialog.cpp" line="806"/> <source>unknown</source> <translation>inconnu</translation> </message> @@ -2655,13 +2658,13 @@ si vous voulez utiliser des fichiers multiples.</translation> <context> <name>ExtcapOptionsDialog</name> <message> - <location filename="extcap_options_dialog.cpp" line="74"/> - <location filename="extcap_options_dialog.cpp" line="108"/> + <location filename="extcap_options_dialog.cpp" line="76"/> + <location filename="extcap_options_dialog.cpp" line="110"/> <source>Extcap Interface Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="extcap_options_dialog.cpp" line="78"/> + <location filename="extcap_options_dialog.cpp" line="80"/> <source>Start</source> <translation>Démarrer</translation> </message> @@ -15109,6 +15112,11 @@ Changer la direction de la connexion (voir le flux inverse).</p></body& <translation>Limiter au Filtre d'Affichage</translation> </message> <message> + <location filename="traffic_table_dialog.ui" line="68"/> + <source><html><head/><body><p>Show absolute times in the start time column.</p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="traffic_table_dialog.ui" line="71"/> <source>Absolute start time</source> <translation type="unfinished"></translation> diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts index 179f7da5ce..9b023b91ea 100644 --- a/ui/qt/wireshark_it.ts +++ b/ui/qt/wireshark_it.ts @@ -733,211 +733,214 @@ <context> <name>CaptureFileDialog</name> <message> - <location filename="capture_file_dialog.cpp" line="173"/> + <location filename="capture_file_dialog.cpp" line="140"/> <source>This capture file contains comments.</source> <translation>Questo filtro di cattura contiene dei commenti.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="183"/> + <location filename="capture_file_dialog.cpp" line="150"/> <source>The file format you chose doesn't support comments. Do you want to save the capture in a format that supports comments or discard the comments and save in the format you chose?</source> <translation>Il formato del file selezionato non supporta i commenti. Vuoi salvare la cattura in un formato che supporta i commenti o scartare i commenti e salvare nel formato scelto?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="187"/> - <location filename="capture_file_dialog.cpp" line="196"/> + <location filename="capture_file_dialog.cpp" line="154"/> + <location filename="capture_file_dialog.cpp" line="163"/> <source>Discard comments and save</source> <translation>Scarta i commenti e salva</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="188"/> + <location filename="capture_file_dialog.cpp" line="155"/> <source>Save in another format</source> <translation>Salva in un altro formato</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="193"/> + <location filename="capture_file_dialog.cpp" line="160"/> <source>No file format in which it can be saved supports comments. Do you want to discard the comments and save in the format you chose?</source> <translation>Nessun formato di file in cui può essere salvato supporta i commenti. Vuoi scartare i commenti e salvare nel formato scelto?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="412"/> + <location filename="capture_file_dialog.cpp" line="379"/> <source>All Files (</source> <translation>Tutti i file (</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="418"/> + <location filename="capture_file_dialog.cpp" line="385"/> <source>All Capture Files</source> <translation>Tutti i file delle catture</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="454"/> + <location filename="capture_file_dialog.cpp" line="420"/> <source>Format:</source> <translation>Formato:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="459"/> + <location filename="capture_file_dialog.cpp" line="425"/> <source>Size:</source> <translation>Dimensione:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="464"/> + <location filename="capture_file_dialog.cpp" line="430"/> + <source>Start / elapsed:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="476"/> + <source>Automatically detect file type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="772"/> + <source>%1, error after %2 packets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="779"/> + <source>%1, timed out at %2 packets</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Packets:</source> - <translation>Pacchetti:</translation> + <translation type="vanished">Pacchetti:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="469"/> <source>First Packet:</source> - <translation>Primo pacchetto:</translation> + <translation type="vanished">Primo pacchetto:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="474"/> <source>Elapsed Time:</source> - <translation>Tempo trascorso:</translation> + <translation type="vanished">Tempo trascorso:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="486"/> + <location filename="capture_file_dialog.cpp" line="442"/> <source>Prepend packets</source> <translation>Aggiungi pacchetti in testa</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="487"/> + <location filename="capture_file_dialog.cpp" line="443"/> <source>Insert packets from the selected file before the current file. Packet timestamps will be ignored.</source> <translation>Inserisci pacchetti dal file selezionato prima del file corrente. La marca temporale dei pacchetti sarà ignorata.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="490"/> + <location filename="capture_file_dialog.cpp" line="446"/> <source>Merge chronologically</source> <translation>Unisci cronologicamente</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="491"/> + <location filename="capture_file_dialog.cpp" line="447"/> <source>Insert packets in chronological order.</source> <translation>Inserisci pacchetti in ordine cronologico.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="495"/> + <location filename="capture_file_dialog.cpp" line="451"/> <source>Append packets</source> <translation>Aggiungi pacchetti in coda</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="496"/> + <location filename="capture_file_dialog.cpp" line="452"/> <source>Insert packets from the selected file after the current file. Packet timestamps will be ignored.</source> <translation>Inserisci pacchetti dal file selezionato dopo il file corrente. La marca temporale dei pacchetti sarà ignorata.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="511"/> + <location filename="capture_file_dialog.cpp" line="467"/> <source>Read filter:</source> <translation>Filtro di lettura:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="520"/> <source>Automatic</source> - <translation>Automatico</translation> + <translation type="vanished">Automatico</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="529"/> <source>&MAC name resolution</source> - <translation>Risoluzione dei &MAC</translation> + <translation type="vanished">Risoluzione dei &MAC</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="533"/> <source>&Transport name resolution</source> - <translation>Risoluzione dei nomi di &trasporto</translation> + <translation type="vanished">Risoluzione dei nomi di &trasporto</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="537"/> <source>&Network name resolution</source> - <translation>Risoluzione dei nomi di &rete</translation> + <translation type="vanished">Risoluzione dei nomi di &rete</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="541"/> <source>&External name resolver</source> - <translation>Risolutore di nomi &esterno</translation> + <translation type="vanished">Risolutore di nomi &esterno</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="547"/> + <location filename="capture_file_dialog.cpp" line="485"/> <source>Compress with g&zip</source> <translation>Comprimi con g&zip</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="578"/> + <location filename="capture_file_dialog.cpp" line="516"/> <source>Open Capture File</source> <oldsource>Wireshark: Open Capture File</oldsource> <translation>Apri un file di cattura</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="614"/> + <location filename="capture_file_dialog.cpp" line="546"/> <source>Save Capture File As</source> <oldsource>Wireshark: Save Capture File As</oldsource> <translation>Salva il file di cattura come</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="620"/> + <location filename="capture_file_dialog.cpp" line="552"/> <source>Save as:</source> <translation>Salva come:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="642"/> + <location filename="capture_file_dialog.cpp" line="574"/> <source>Export Specified Packets</source> <oldsource>Wireshark: Export Specified Packets</oldsource> <translation>Esporta i pacchetti specificati</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="646"/> + <location filename="capture_file_dialog.cpp" line="578"/> <source>Export as:</source> <translation>Esporta come:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="675"/> + <location filename="capture_file_dialog.cpp" line="607"/> <source>Merge Capture File</source> <oldsource>Wireshark: Merge Capture File</oldsource> <translation>Unisci file di cattura</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="777"/> - <location filename="capture_file_dialog.cpp" line="778"/> - <location filename="capture_file_dialog.cpp" line="779"/> - <location filename="capture_file_dialog.cpp" line="780"/> - <location filename="capture_file_dialog.cpp" line="781"/> <source>-</source> - <translation>-</translation> + <translation type="vanished">-</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="788"/> + <location filename="capture_file_dialog.cpp" line="718"/> <source>directory</source> <translation>cartella</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="795"/> + <location filename="capture_file_dialog.cpp" line="725"/> <source>unknown file format</source> <translation>formato dii file sconosciuto</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="797"/> + <location filename="capture_file_dialog.cpp" line="727"/> <source>error opening file</source> <translation>errore nell'apertura del file</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="811"/> <source>%1 bytes</source> - <translation>%1 byte</translation> + <translation type="vanished">%1 byte</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="840"/> <source>error after reading %1 packets</source> - <translation>errore dopo la lettura di %1 pacchetti</translation> + <translation type="vanished">errore dopo la lettura di %1 pacchetti</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="846"/> <source>more than %1 (preview timeout)</source> - <translation>più di %1 (tempo scaduto per l'anteprima)</translation> + <translation type="vanished">più di %1 (tempo scaduto per l'anteprima)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="865"/> <source>?</source> - <translation>?</translation> + <translation type="vanished">?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="871"/> + <location filename="capture_file_dialog.cpp" line="806"/> <source>unknown</source> <translation>sconosciuto</translation> </message> @@ -2654,13 +2657,13 @@ NOTA: un'opzione DEVE essere selezionata.</translation> <context> <name>ExtcapOptionsDialog</name> <message> - <location filename="extcap_options_dialog.cpp" line="74"/> - <location filename="extcap_options_dialog.cpp" line="108"/> + <location filename="extcap_options_dialog.cpp" line="76"/> + <location filename="extcap_options_dialog.cpp" line="110"/> <source>Extcap Interface Options</source> <translation>Opzioni interfaccia Extcap</translation> </message> <message> - <location filename="extcap_options_dialog.cpp" line="78"/> + <location filename="extcap_options_dialog.cpp" line="80"/> <source>Start</source> <translation>Avvia</translation> </message> @@ -15156,6 +15159,11 @@ a:hover { <translation>Limita al filtro di visualizzazione</translation> </message> <message> + <location filename="traffic_table_dialog.ui" line="68"/> + <source><html><head/><body><p>Show absolute times in the start time column.</p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="traffic_table_dialog.ui" line="71"/> <source>Absolute start time</source> <translation type="unfinished"></translation> diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts index 41918cf3e7..8ced1bc16d 100644 --- a/ui/qt/wireshark_ja_JP.ts +++ b/ui/qt/wireshark_ja_JP.ts @@ -733,211 +733,214 @@ <context> <name>CaptureFileDialog</name> <message> - <location filename="capture_file_dialog.cpp" line="173"/> + <location filename="capture_file_dialog.cpp" line="140"/> <source>This capture file contains comments.</source> <translation>このキャプチャファイルにはコメントが含まれています。</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="183"/> + <location filename="capture_file_dialog.cpp" line="150"/> <source>The file format you chose doesn't support comments. Do you want to save the capture in a format that supports comments or discard the comments and save in the format you chose?</source> <translation>選択したファイル形式はコメントに対応していません。コメントに対応した形式で保存しますか？もしくはコメントを破棄して選んだ形式で保存しますか？</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="187"/> - <location filename="capture_file_dialog.cpp" line="196"/> + <location filename="capture_file_dialog.cpp" line="154"/> + <location filename="capture_file_dialog.cpp" line="163"/> <source>Discard comments and save</source> <translation>コメントを破棄して保存</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="188"/> + <location filename="capture_file_dialog.cpp" line="155"/> <source>Save in another format</source> <translation>別の形式で保存</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="193"/> + <location filename="capture_file_dialog.cpp" line="160"/> <source>No file format in which it can be saved supports comments. Do you want to discard the comments and save in the format you chose?</source> <translation>コメントに対応したファイル形式ではありません。コメントを破棄して選んだ形式で保存しますか？</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="412"/> + <location filename="capture_file_dialog.cpp" line="379"/> <source>All Files (</source> <translation>すべてのファイル (</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="418"/> + <location filename="capture_file_dialog.cpp" line="385"/> <source>All Capture Files</source> <translation>すべてのキャプチャファイル</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="454"/> + <location filename="capture_file_dialog.cpp" line="420"/> <source>Format:</source> <translation>形式:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="459"/> + <location filename="capture_file_dialog.cpp" line="425"/> <source>Size:</source> <translation>サイズ:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="464"/> + <location filename="capture_file_dialog.cpp" line="430"/> + <source>Start / elapsed:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="476"/> + <source>Automatically detect file type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="772"/> + <source>%1, error after %2 packets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="779"/> + <source>%1, timed out at %2 packets</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Packets:</source> - <translation>パケット:</translation> + <translation type="vanished">パケット:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="469"/> <source>First Packet:</source> - <translation>最初のパケット</translation> + <translation type="vanished">最初のパケット</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="474"/> <source>Elapsed Time:</source> - <translation>経過時間:</translation> + <translation type="vanished">経過時間:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="486"/> + <location filename="capture_file_dialog.cpp" line="442"/> <source>Prepend packets</source> <translation>前にパケットを挿入</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="487"/> + <location filename="capture_file_dialog.cpp" line="443"/> <source>Insert packets from the selected file before the current file. Packet timestamps will be ignored.</source> <translation>現在のファイルの前に選択したファイルからパケットを挿入します。パケットのタイムスタンプは無視されます</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="490"/> + <location filename="capture_file_dialog.cpp" line="446"/> <source>Merge chronologically</source> <translation>時系列で結合</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="491"/> + <location filename="capture_file_dialog.cpp" line="447"/> <source>Insert packets in chronological order.</source> <translation>時系列順でパケットを挿入します</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="495"/> + <location filename="capture_file_dialog.cpp" line="451"/> <source>Append packets</source> <translation>後にパケットを追加</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="496"/> + <location filename="capture_file_dialog.cpp" line="452"/> <source>Insert packets from the selected file after the current file. Packet timestamps will be ignored.</source> <translation>現在のファイルの後に選択したファイルからパケットを挿入します パケットのタイムスタンプは無視されます</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="511"/> + <location filename="capture_file_dialog.cpp" line="467"/> <source>Read filter:</source> <translation>読込フィルタ:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="520"/> <source>Automatic</source> - <translation>自動</translation> + <translation type="vanished">自動</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="529"/> <source>&MAC name resolution</source> - <translation>MACアドレスの名前解決(&M)</translation> + <translation type="vanished">MACアドレスの名前解決(&M)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="533"/> <source>&Transport name resolution</source> - <translation>トランスポート層の名前解決(&T)</translation> + <translation type="vanished">トランスポート層の名前解決(&T)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="537"/> <source>&Network name resolution</source> - <translation>ネットワーク層の名前解決(&N)</translation> + <translation type="vanished">ネットワーク層の名前解決(&N)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="541"/> <source>&External name resolver</source> - <translation>外部の名前解決(&E)</translation> + <translation type="vanished">外部の名前解決(&E)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="547"/> + <location filename="capture_file_dialog.cpp" line="485"/> <source>Compress with g&zip</source> <translation>gzip形式で圧縮(&z)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="578"/> + <location filename="capture_file_dialog.cpp" line="516"/> <source>Open Capture File</source> <oldsource>Wireshark: Open Capture File</oldsource> <translation>キャプチャファイルを開く</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="614"/> + <location filename="capture_file_dialog.cpp" line="546"/> <source>Save Capture File As</source> <oldsource>Wireshark: Save Capture File As</oldsource> <translation>としてキャプチャファイルを保存</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="620"/> + <location filename="capture_file_dialog.cpp" line="552"/> <source>Save as:</source> <translation>として保存:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="642"/> + <location filename="capture_file_dialog.cpp" line="574"/> <source>Export Specified Packets</source> <oldsource>Wireshark: Export Specified Packets</oldsource> <translation>指定したパケットをエクスポート</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="646"/> + <location filename="capture_file_dialog.cpp" line="578"/> <source>Export as:</source> <translation>としてエクスポート:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="675"/> + <location filename="capture_file_dialog.cpp" line="607"/> <source>Merge Capture File</source> <oldsource>Wireshark: Merge Capture File</oldsource> <translation>キャプチャファイルを結合</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="777"/> - <location filename="capture_file_dialog.cpp" line="778"/> - <location filename="capture_file_dialog.cpp" line="779"/> - <location filename="capture_file_dialog.cpp" line="780"/> - <location filename="capture_file_dialog.cpp" line="781"/> <source>-</source> - <translation>-</translation> + <translation type="vanished">-</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="788"/> + <location filename="capture_file_dialog.cpp" line="718"/> <source>directory</source> <translation>ディレクトリ</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="795"/> + <location filename="capture_file_dialog.cpp" line="725"/> <source>unknown file format</source> <translation>不明なファイルフォーマット</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="797"/> + <location filename="capture_file_dialog.cpp" line="727"/> <source>error opening file</source> <translation>ファイルオープンエラー</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="811"/> <source>%1 bytes</source> - <translation>%1 バイト</translation> + <translation type="vanished">%1 バイト</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="840"/> <source>error after reading %1 packets</source> - <translation>%1 個のパケットを読み込み後にエラー</translation> + <translation type="vanished">%1 個のパケットを読み込み後にエラー</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="846"/> <source>more than %1 (preview timeout)</source> - <translation>%1 超過(プレビュータイムアウト)</translation> + <translation type="vanished">%1 超過(プレビュータイムアウト)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="865"/> <source>?</source> - <translation>？</translation> + <translation type="vanished">？</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="871"/> + <location filename="capture_file_dialog.cpp" line="806"/> <source>unknown</source> <translation>不明</translation> </message> @@ -2650,13 +2653,13 @@ PLEASE NOTE: One option MUST be selected.</source> <context> <name>ExtcapOptionsDialog</name> <message> - <location filename="extcap_options_dialog.cpp" line="74"/> - <location filename="extcap_options_dialog.cpp" line="108"/> + <location filename="extcap_options_dialog.cpp" line="76"/> + <location filename="extcap_options_dialog.cpp" line="110"/> <source>Extcap Interface Options</source> <translation>Extcapインターフェースオプション</translation> </message> <message> - <location filename="extcap_options_dialog.cpp" line="78"/> + <location filename="extcap_options_dialog.cpp" line="80"/> <source>Start</source> <translation>開始</translation> </message> @@ -15090,6 +15093,11 @@ a:hover { <translation>表示フィルタに制限</translation> </message> <message> + <location filename="traffic_table_dialog.ui" line="68"/> + <source><html><head/><body><p>Show absolute times in the start time column.</p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="traffic_table_dialog.ui" line="71"/> <source>Absolute start time</source> <translation type="unfinished"></translation> diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts index 1b71f08bfb..d6df0374f7 100644 --- a/ui/qt/wireshark_pl.ts +++ b/ui/qt/wireshark_pl.ts @@ -733,211 +733,214 @@ <context> <name>CaptureFileDialog</name> <message> - <location filename="capture_file_dialog.cpp" line="173"/> + <location filename="capture_file_dialog.cpp" line="140"/> <source>This capture file contains comments.</source> <translation>Plik zawiera komentarze.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="183"/> + <location filename="capture_file_dialog.cpp" line="150"/> <source>The file format you chose doesn't support comments. Do you want to save the capture in a format that supports comments or discard the comments and save in the format you chose?</source> <translation>Ten format nie obsługuje komentarzy. Czy chcesz zapisać plik w formacie, który je obsługuje czy porzucić komentarze?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="187"/> - <location filename="capture_file_dialog.cpp" line="196"/> + <location filename="capture_file_dialog.cpp" line="154"/> + <location filename="capture_file_dialog.cpp" line="163"/> <source>Discard comments and save</source> <translation>Porzuć komentarze i zapisz</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="188"/> + <location filename="capture_file_dialog.cpp" line="155"/> <source>Save in another format</source> <translation>Zapisz w innym formacie</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="193"/> + <location filename="capture_file_dialog.cpp" line="160"/> <source>No file format in which it can be saved supports comments. Do you want to discard the comments and save in the format you chose?</source> <translation>Nie ma formatu w którym możliwy jest zapis z komentarzami. Czy chcesz porzucić komentarze i zapisać plik?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="412"/> + <location filename="capture_file_dialog.cpp" line="379"/> <source>All Files (</source> <translation>Wszystkie pliki (</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="418"/> + <location filename="capture_file_dialog.cpp" line="385"/> <source>All Capture Files</source> <translation>Wszystkie pliki przechwytywania</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="454"/> + <location filename="capture_file_dialog.cpp" line="420"/> <source>Format:</source> <translation>Format:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="459"/> + <location filename="capture_file_dialog.cpp" line="425"/> <source>Size:</source> <translation>Rozmiar:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="464"/> + <location filename="capture_file_dialog.cpp" line="430"/> + <source>Start / elapsed:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="476"/> + <source>Automatically detect file type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="772"/> + <source>%1, error after %2 packets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="779"/> + <source>%1, timed out at %2 packets</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Packets:</source> - <translation>Pakiety:</translation> + <translation type="vanished">Pakiety:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="469"/> <source>First Packet:</source> - <translation>Pierwszy pakiet:</translation> + <translation type="vanished">Pierwszy pakiet:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="474"/> <source>Elapsed Time:</source> - <translation>Upłynęło:</translation> + <translation type="vanished">Upłynęło:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="486"/> + <location filename="capture_file_dialog.cpp" line="442"/> <source>Prepend packets</source> <translation>Dodaj pakiety na początku</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="487"/> + <location filename="capture_file_dialog.cpp" line="443"/> <source>Insert packets from the selected file before the current file. Packet timestamps will be ignored.</source> <translation>Wstaw pakiety z wybranego pliku na początek. Czasy pakietów będą zignorowane.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="490"/> + <location filename="capture_file_dialog.cpp" line="446"/> <source>Merge chronologically</source> <translation>Scalaj chronologicznie</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="491"/> + <location filename="capture_file_dialog.cpp" line="447"/> <source>Insert packets in chronological order.</source> <translation>Wstaw pakiety w kolejności chronologicznej</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="495"/> + <location filename="capture_file_dialog.cpp" line="451"/> <source>Append packets</source> <translation>Dodaj pakiety</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="496"/> + <location filename="capture_file_dialog.cpp" line="452"/> <source>Insert packets from the selected file after the current file. Packet timestamps will be ignored.</source> <translation>Wstaw pakiety z wybranego pliku na koniec. Czasy pakietów będą zignorowane.</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="511"/> + <location filename="capture_file_dialog.cpp" line="467"/> <source>Read filter:</source> <translation>Filtr wczytywania:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="520"/> <source>Automatic</source> - <translation>Automatycznie</translation> + <translation type="vanished">Automatycznie</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="529"/> <source>&MAC name resolution</source> - <translation>Rozwiązywanie nazw adresu MAC</translation> + <translation type="vanished">Rozwiązywanie nazw adresu MAC</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="533"/> <source>&Transport name resolution</source> - <translation>Rozwiązywanie nazw transportu</translation> + <translation type="vanished">Rozwiązywanie nazw transportu</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="537"/> <source>&Network name resolution</source> - <translation>Rozwiązywanie nazw sieciowych</translation> + <translation type="vanished">Rozwiązywanie nazw sieciowych</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="541"/> <source>&External name resolver</source> - <translation>Zewnętrzne rozwijanie nazw</translation> + <translation type="vanished">Zewnętrzne rozwijanie nazw</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="547"/> + <location filename="capture_file_dialog.cpp" line="485"/> <source>Compress with g&zip</source> <translation>Kompresuj używając gzip</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="578"/> + <location filename="capture_file_dialog.cpp" line="516"/> <source>Open Capture File</source> <oldsource>Wireshark: Open Capture File</oldsource> <translation>Otwórz plik przechwytywania</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="614"/> + <location filename="capture_file_dialog.cpp" line="546"/> <source>Save Capture File As</source> <oldsource>Wireshark: Save Capture File As</oldsource> <translation>Zapisz plik przechwytywania jako</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="620"/> + <location filename="capture_file_dialog.cpp" line="552"/> <source>Save as:</source> <translation>Zapisz jako:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="642"/> + <location filename="capture_file_dialog.cpp" line="574"/> <source>Export Specified Packets</source> <oldsource>Wireshark: Export Specified Packets</oldsource> <translation>Eksportuj wybrane pakiety</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="646"/> + <location filename="capture_file_dialog.cpp" line="578"/> <source>Export as:</source> <translation>Eksportuj jako:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="675"/> + <location filename="capture_file_dialog.cpp" line="607"/> <source>Merge Capture File</source> <oldsource>Wireshark: Merge Capture File</oldsource> <translation>Scal pliki przechwytywania</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="777"/> - <location filename="capture_file_dialog.cpp" line="778"/> - <location filename="capture_file_dialog.cpp" line="779"/> - <location filename="capture_file_dialog.cpp" line="780"/> - <location filename="capture_file_dialog.cpp" line="781"/> <source>-</source> - <translation>-</translation> + <translation type="vanished">-</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="788"/> + <location filename="capture_file_dialog.cpp" line="718"/> <source>directory</source> <translation>katalog</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="795"/> + <location filename="capture_file_dialog.cpp" line="725"/> <source>unknown file format</source> <translation>nieznany format pliku</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="797"/> + <location filename="capture_file_dialog.cpp" line="727"/> <source>error opening file</source> <translation>błąd podczas otwierania pliku</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="811"/> <source>%1 bytes</source> - <translation>%1 bajtów</translation> + <translation type="vanished">%1 bajtów</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="840"/> <source>error after reading %1 packets</source> - <translation>błąd po wczytaniu %1 pakietów</translation> + <translation type="vanished">błąd po wczytaniu %1 pakietów</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="846"/> <source>more than %1 (preview timeout)</source> - <translation>więcej niż %1 (poczas podglądu)</translation> + <translation type="vanished">więcej niż %1 (poczas podglądu)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="865"/> <source>?</source> - <translation>?</translation> + <translation type="vanished">?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="871"/> + <location filename="capture_file_dialog.cpp" line="806"/> <source>unknown</source> <translation>nieznany</translation> </message> @@ -2653,13 +2656,13 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać <context> <name>ExtcapOptionsDialog</name> <message> - <location filename="extcap_options_dialog.cpp" line="74"/> - <location filename="extcap_options_dialog.cpp" line="108"/> + <location filename="extcap_options_dialog.cpp" line="76"/> + <location filename="extcap_options_dialog.cpp" line="110"/> <source>Extcap Interface Options</source> <translation>Opcje interfejsów Extcap</translation> </message> <message> - <location filename="extcap_options_dialog.cpp" line="78"/> + <location filename="extcap_options_dialog.cpp" line="80"/> <source>Start</source> <translation>Start</translation> </message> @@ -15161,6 +15164,11 @@ text-decoration: underline; <translation>Ogranicz do filtru</translation> </message> <message> + <location filename="traffic_table_dialog.ui" line="68"/> + <source><html><head/><body><p>Show absolute times in the start time column.</p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="traffic_table_dialog.ui" line="71"/> <source>Absolute start time</source> <translation type="unfinished"></translation> diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts index 1570adc173..874d8f23dc 100644 --- a/ui/qt/wireshark_zh_CN.ts +++ b/ui/qt/wireshark_zh_CN.ts @@ -733,211 +733,214 @@ <context> <name>CaptureFileDialog</name> <message> - <location filename="capture_file_dialog.cpp" line="173"/> + <location filename="capture_file_dialog.cpp" line="140"/> <source>This capture file contains comments.</source> <translation>此捕获文件含有注释内容。</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="183"/> + <location filename="capture_file_dialog.cpp" line="150"/> <source>The file format you chose doesn't support comments. Do you want to save the capture in a format that supports comments or discard the comments and save in the format you chose?</source> <translation>您所选择的文件格式不支持注释。您希望将捕获内容保存为支持注释的格式，还是希望丢弃注释，直接保存为您所选择的格式？</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="187"/> - <location filename="capture_file_dialog.cpp" line="196"/> + <location filename="capture_file_dialog.cpp" line="154"/> + <location filename="capture_file_dialog.cpp" line="163"/> <source>Discard comments and save</source> <translation>丢弃注释并保存</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="188"/> + <location filename="capture_file_dialog.cpp" line="155"/> <source>Save in another format</source> <translation>保存为其他格式</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="193"/> + <location filename="capture_file_dialog.cpp" line="160"/> <source>No file format in which it can be saved supports comments. Do you want to discard the comments and save in the format you chose?</source> <translation>可以保存的文件格式中，没有支持注释的格式。您是否要丢弃注释并以您选择的格式保存？</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="412"/> + <location filename="capture_file_dialog.cpp" line="379"/> <source>All Files (</source> <translation>所有文件 (</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="418"/> + <location filename="capture_file_dialog.cpp" line="385"/> <source>All Capture Files</source> <translation>所有捕获文件</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="454"/> + <location filename="capture_file_dialog.cpp" line="420"/> <source>Format:</source> <translation>格式:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="459"/> + <location filename="capture_file_dialog.cpp" line="425"/> <source>Size:</source> <translation>大小:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="464"/> + <location filename="capture_file_dialog.cpp" line="430"/> + <source>Start / elapsed:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="476"/> + <source>Automatically detect file type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="772"/> + <source>%1, error after %2 packets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="779"/> + <source>%1, timed out at %2 packets</source> + <translation type="unfinished"></translation> + </message> + <message> <source>Packets:</source> - <translation>分组数目:</translation> + <translation type="vanished">分组数目:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="469"/> <source>First Packet:</source> - <translation>首个分组:</translation> + <translation type="vanished">首个分组:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="474"/> <source>Elapsed Time:</source> - <translation>已用时间:</translation> + <translation type="vanished">已用时间:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="486"/> + <location filename="capture_file_dialog.cpp" line="442"/> <source>Prepend packets</source> <translation>前置分组</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="487"/> + <location filename="capture_file_dialog.cpp" line="443"/> <source>Insert packets from the selected file before the current file. Packet timestamps will be ignored.</source> <translation>将选中文件中的分组插入到当前文件之前。分组时间戳将被忽略。</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="490"/> + <location filename="capture_file_dialog.cpp" line="446"/> <source>Merge chronologically</source> <translation>按时间戳合并</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="491"/> + <location filename="capture_file_dialog.cpp" line="447"/> <source>Insert packets in chronological order.</source> <translation>按照时间顺序插入分组。</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="495"/> + <location filename="capture_file_dialog.cpp" line="451"/> <source>Append packets</source> <translation>追加分组</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="496"/> + <location filename="capture_file_dialog.cpp" line="452"/> <source>Insert packets from the selected file after the current file. Packet timestamps will be ignored.</source> <translation>将选中文件中的分组插入到当前文件之后。分组时间戳将被忽略。</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="511"/> + <location filename="capture_file_dialog.cpp" line="467"/> <source>Read filter:</source> <translation>读取过滤器:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="520"/> <source>Automatic</source> - <translation>自动</translation> + <translation type="vanished">自动</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="529"/> <source>&MAC name resolution</source> - <translation>MAC地址解析(&M)</translation> + <translation type="vanished">MAC地址解析(&M)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="533"/> <source>&Transport name resolution</source> - <translation>传输层名称解析(&T)</translation> + <translation type="vanished">传输层名称解析(&T)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="537"/> <source>&Network name resolution</source> - <translation>网络层名称解析(&N)</translation> + <translation type="vanished">网络层名称解析(&N)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="541"/> <source>&External name resolver</source> - <translation>使用外部解析服务(&E)</translation> + <translation type="vanished">使用外部解析服务(&E)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="547"/> + <location filename="capture_file_dialog.cpp" line="485"/> <source>Compress with g&zip</source> <translation>用 gzip 压缩(&Z)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="578"/> + <location filename="capture_file_dialog.cpp" line="516"/> <source>Open Capture File</source> <oldsource>Wireshark: Open Capture File</oldsource> <translation>打开捕获文件</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="614"/> + <location filename="capture_file_dialog.cpp" line="546"/> <source>Save Capture File As</source> <oldsource>Wireshark: Save Capture File As</oldsource> <translation>保存捕获文件为</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="620"/> + <location filename="capture_file_dialog.cpp" line="552"/> <source>Save as:</source> <translation>另存为:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="642"/> + <location filename="capture_file_dialog.cpp" line="574"/> <source>Export Specified Packets</source> <oldsource>Wireshark: Export Specified Packets</oldsource> <translation>导出特定分组</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="646"/> + <location filename="capture_file_dialog.cpp" line="578"/> <source>Export as:</source> <translation>导出为:</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="675"/> + <location filename="capture_file_dialog.cpp" line="607"/> <source>Merge Capture File</source> <oldsource>Wireshark: Merge Capture File</oldsource> <translation>合并捕获文件</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="777"/> - <location filename="capture_file_dialog.cpp" line="778"/> - <location filename="capture_file_dialog.cpp" line="779"/> - <location filename="capture_file_dialog.cpp" line="780"/> - <location filename="capture_file_dialog.cpp" line="781"/> <source>-</source> - <translation>-</translation> + <translation type="vanished">-</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="788"/> + <location filename="capture_file_dialog.cpp" line="718"/> <source>directory</source> <translation>目录</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="795"/> + <location filename="capture_file_dialog.cpp" line="725"/> <source>unknown file format</source> <translation>未知文件格式</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="797"/> + <location filename="capture_file_dialog.cpp" line="727"/> <source>error opening file</source> <translation>打开文件出错</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="811"/> <source>%1 bytes</source> - <translation>%1 字节</translation> + <translation type="vanished">%1 字节</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="840"/> <source>error after reading %1 packets</source> - <translation>读取 %1 分组后出错</translation> + <translation type="vanished">读取 %1 分组后出错</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="846"/> <source>more than %1 (preview timeout)</source> - <translation>大于 %1 (预览超时)</translation> + <translation type="vanished">大于 %1 (预览超时)</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="865"/> <source>?</source> - <translation>?</translation> + <translation type="vanished">?</translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="871"/> + <location filename="capture_file_dialog.cpp" line="806"/> <source>unknown</source> <translation>未知</translation> </message> @@ -2653,13 +2656,13 @@ PLEASE NOTE: One option MUST be selected.</source> <context> <name>ExtcapOptionsDialog</name> <message> - <location filename="extcap_options_dialog.cpp" line="74"/> - <location filename="extcap_options_dialog.cpp" line="108"/> + <location filename="extcap_options_dialog.cpp" line="76"/> + <location filename="extcap_options_dialog.cpp" line="110"/> <source>Extcap Interface Options</source> <translation>Extcap 接口选项</translation> </message> <message> - <location filename="extcap_options_dialog.cpp" line="78"/> + <location filename="extcap_options_dialog.cpp" line="80"/> <source>Start</source> <translation>开始</translation> </message> @@ -15118,6 +15121,11 @@ text-decoration: underline; <translation>显示过滤器的限制</translation> </message> <message> + <location filename="traffic_table_dialog.ui" line="68"/> + <source><html><head/><body><p>Show absolute times in the start time column.</p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="traffic_table_dialog.ui" line="71"/> <source>Absolute start time</source> <translation type="unfinished"></translation> |