diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-04-26 08:07:42 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-04-26 15:07:50 +0000 |
| commit | 9b5a09aa3479b56b111439222397f239b477cda8 (patch) | |
| tree | 723ed4a37c49bfa2c9497cf3c6fe49e764fc4f03 | |
| parent | 0437280a20212205b6b1cfb52a6ae5e0e6b527bf (diff) | |
[Automatic update for 2015-04-26]
Update manuf, services enterprise-numbers, translations, and other items.
Change-Id: I431063783434a6f7a9a4f4b8186316ed3f98005b
Reviewed-on: https://code.wireshark.org/review/8199
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | epan/dissectors/usb.c | 76 | ||||
| -rw-r--r-- | epan/enterprise-numbers | 116 | ||||
| -rw-r--r-- | epan/sminmpec.c | 30 | ||||
| -rw-r--r-- | manuf | 46 | ||||
| -rw-r--r-- | services | 18 | ||||
| -rw-r--r-- | ui/qt/wireshark_it.qm | bin | 239430 -> 239746 bytes | |||
| -rw-r--r-- | ui/qt/wireshark_it.ts | 4 | ||||
| -rw-r--r-- | ui/qt/wireshark_zh_CN.qm | bin | 173107 -> 173233 bytes | |||
| -rw-r--r-- | ui/qt/wireshark_zh_CN.ts | 272 |
9 files changed, 398 insertions, 164 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c index 2eb0ffa383..cf25d246d9 100644 --- a/epan/dissectors/usb.c +++ b/epan/dissectors/usb.c @@ -196,7 +196,7 @@ static const value_string usb_vendors_vals[] = { { 0x047d, "Kensington" }, { 0x047e, "Agere Systems, Inc. (Lucent)" }, { 0x047f, "Plantronics, Inc." }, - { 0x0480, "Toshiba America Info. Systems, Inc." }, + { 0x0480, "Toshiba America Inc" }, { 0x0481, "Zenith Data Systems" }, { 0x0482, "Kyocera Corp." }, { 0x0483, "STMicroelectronics" }, @@ -1385,7 +1385,7 @@ static const value_string usb_vendors_vals[] = { { 0x0b7b, "Taiko Denki Co., Ltd" }, { 0x0b7c, "ITRAN Communications, Ltd" }, { 0x0b7d, "Astrodesign, Inc." }, - { 0x0b81, "id3 Semiconductors" }, + { 0x0b81, "id3 Technologies" }, { 0x0b84, "Rextron Technology, Inc." }, { 0x0b85, "Elkat Electronics, Sdn., Bhd." }, { 0x0b86, "Exputer Systems, Inc." }, @@ -2153,6 +2153,7 @@ static const value_string usb_vendors_vals[] = { { 0x120f, "Magellan" }, { 0x1210, "DigiTech" }, { 0x121e, "Jungsoft Co., Ltd" }, + { 0x1221, "Unknown manufacturer" }, { 0x1223, "SKYCABLE ENTERPRISE. CO., LTD." }, { 0x1228, "Datapaq Limited" }, { 0x1230, "Chipidea-Microelectronica, S.A." }, @@ -2385,6 +2386,7 @@ static const value_string usb_vendors_vals[] = { { 0x160a, "VIA Technologies, Inc." }, { 0x160e, "INRO" }, { 0x1614, "Amoi Electronics" }, + { 0x1617, "Sony Corp." }, { 0x1619, "L & K Precision Technology Co., Ltd." }, { 0x1621, "Wionics Research" }, { 0x1628, "Stonestreet One, Inc." }, @@ -2856,6 +2858,7 @@ static const value_string usb_vendors_vals[] = { { 0x289b, "Dracal/Raphnet technologies" }, { 0x2931, "Jolla Oy" }, { 0x2a03, "dog hunter AG" }, + { 0x2a37, "RTD Embedded Technologies, Inc." }, { 0x2a45, "Meizu Corp." }, { 0x2c02, "Planex Communications" }, { 0x2c1a, "Dolphin Peripherals" }, @@ -3153,6 +3156,7 @@ static const value_string usb_products_vals[] = { { 0x03f00701, "ScanJet 5300c/5370c" }, { 0x03f00704, "DeskJet 825c" }, { 0x03f00705, "ScanJet 4400c" }, + { 0x03f0070c, "Personal Media Drive" }, { 0x03f00711, "OfficeJet K80" }, { 0x03f00712, "DeskJet 1180c" }, { 0x03f00714, "Printing Support" }, @@ -4455,6 +4459,7 @@ static const value_string usb_products_vals[] = { { 0x04210600, "Digital Pen SU-1B" }, { 0x04210610, "CS-15 (Internet Stick 3G modem)" }, { 0x04210661, "Lumia 920" }, + { 0x04210720, "X (RM-980)" }, { 0x04210800, "Connectivity Cable DKU-5" }, { 0x04210801, "Data Cable DKU-6" }, { 0x04210802, "CA-42 Phone Parent" }, @@ -5177,7 +5182,7 @@ static const value_string usb_products_vals[] = { { 0x04600004, "Tablet (5x3.75)" }, { 0x04600006, "LCD Tablet (12x9)" }, { 0x04600008, "Tablet (3x2.25)" }, - { 0x04610010, "HP Keyboard" }, + { 0x04610010, "HP PR1101U / Primax PMX-KPR1101U Keyboard" }, { 0x04610300, "G2-300 Scanner" }, { 0x04610301, "G2E-300 Scanner" }, { 0x04610302, "G2-300 #2 Scanner" }, @@ -5401,7 +5406,7 @@ static const value_string usb_products_vals[] = { { 0x046db305, "BT Mini-Receiver" }, { 0x046dbfe4, "Premium Optical Wheel Mouse" }, { 0x046dc000, "N43 [Pilot Mouse]" }, - { 0x046dc001, "N48/M-BB48 [FirstMouse Plus]" }, + { 0x046dc001, "N48/M-BB48/M-UK96A [FirstMouse Plus]" }, { 0x046dc002, "M-BA47 [MouseMan Plus]" }, { 0x046dc003, "MouseMan" }, { 0x046dc004, "WingMan Gaming Mouse" }, @@ -5885,6 +5890,7 @@ static const value_string usb_products_vals[] = { { 0x047f4254, "BUA-100 Bluetooth Adapter" }, { 0x047fac01, "Savi 7xx" }, { 0x047fad01, "GameCom 777 5.1 Headset" }, + { 0x047fc008, "Audio 655 DSP" }, { 0x047fc00e, "Blackwire C310 headset" }, { 0x04800001, "InTouch Module" }, { 0x04800004, "InTouch Module" }, @@ -7229,6 +7235,8 @@ static const value_string usb_products_vals[] = { { 0x04ca004f, "SK-9020 keyboard" }, { 0x04ca1766, "HID Monitor Controls" }, { 0x04ca2004, "Bluetooth 4.0 [Broadcom BCM20702A0]" }, + { 0x04ca300b, "Atheros AR3012 Bluetooth" }, + { 0x04ca300d, "Atheros AR3012 Bluetooth" }, { 0x04ca7025, "HP HD Webcam" }, { 0x04ca9304, "Hub" }, { 0x04caf01c, "TT1280DA DVB-T TV Tuner" }, @@ -7634,6 +7642,7 @@ static const value_string usb_products_vals[] = { { 0x04e83296, "ML-2580N Mono Laser Printer" }, { 0x04e83297, "ML-191x/ML-252x Laser Printer" }, { 0x04e8329f, "CLP-325 Color Laser Printer" }, + { 0x04e83301, "ML-1660 Series" }, { 0x04e8330c, "ML-1865" }, { 0x04e83310, "ML-331x Series Laser Printer" }, { 0x04e83315, "ML-2540 Series Laser Printer" }, @@ -7797,7 +7806,7 @@ static const value_string usb_products_vals[] = { { 0x04e8685c, "GT-I9250 Phone [Galaxy Nexus] (Mass storage mode)" }, { 0x04e8685d, "GT-I9100 Phone [Galaxy S II] (Download mode)" }, { 0x04e8685e, "Samsung Galaxy Y" }, - { 0x04e86860, "GT-I9100 Phone [Galaxy S II], GT-I9300 Phone [Galaxy S III], GT-P7500 [Galaxy Tab 10.1] , GT-I9500 [Galaxy S 4]" }, + { 0x04e86860, "Galaxy (MTP)" }, { 0x04e86863, "GT-I9500 [Galaxy S4] / GT-I9250 [Galaxy Nexus] (network tethering)" }, { 0x04e86864, "GT-I9070 (network tethering, USB debugging enabled)" }, { 0x04e86865, "GT-I9300 Phone [Galaxy S III] (PTP mode)" }, @@ -7918,6 +7927,7 @@ static const value_string usb_products_vals[] = { { 0x04f2b330, "Asus 720p CMOS webcam" }, { 0x04f2b354, "UVC 1.00 device HD UVC WebCam" }, { 0x04f2b394, "Integrated Camera" }, + { 0x04f2b3f6, "HD WebCam (Acer)" }, { 0x04f3000a, "Touchscreen" }, { 0x04f30103, "ActiveJet K-2024 Multimedia Keyboard" }, { 0x04f301a4, "Wireless Keyboard" }, @@ -9421,6 +9431,7 @@ static const value_string usb_products_vals[] = { { 0x059f0829, "BigDisk Extreme+" }, { 0x059f100c, "Rugged Triple Interface Mobile Hard Drive" }, { 0x059f1010, "Desktop Hard Drive" }, + { 0x059f1018, "Desktop Hard Drive" }, { 0x059f1019, "Desktop Hard Drive" }, { 0x059f1021, "Little Disk" }, { 0x059f1027, "iamaKey V2" }, @@ -9603,10 +9614,10 @@ static const value_string usb_products_vals[] = { { 0x05ac12a4, "iPad 3 (wifi)" }, { 0x05ac12a5, "iPad 3 (CDMA)" }, { 0x05ac12a6, "iPad 3 (3G, 16 GB)" }, - { 0x05ac12a8, "iPhone5/5C/5S" }, + { 0x05ac12a8, "iPhone5/5C/5S/6" }, { 0x05ac12a9, "iPad 2" }, { 0x05ac12aa, "iPod Touch 5.Gen [A1421]" }, - { 0x05ac12ab, "iPad 4 (WiFi, 32GB)" }, + { 0x05ac12ab, "iPad 4/Mini1" }, { 0x05ac1300, "iPod Shuffle" }, { 0x05ac1301, "iPod Shuffle 2.Gen" }, { 0x05ac1302, "iPod Shuffle 3.Gen" }, @@ -10069,6 +10080,7 @@ static const value_string usb_products_vals[] = { { 0x05e30736, "microSD Reader/Writer" }, { 0x05e30741, "microSD Card Reader" }, { 0x05e30743, "SDXC and microSDXC CardReader" }, + { 0x05e30745, "Logilink CR0012" }, { 0x05e30760, "USB 2.0 Card Reader/Writer" }, { 0x05e30761, "Genesys Mass Storage Device" }, { 0x05e30780, "USBFS DFU Adapter" }, @@ -11181,6 +11193,7 @@ static const value_string usb_products_vals[] = { { 0x076b1221, "CardMan 1221" }, { 0x076b1784, "CardMan 6020" }, { 0x076b3021, "CardMan 3121" }, + { 0x076b3022, "CardMan 3021" }, { 0x076b3610, "CardMan 3620" }, { 0x076b3621, "CardMan 3621" }, { 0x076b3821, "CardMan 3821" }, @@ -11465,7 +11478,7 @@ static const value_string usb_products_vals[] = { { 0x07b30c0c, "PL806 Scanner" }, { 0x07b30c26, "OpticBook 4600 Scanner" }, { 0x07b30c2b, "Mobile Office D428 Scanner" }, - { 0x07b30e08, "Plustek OpticBook A300 Scanner" }, + { 0x07b30e08, "OpticBook A300 Scanner" }, { 0x07b31300, "OpticBook 3800 Scanner" }, { 0x07b31301, "OpticBook 4800 Scanner" }, { 0x07b40100, "Camedia C-2100/C-3000 Ultra Zoom Camera" }, @@ -12422,6 +12435,7 @@ static const value_string usb_products_vals[] = { { 0x0930001a, "Toshiba Gigabeat MEU201" }, { 0x0930001d, "Toshiba Gigabeat MET401" }, { 0x09300200, "Integrated Bluetooth (Taiyo Yuden)" }, + { 0x0930021c, "Atheros AR3012 Bluetooth" }, { 0x09300301, "PCX1100U Cable Modem (WDM)" }, { 0x09300302, "PCX2000 Cable Modem (WDM)" }, { 0x09300305, "Cable Modem PCX3000" }, @@ -12709,6 +12723,7 @@ static const value_string usb_products_vals[] = { { 0x09f50188, "LAN Adapter" }, { 0x09f50850, "Adapter" }, { 0x09fb6001, "Blaster" }, + { 0x0a050001, "Hub" }, { 0x0a057211, "hub" }, { 0x0a070064, "ADU100 Data Acquisition Interface" }, { 0x0a070078, "ADU120 Data Acquisition Interface" }, @@ -12863,6 +12878,7 @@ static const value_string usb_products_vals[] = { { 0x0a5c2150, "BCM2046 Bluetooth Device" }, { 0x0a5c2151, "Bluetooth" }, { 0x0a5c2154, "BCM92046DG-CL1ROM Bluetooth 2.1 UHE Dongle" }, + { 0x0a5c216c, "BCM43142A0 Bluetooth Device" }, { 0x0a5c217d, "HP Bluethunder" }, { 0x0a5c217f, "BCM2045B (BDC-2.1)" }, { 0x0a5c2198, "Bluetooth 3.0 Device" }, @@ -13139,6 +13155,7 @@ static const value_string usb_products_vals[] = { { 0x0b0517ba, "N10 Nano 802.11n Network Adapter [Realtek RTL8192CU]" }, { 0x0b0517c7, "WL-330NUL" }, { 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]" }, { 0x0b054c80, "Asus TF300 Transformer" }, { 0x0b054c81, "Asus TF300 Transformer (USB debug mode)" }, @@ -13483,6 +13500,7 @@ static const value_string usb_products_vals[] = { { 0x0bb40ca8, "HTC EVO 4G LTE (second ID)" }, { 0x0bb40cae, "T-Mobile MyTouch 4G Slide [Doubleshot]" }, { 0x0bb40dea, "M7_UL [HTC One]" }, + { 0x0bb40f25, "One M8" }, { 0x0bb40f64, "Desire 601" }, { 0x0bb40ff8, "Desire HD (Tethering Mode)" }, { 0x0bb40ff9, "Desire / Desire HD / Hero / Thunderbolt (Charge Mode)" }, @@ -14717,6 +14735,7 @@ 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" }, + { 0x0fce01bb, "D5803 [Xperia Z3 Compact] (MTP mode)" }, { 0x0fce0dde, "Xperia Mini Pro Bootloader" }, { 0x0fce1010, "WMC Modem" }, { 0x0fce10af, "V640i Phone [PictBridge]" }, @@ -15399,12 +15418,35 @@ static const value_string usb_products_vals[] = { { 0x12091003, "IBSecureCam-P" }, { 0x12091004, "IBSecureCam-O" }, { 0x12091005, "IBSecureCam-N" }, + { 0x12091006, "Mini IO-Board" }, + { 0x12092000, "Zygmunt Krynicki Lantern Brightness Sensor" }, + { 0x12092048, "Housedillon.com MRF49XA Transciever" }, + { 0x12092222, "LabConnect Signalgenerator" }, + { 0x12092300, "Keyboardio Keyboardio Model 01 Bootloader" }, + { 0x12092301, "Keyboardio Keyboardio Model 01" }, + { 0x12092337, "/Dev or SlashDev /Net" }, + { 0x12093000, "lloyd3000" }, + { 0x12093333, "LabConnect Digitalnetzteil" }, + { 0x12095222, "telavivmakers attami" }, + { 0x12095a22, "ikari_01 sd2snes" }, + { 0x12097bd0, "pokey9000 Tiny Bit Dingus" }, + { 0x1209abd0, "tibounise ADB converter" }, + { 0x1209beef, "Modal MC-USB" }, + { 0x1209c0f5, "unethi PERswitch" }, + { 0x1209ca1c, "KnightOS Hub" }, + { 0x1209ca1d, "KnightOS MTP Device" }, + { 0x1209cafe, "ii iigadget" }, + { 0x1209dada, "Rebel Technology OWL" }, + { 0x1209dead, "chaosfield.at AVR-Ruler" }, + { 0x1209fa11, "moonglow OpenXHC" }, + { 0x1209feed, "ProgramGyar AVR-IR Sender" }, { 0x120f524e, "RoadMate 1475T" }, { 0x120f5260, "Triton Handheld GPS Receiver (300/400/500/1500/2000)" }, { 0x12100016, "RP500 Guitar Multi-Effects Processor" }, { 0x1210001b, "RP155 Guitar Multi-Effects Processor" }, { 0x1210001c, "RP255 Guitar Multi-Effects Processor" }, { 0x121e3403, "Muzio JM250 Audio Player" }, + { 0x12213234, "Disk (Thumb drive)" }, { 0x12280012, "Q18 Data Logger" }, { 0x12280015, "TPaq21/MPaq21 Datalogger" }, { 0x1228584c, "XL2 Logger" }, @@ -15554,8 +15596,8 @@ static const value_string usb_products_vals[] = { { 0x12d1140b, "EC1260 Wireless Data Modem HSD USB Card" }, { 0x12d1140c, "E180v" }, { 0x12d11412, "EC168c" }, - { 0x12d11436, "E173 3G Modem (modem-mode)" }, - { 0x12d11446, "E1552/E1800/E173 (HSPA modem)" }, + { 0x12d11436, "Broadband stick" }, + { 0x12d11446, "Broadband stick (modem on)" }, { 0x12d11465, "K3765 HSPA" }, { 0x12d114c3, "K5005 Vodafone LTE/UMTS/GSM Modem/Networkcard" }, { 0x12d114c8, "K5005 Vodafone LTE/UMTS/GSM MOdem/Networkcard" }, @@ -15575,7 +15617,7 @@ static const value_string usb_products_vals[] = { { 0x12d11575, "K5150 LTE modem" }, { 0x12d115ca, "E3131 3G/UMTS/HSPA+ Modem (Mass Storage Mode)" }, { 0x12d11805, "AT&T Go Phone U2800A phone" }, - { 0x12d11c05, "E173s 3G broadband stick (modem on)" }, + { 0x12d11c05, "Broadband stick (modem on)" }, { 0x12d11c0b, "E173s 3G broadband stick (modem off)" }, { 0x12d11c20, "R205 Mobile WiFi (Charging)" }, { 0x12d11d50, "ET302s TD-SCDMA/TD-HSDPA Mobile Broadband" }, @@ -16310,6 +16352,7 @@ static const value_string usb_products_vals[] = { { 0x16140404, "WMA9109 UMTS Phone" }, { 0x16140600, "Vodafone VDA GPS / Toschiba Protege G710" }, { 0x16140804, "WP-S1 Phone" }, + { 0x16172002, "NVX-P1 Personal Navigation System" }, { 0x16300005, "802.11g Wireless Adapter [Intersil ISL3886]" }, { 0x16300011, "PC Port 10 Mps Adapter" }, { 0x1630ff81, "802.11b Wireless Adapter [Lucent/Agere Hermes I]" }, @@ -16462,6 +16505,8 @@ static const value_string usb_products_vals[] = { { 0x16c005e4, "Free shared USB VID/PID pair for MIDI devices" }, { 0x16c006b4, "USB2LPT with 2 interfaces" }, { 0x16c006b5, "USB2LPT with 3 interfaces (native, HID, printer)" }, + { 0x16c0074e, "DSP-Weuffen USB-HPI-Programmer" }, + { 0x16c0074f, "DSP-Weuffen USB2-HPI-Programmer" }, { 0x16c00762, "Osmocom SIMtrace" }, { 0x16c0076b, "OpenPCD 13.56MHz RFID Reader" }, { 0x16c0076c, "OpenPICC 13.56MHz RFID Simulator (native)" }, @@ -16520,6 +16565,7 @@ static const value_string usb_products_vals[] = { { 0x17030001, "NormSoft, Inc. Pocket Tunes" }, { 0x17030002, "NormSoft, Inc. Pocket Tunes 4" }, { 0x170b0011, "MIDI-USB 1x1" }, + { 0x17110101, "DFC-365FX camera" }, { 0x17113020, "IC80 HD Camera" }, { 0x17240115, "PAXcam5" }, { 0x17261000, "wireless modem" }, @@ -16561,9 +16607,12 @@ static const value_string usb_products_vals[] = { { 0x17409706, "EUB9706 802.11n Wireless Adapter [Ralink RT3072]" }, { 0x17409801, "EUB9801 802.11abgn Wireless Adapter [Ralink RT3572]" }, { 0x17480101, "Packet-Master USB12" }, - { 0x174c5106, "Transcend StoreJet 25M3" }, + { 0x174c1153, "ASM2115 SATA 6Gb/s bridge" }, + { 0x174c2074, "ASM1074 High-Speed hub" }, + { 0x174c3074, "ASM1074 SuperSpeed hub" }, + { 0x174c5106, "ASM1051 SATA 3Gb/s bridge" }, { 0x174c5136, "ASM1053 SATA 6Gb/s bridge" }, - { 0x174c55aa, "ASM1051 SATA 3Gb/s bridge" }, + { 0x174c55aa, "ASM1051E SATA 6Gb/s bridge, ASM1053E SATA 6Gb/s bridge, ASM1153 SATA 3Gb/s bridge" }, { 0x174f1105, "SM-MS/Pro-MMC-XD Card Reader" }, { 0x174f110b, "HP Webcam" }, { 0x174f1403, "Integrated Webcam" }, @@ -17781,6 +17830,7 @@ static const value_string usb_products_vals[] = { { 0x2a03803c, "Arduino Explora (CDC ACM)" }, { 0x2a038041, "Arduino Yun (CDC ACM)" }, { 0x2a03804d, "Arduino Zero Pro (CDC ACM)" }, + { 0x2a375110, "UPS35110/UPS25110" }, { 0x2a450001, "MX Phone (BICR)" }, { 0x2a450c02, "MX Phone (MTP & ADB)" }, { 0x2a450c03, "MX Phone (BICR & ADB)" }, diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers index 297af79102..02a60cb022 100644 --- a/epan/enterprise-numbers +++ b/epan/enterprise-numbers @@ -1,6 +1,6 @@ PRIVATE ENTERPRISE NUMBERS -(last updated 2015-04-19) +(last updated 2015-04-24) SMI Network Management Private Enterprise Codes: @@ -182020,7 +182020,7 @@ Decentralization / Helenic Public Administra Daniel Jud oid-admin&ckw.ch 45610 - EAM GmbH & Co.KG + EAM GmbH & Co. KG Uwe Scheller it&eam.de 45611 @@ -182331,6 +182331,118 @@ Decentralization / Helenic Public Administra oneM2M Gerry McAuley gerry.mcauley&etsi.org +45688 + Limone Fresco Limited + Michael Laccetti + michael&limone.me +45689 + Evolveum + Radovan Semancik + semancik&evolveum.com +45690 + bitbone AG + Sebastian Scheuring + technik&bitbone.de +45691 + Javacraft LLC + Michael Swiercz + iana&java-craft.org +45692 + Dantherm Power A/S + Morten Brun Madsen + mma&dantherm.com +45693 + arvato Systems S4M GmbH + Harald Hoyer + harald.hoyer&s4m.com +45694 + Comvergence Pty Ltd + Paul Arnold + paul.arnold&comvergence.com.au +45695 + CHAPS spol. s r.o. + Petr Hlavac + hlavac&chaps.cz +45696 + Mitchel Berberich Software GmbH + Mitchel Berberich + info&mbsw.com +45697 + Computer Sciences Corporation + Garvita Singh + gsingh41&csc.com +45698 + E-KENT Teknoloji ve Odeme Sistemleri San. ve Tic A.S + Huseyin Erdem Oguz + erdem.oguz&e-kent.com.tr +45699 + Hireku, Inc. + Sean McAfee + sean.mcafee&hireku.com +45700 + Transylvania University + Stephen Poynter + gadmin&transy.edu +45701 + IntegraCore, LLC + J.R. Maycock + jrmaycock&integracore.com +45702 + China Transinfo Technology + Wang Gang + wanggang02&chinatransinfo.com +45703 + Gemeindewerke Ga.-Pa. + Albert Grassl + it&gw-gap.de +45704 + Landstinget i Kalmar Län + Jens Vegeby + jens.vegeby<kalmar.se +45705 + FINT AB + Aengeln Englund + aengeln&fintab.se +45706 + Bluer Medical Technology + Tommy Bluer + bluermedical&163.com +45707 + ITCEG S.A.S + Alejandro Valdes Arcila + alejandro.valdes&itceg.com.co +45708 + Lively Arts Productions LLC + Director of Information Systems + infosys&livelyarts.net +45709 + Seibels + Nick Agostas + nick.agostas&seibels.com +45710 + Mobie Oy + Joni Eskelinen + oid-admin&mobie.fi +45711 + Matrix Electronica S.L. + Jose Gallego + jgallego&matrix.es +45712 + SERELEC SAS + WAUTHIER Valérian + v.wauthier&serelec.fr +45713 + CONSULDATA Advisors di Massimo Del Barba + Massimo Del Barba + maxdb&consuldataweb.net +45714 + Logitravel SL + Raimund Sacherer + rs&logitravel.com +45715 + Empresa Municipal de Informática S.A. - IPLANRIO + Bruno Furtado + bruno.furtado&rio.rj.gov.br End of Document diff --git a/epan/sminmpec.c b/epan/sminmpec.c index 9950c1fc12..d65c5f2bfc 100644 --- a/epan/sminmpec.c +++ b/epan/sminmpec.c @@ -45630,7 +45630,7 @@ const value_string sminmpec_values[] = { { 45607, "Sysco Foods" }, { 45608, "Atlan dynamic group" }, { 45609, "Centralschweizerische Kraftwerke AG" }, - { 45610, "EAM GmbH & Co.KG" }, + { 45610, "EAM GmbH & Co. KG" }, { 45611, "EOSPACE Inc." }, { 45612, "Under Armour Connected Fitness" }, { 45613, "Universiti Malaysia Terengganu" }, @@ -45708,6 +45708,34 @@ const value_string sminmpec_values[] = { { 45685, "AllCreator Co., Ltd." }, { 45686, "Ratel Technologies" }, { 45687, "oneM2M" }, + { 45688, "Limone Fresco Limited" }, + { 45689, "Evolveum" }, + { 45690, "bitbone AG" }, + { 45691, "Javacraft LLC" }, + { 45692, "Dantherm Power A/S" }, + { 45693, "arvato Systems S4M GmbH" }, + { 45694, "Comvergence Pty Ltd" }, + { 45695, "CHAPS spol. s r.o." }, + { 45696, "Mitchel Berberich Software GmbH" }, + { 45697, "Computer Sciences Corporation" }, + { 45698, "E-KENT Teknoloji ve Odeme Sistemleri San. ve Tic A.S" }, + { 45699, "Hireku, Inc." }, + { 45700, "Transylvania University" }, + { 45701, "IntegraCore, LLC" }, + { 45702, "China Transinfo Technology" }, + { 45703, "Gemeindewerke Ga.-Pa." }, + { 45704, "Landstinget i Kalmar L\0303\0244n" }, + { 45705, "FINT AB" }, + { 45706, "Bluer Medical Technology" }, + { 45707, "ITCEG S.A.S" }, + { 45708, "Lively Arts Productions LLC" }, + { 45709, "Seibels" }, + { 45710, "Mobie Oy" }, + { 45711, "Matrix Electronica S.L." }, + { 45712, "SERELEC SAS" }, + { 45713, "CONSULDATA Advisors di Massimo Del Barba" }, + { 45714, "Logitravel SL" }, + { 45715, "Empresa Municipal de Inform\0303\0241tica S.A. - IPLANRIO" }, { 0, NULL} }; @@ -3822,7 +3822,7 @@ 00:0E:D5 Copan # COPAN Systems Inc. 00:0E:D6 Cisco # CISCO SYSTEMS, INC. 00:0E:D7 Cisco # CISCO SYSTEMS, INC. -00:0E:D8 Aktino # Aktino, Inc. +00:0E:D8 Positron # Positron Access Solutions Corp 00:0E:D9 Aksys # Aksys, Ltd. 00:0E:DA C-TechUn # C-TECH UNITED CORP. 00:0E:DB Xincom # XiNCOM Corp. @@ -17363,6 +17363,7 @@ 08:68:EA EitoElec # EITO ELECTRONICS CO., LTD. 08:6D:F2 Shenzhen # Shenzhen MIMOWAVE Technology Co.,Ltd 08:70:45 Apple +08:74:02 Apple # Apple, Inc. 08:74:F6 Winterha # Winterhalter Gastronom GmbH 08:75:72 ObeluxOy # Obelux Oy 08:76:18 VieTechn # ViE Technologies Sdn. Bhd. @@ -18117,6 +18118,7 @@ 20:74:CF Shenzhen # Shenzhen Voxtech Co.,Ltd 20:76:00 Actionte # Actiontec Electronics, Inc 20:76:93 LenovoBe # Lenovo (Beijing) Limited. +20:78:F0 Apple # Apple, Inc. 20:7C:8F QuantaMi # Quanta Microsystems,Inc. 20:7D:74 Apple 20:85:8C Assa @@ -18172,6 +18174,7 @@ 20:F0:02 MtdataDe # MTData Developments Pty. Ltd. 20:F3:A3 HuaweiTe # Huawei Technologies Co., Ltd 20:F4:1B Shenzhen # Shenzhen Bilian electronic CO.,LTD +20:F5:10 CodexDig # Codex Digital Limited 20:F8:5E DeltaEle # Delta Electronics 20:FA:BB Cambridg # Cambridge Executive Limited 20:FD:F1 3comEuro # 3COM EUROPE LTD @@ -18402,6 +18405,7 @@ 28:ED:58 JagJakob # JAG Jakob AG 28:EE:2C Frontlin # Frontline Test Equipment 28:EF:01 Private +28:F0:76 Apple 28:F3:58 2c-Trifo # 2C - Trifonov & Co 28:F5:32 Add-Engi # ADD-Engineering BV 28:F6:06 SyesSrl # Syes srl @@ -18920,6 +18924,7 @@ 3C:57:D5 Fiveco 3C:5A:37 SamsungE # Samsung Electronics 3C:5A:B4 Google +3C:5C:C3 Shenzhen # Shenzhen First Blue Chip Technology Ltd 3C:5E:C3 Cisco 3C:5F:01 Synerchi # Synerchip Co., Ltd. 3C:61:04 JuniperN # Juniper Networks @@ -19029,6 +19034,7 @@ 40:2C:F4 Universa # Universal Global Scientific Industrial Co., Ltd. 40:30:04 Apple 40:30:67 ConlogPt # Conlog (Pty) Ltd +40:33:1A Apple # Apple, Inc. 40:33:6C GodrejBo # Godrej & Boyce Mfg. co. ltd 40:37:AD MacroIma # Macro Image Technology, Inc. 40:3C:FC Apple @@ -19656,6 +19662,7 @@ 44:5E:CD Razer # Razer Inc 44:5E:F3 Tonalite # Tonalite Holding B.V. 44:5F:7A ShihlinE # Shihlin Electric & Engineering Corp. +44:5F:8C Intercel # Intercel Group Limited 44:61:32 Ecobee # ecobee inc 44:61:9C Fonsyste # FONsystem co. ltd. 44:65:6A MegaVide # Mega Video Electronic(HK) Industry Co., Ltd @@ -19923,6 +19930,7 @@ 4C:B4:EA HrdSPte # HRD (S) PTE., LTD. 4C:B7:6D NoviSecu # Novi Security 4C:B8:1C SamElect # SAM Electronics GmbH +4C:B8:2C Cambridg # Cambridge Mobile Telematics, Inc. 4C:B9:C8 Conet # CONET CO., LTD. 4C:BA:A3 BisonEle # Bison Electronics Inc. 4C:BB:58 ChiconyE # Chicony Electronics Co., Ltd. @@ -19981,6 +19989,7 @@ 50:3C:C4 LenovoMo # Lenovo Mobile Communication Technology Ltd. 50:3D:E5 Cisco # CISCO SYSTEMS, INC. 50:3F:56 Syncmold # Syncmold Enterprise Corp +50:45:F7 LiuheInt # Liuhe Intelligence Technology Ltd. 50:46:5D AsustekC # ASUSTek COMPUTER INC. 50:48:EB BeijingH # BEIJING HAIHEJINSHENG NETWORK TECHNOLOGY CO. LTD. 50:4A:5E Masimo # Masimo Corporation @@ -20012,6 +20021,7 @@ 50:76:91 Tekpea # Tekpea, Inc. 50:76:A6 EcilInfo # Ecil Informatica Ind. Com. Ltda 50:79:5B Interexp # Interexport Telecomunicaciones S.A. +50:7A:55 Apple # Apple, Inc. 50:7D:02 Biodit 50:7E:5D Arcadyan # Arcadyan Technology Corporation 50:85:69 SamsungE # Samsung Electronics Co.,LTD @@ -21053,6 +21063,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: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 70:B3:D5:08:F0:00/36 Deuta-We # DEUTA-WERKE GmbH 70:B3:D5:09:00:00/36 Powercra # POWERCRAFT ELECTRONICS PVT. LTD. @@ -21129,6 +21140,7 @@ 70:B3:D5:29:60:00/36 Rohde&Sc # Rohde&Schwarz Topex SA 70:B3:D5:29:D0:00/36 Xtech2Si # XTech2 SIA 70:B3:D5:2A:50:00/36 Taitotek # Taitotekniikka +70:B3:D5:2A:70:00/36 Plasmabi # Plasmability, LLC 70:B3:D5:2B:C0:00/36 EquiposD # EQUIPOS DE TELECOMUNICACIÓN OPTOELECTRÓNICOS, S.A. 70:B3:D5:2B:E0:00/36 Coherent # Coherent Logix, Inc. 70:B3:D5:2C:F0:00/36 MbConnec # MB Connect Line GmbH @@ -21137,6 +21149,7 @@ 70:B3:D5:2D:60:00/36 KvazarLl # Kvazar LLC 70:B3:D5:2D:A0:00/36 SkywaveN # Skywave Networks Private Limited 70:B3:D5:2D:C0:00/36 BolideTe # Bolide Technology Group, Inc. +70:B3:D5:2E:00:00/36 PeterHub # Peter Huber 70:B3:D5:2E:30:00/36 Meiknolo # Meiknologic GmbH 70:B3:D5:2E:E0:00/36 AplexTec # Aplex Technology Inc. 70:B3:D5:2F:00:00/36 Clock-O- # Clock-O-Matic @@ -21268,9 +21281,11 @@ 70:B3:D5:61:00:00/36 Polvisio # POLVISION 70:B3:D5:61:F0:00/36 Labotect # Labotect Labor-Technik-Göttingen GmbH 70:B3:D5:62:50:00/36 VxInstru # VX Instruments GmbH +70:B3:D5:62:80:00/36 MectSRL # MECT S.R.L. 70:B3:D5:63:40:00/36 Idaqs # idaqs Co.,Ltd. 70:B3:D5:63:A0:00/36 DaveSrl # DAVE SRL 70:B3:D5:63:B0:00/36 LazerSaf # Lazer Safe Pty Ltd +70:B3:D5:65:40:00/36 Emac # EMAC, Inc. 70:B3:D5:65:50:00/36 AotSyste # AOT System GmbH 70:B3:D5:65:A0:00/36 AplexTec # Aplex Technology Inc. 70:B3:D5:65:B0:00/36 Roush @@ -21305,6 +21320,7 @@ 70:B3:D5:70:80:00/36 IbmResea # IBM Research GmbH 70:B3:D5:70:90:00/36 Aml 70:B3:D5:71:00:00/36 Guardian # Guardian Controls International Ltd +70:B3:D5:71:40:00/36 AlturnaN # Alturna Networks 70:B3:D5:71:E0:00/36 MotecPty # Motec Pty Ltd 70:B3:D5:72:90:00/36 Emac # EMAC, Inc. 70:B3:D5:72:D0:00/36 KronMedi # Kron Medidores @@ -21349,6 +21365,7 @@ 70:B3:D5:81:90:00/36 «Intelle # «Intellect module» LLC 70:B3:D5:82:00:00/36 BeckerNa # Becker Nachrichtentechnik GmbH 70:B3:D5:82:30:00/36 SpContro # SP Controls +70:B3:D5:82:70:00/36 Metromat # Metromatics Pty Ltd 70:B3:D5:82:C0:00/36 Nels # NELS Ltd. 70:B3:D5:82:E0:00/36 Playaliv # PlayAlive A/S 70:B3:D5:83:80:00/36 Tofino @@ -21489,6 +21506,7 @@ 70:B3:D5:BE:C0:00/36 TokyoCom # Tokyo Communication Equipment MFG Co.,ltd. 70:B3:D5:BE:F0:00/36 Sensorte # Sensortech Systems Inc. 70:B3:D5:C0:30:00/36 XaviTech # XAVi Technologies Corp. +70:B3:D5:C2:10:00/36 AplexTec # Aplex Technology Inc. 70:B3:D5:C2:40:00/36 ElbitOfA # Elbit Systems of America 70:B3:D5:C2:50:00/36 Speedsig # speedsignal GmbH 70:B3:D5:C2:70:00/36 GeneralD # GENERAL DYNAMICS C4 SYSTEMS @@ -21549,6 +21567,7 @@ 70:B3:D5:D8:60:00/36 WpgsysPt # WPGSYS Pte Ltd 70:B3:D5:D8:70:00/36 Zigen # Zigen Corp 70:B3:D5:D8:B0:00/36 LenoxiAu # Lenoxi Automation s.r.o. +70:B3:D5:D8:C0:00/36 Damerell # Damerell Design Limited (DCL) 70:B3:D5:D8:D0:00/36 PullnetT # Pullnet Technology,S.L. 70:B3:D5:D8:F0:00/36 MoluTech # Molu Technology Inc., LTD. 70:B3:D5:D9:70:00/36 BrsSiste # BRS Sistemas Eletronicos @@ -21647,6 +21666,7 @@ 70:B3:D5:FA:40:00/36 Energybo # Energybox Limited 70:B3:D5:FB:00:00/36 Rohde&Sc # Rohde&Schwarz Topex SA 70:B3:D5:FB:A0:00/36 ApogeeAp # Apogee Applied Research, Inc. +70:B3:D5:FB:B0:00/36 VenaEngi # Vena Engineering Corporation 70:B3:D5:FC:50:00/36 Eltwin # Eltwin A/S 70:B3:D5:FC:60:00/36 TecnintH # Tecnint HTE Srl 70:B3:D5:FD:10:00/36 Redrat # RedRat Ltd @@ -21813,11 +21833,13 @@ 74:F6:12 ArrisGro # ARRIS Group, Inc. 74:F7:26 NeuronRo # Neuron Robotics 74:F8:5D Berkeley # Berkeley Nucleonics Corp +74:F8:DB IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. 74:FD:A0 Compupal # Compupal (Group) Corporation 74:FE:48 Advantec # ADVANTECH CO., LTD. 74:FF:7D WrenSoun # Wren Sound Systems, LLC 78:02:8F Adaptive # Adaptive Spectrum and Signal Alignment (ASSIA), Inc. 78:07:38 ZUKElzab # Z.U.K. Elzab S.A. +78:0C:B8 IntelCor # Intel Corporate 78:11:85 NbsPayme # NBS Payment Solutions Inc. 78:12:B8 Orantek # ORANTEK LIMITED 78:18:81 Azurewav # AzureWave Technologies, Inc. @@ -21935,6 +21957,7 @@ 78:D6:6F Aristocr # Aristocrat Technologies Australia Pty. Ltd. 78:D6:F0 SamsungE # Samsung Electro Mechanics 78:D7:52 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD +78:D7:5F Apple # Apple, Inc. 78:D9:9F NucomHk # NuCom HK Ltd. 78:DA:6E Cisco 78:DA:B3 GboTechn # GBO Technology @@ -22216,6 +22239,7 @@ 80:E6:50 Apple 80:EA:96 Apple 80:EA:CA DialogSe # Dialog Semiconductor Hellas SA +80:EB:77 Wistron # Wistron Corporation 80:EE:73 Shuttle # Shuttle Inc. 80:F2:5E Kyynel 80:F5:03 Pace # Pace plc @@ -22832,6 +22856,7 @@ 94:F1:9E HuizhouM # HUIZHOU MAORONG INTELLIGENT TECHNOLOGY CO.,LTD 94:F6:65 RuckusWi # Ruckus Wireless 94:F6:92 Geminico # Geminico co.,Ltd. +94:F6:A3 Apple # Apple, Inc. 94:F7:20 TianjinD # Tianjin Deviser Electronics Instrument Co., Ltd 94:FA:E8 Shenzhen # Shenzhen Eycom Technology Co., Ltd 94:FB:B2 Shenzhen # Shenzhen Gongjin Electronics Co.,Ltd @@ -23363,6 +23388,7 @@ A8:65:B2 Dongguan # DONGGUAN YISHANG ELECTRONIC TECHNOLOGY CO., LI A8:66:7F Apple # Apple, Inc. A8:6A:6F Rim A8:70:A5 Unicomm # UniComm Inc. +A8:74:1D PhoenixC # PHOENIX CONTACT Electronics GmbH A8:75:D6 FreetekI # FreeTek International Co., Ltd. A8:75:E2 Aventura # Aventura Technologies, Inc. A8:77:6F Zonoff @@ -23758,6 +23784,7 @@ B4:A9:5A Avaya # Avaya, Inc B4:A9:FE GhiaTech # GHIA Technology (Shenzhen) LTD B4:AA:4D Ensequen # Ensequence, Inc. B4:AB:2C MtmTechn # MtM Technology Corporation +B4:AE:2B Microsof # Microsoft B4:AE:6F CircleRe # Circle Reliance, Inc DBA Cranberry Networks B4:B0:17 Avaya # Avaya, Inc B4:B2:65 DaehoI&T # DAEHO I&T @@ -23808,7 +23835,7 @@ B8:24:1A SwedaInf # SWEDA INFORMATICA LTDA B8:26:6C AnovFran # ANOV France B8:26:D4 Furukawa # Furukawa Industrial S.A. Produtos Elétricos B8:27:EB Raspberr # Raspberry Pi Foundation -B8:28:8B ParkerHa # Parker Hannifin +B8:28:8B ParkerHa # Parker Hannifin Manufacturing (UK) Ltd B8:29:F7 BlasterT # Blaster Tech B8:2A:72 Dell # Dell Inc B8:2A:DC EfrEurop # EFR Europäische Funk-Rundsteuerung GmbH @@ -23854,6 +23881,7 @@ B8:7C:F2 Aerohive # Aerohive Networks Inc. B8:87:1E GoodMind # Good Mind Industries Co., Ltd. B8:87:A8 StepAhea # Step Ahead Innovations Inc. B8:88:E3 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD +B8:89:81 ChengduI # Chengdu InnoThings Technology Co., Ltd. B8:89:CA IljinEle # ILJIN ELECTRIC Co., Ltd. B8:8A:60 IntelCor # Intel Corporate B8:8D:12 Apple @@ -24415,6 +24443,7 @@ C8:F6:8D SETechno # S.E.TECHNOLOGIES LIMITED C8:F7:04 Building # Building Block Video C8:F7:33 IntelCor # Intel Corporate C8:F9:81 SenecaSR # Seneca s.r.l. +C8:F9:C8 Newsharp # NewSharp Technology(SuZhou)Co,Ltd C8:F9:F9 Cisco # CISCO SYSTEMS, INC. C8:FB:26 CiscoSpv # Cisco SPVTG C8:FE:30 BejingDa # Bejing DAYO Mobile Communication Technology Ltd. @@ -24516,6 +24545,7 @@ CC:C1:04 AppliedT # Applied Technical Systems CC:C3:EA Motorola # Motorola Mobility LLC CC:C5:0A Shenzhen # SHENZHEN DAJIAHAO TECHNOLOGY CO.,LTD CC:C6:2B Tri-Syst # Tri-Systems Corporation +CC:C7:60 Apple # Apple, Inc. CC:C8:D7 CiasElet # CIAS Elettronica srl CC:CC:4E SunFount # Sun Fountainhead USA. Corp CC:CC:81 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD @@ -24741,6 +24771,7 @@ D4:6F:42 WaxessUs # WAXESS USA Inc D4:79:C3 Camerone # Cameronet GmbH & Co. KG D4:7B:35 NeoMonit # NEO Monitors AS D4:7B:75 HartingE # HARTING Electronics GmbH +D4:7B:B0 AskeyCom # ASKEY COMPUTER CORP D4:81:CA Idevices # iDevices, LLC D4:82:3E ArgosyTe # Argosy Technologies, Ltd. D4:85:64 Hewlett- # Hewlett-Packard Company @@ -24897,6 +24928,7 @@ D8:AF:F1 Panasoni # Panasonic Appliances Company D8:B0:2E Guangzho # Guangzhou Zonerich Business Machine Co., Ltd D8:B0:4C JinanUsr # Jinan USR IOT Technology Co., Ltd. D8:B1:2A Panasoni # Panasonic Mobile Communications Co., Ltd. +D8:B1:90 Cisco # Cisco Systems D8:B3:77 Htc # HTC Corporation D8:B6:B7 Comtrend # Comtrend Corporation D8:B6:C1 Networka # NetworkAccountant, Inc. @@ -24975,6 +25007,7 @@ DC:3E:F8 Nokia # Nokia Corporation DC:45:17 ArrisGro # ARRIS Group, Inc. DC:49:C9 CascoSig # CASCO SIGNAL LTD DC:4E:DE ShinyeiT # SHINYEI TECHNOLOGY CO., LTD. +DC:53:60 IntelCor # Intel Corporate DC:53:7C CompalBr # Compal Broadband Networks, Inc. DC:56:E6 Shenzhen # Shenzhen Bococom Technology Co.,LTD DC:57:26 Power-On # Power-One @@ -24987,6 +25020,7 @@ DC:6F:08 BayStora # Bay Storage Technology DC:70:14 Private DC:71:44 SamsungE # Samsung Electro Mechanics DC:7B:94 Cisco # CISCO SYSTEMS, INC. +DC:7F:A4 2wire DC:82:5B JanusSpo # JANUS, spol. s r.o. DC:85:DE Azurewav # Azurewave Technologies., inc. DC:86:D8 Apple # Apple, Inc @@ -25115,6 +25149,7 @@ E0:A3:0F Pevco E0:A6:70 Nokia # Nokia Corporation E0:AA:B0 GeneralV # GENERAL VISION ELECTRONICS CO. LTD. E0:AB:FE OrbNetwo # Orb Networks, Inc. +E0:AC:CB Apple # Apple, Inc. E0:AC:F1 Cisco E0:AE:5E Alps # ALPS Co,. Ltd. E0:AE:B2 Bender&A # Bender GmbH & Co.KG @@ -25236,6 +25271,7 @@ E4:95:6E IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM E4:96:AE Altograp # ALTOGRAPHICS Inc. E4:97:F0 Shanghai # Shanghai VLC Technologies Ltd. Co. E4:98:D6 Apple # Apple, Inc +E4:A3:2F Shanghai # Shanghai Artimen Technology Co., Ltd. E4:A5:EF TronLink # TRON LINK ELECTRONICS CO., LTD. E4:A7:FD CellcoPa # Cellco Partnership E4:AB:46 UabSelte # UAB Selteka @@ -25409,6 +25445,7 @@ EC:17:2F Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. EC:17:66 Research # Research Centre Module EC:1A:59 BelkinIn # Belkin International Inc. EC:1D:7F Zte # zte corporation +EC:1F:72 SamsungE # Samsung Electro Mechanics co., LTD. EC:21:9F VidaboxL # VidaBox LLC EC:22:57 JiangsuN # JiangSu NanJing University Electronic Information Technology Co.,Ltd EC:22:80 D-LinkIn # D-Link International @@ -25497,6 +25534,7 @@ EC:E9:0B SistemaS # SISTEMA SOLUCOES ELETRONICAS LTDA - EASYTECH EC:E9:15 Sti # STI Ltd EC:E9:F8 GuangZho # Guang Zhou TRI-SUN Electronics Technology Co., Ltd EC:EA:03 DarfonLi # DARFON LIGHTING CORP +EC:EE:D8 ZtlxNetw # ZTLX Network Technology Co.,Ltd EC:F0:0E Abocom EC:F2:36 Neomonta # NEOMONTANA ELECTRONICS EC:F3:5B Nokia # Nokia Corporation @@ -25518,6 +25556,7 @@ F0:1C:2D JuniperN # Juniper Networks F0:1E:34 OricoTec # ORICO Technologies Co., Ltd F0:1F:AF Dell # Dell Inc F0:21:9D Cal-Comp # Cal-Comp Electronics & Communications Company Ltd. +F0:22:4E EsanElec # Esan electronic co. F0:23:29 ShowaDen # SHOWA DENKI CO.,LTD. F0:24:05 OpusHigh # OPUS High Technology Corporation F0:24:08 TalarisS # Talaris (Sweden) AB @@ -25589,6 +25628,7 @@ F0:AC:A4 Hbc-Radi # HBC-radiomatic F0:AD:4E Globalsc # Globalscale Technologies, Inc. F0:AE:51 Xi3 # Xi3 Corp F0:B0:52 RuckusWi # Ruckus Wireless +F0:B2:E5 Cisco # Cisco Systems F0:B4:29 XiaomiEl # XIAOMI Electronics,CO.,LTD F0:B4:79 Apple F0:B6:EB PoslabTe # Poslab Technology Co., Ltd. @@ -25720,6 +25760,7 @@ F4:B8:5E TexasIns # Texas INstruments F4:B8:A7 Zte # zte corporation F4:BD:7C ChengduJ # Chengdu jinshi communication Co., LTD F4:C4:47 CoagentI # Coagent International Enterprise Limited +F4:C6:13 Alcatel- # Alcatel-Lucent Shanghai Bell Co., Ltd F4:C6:D7 Blackned # blackned GmbH F4:C7:14 Shenzhen # Shenzhen Huawei Communication Technologies Co., Ltd F4:C7:95 WeyElekt # WEY Elektronik AG @@ -25801,6 +25842,7 @@ F8:51:6D DenwaTec # Denwa Technology Corp. F8:52:DF VnlEurop # VNL Europe AB F8:54:AF EciTelec # ECI Telecom Ltd. F8:57:2E CoreBran # Core Brands, LLC +F8:5B:9C Sb # SB SYSTEMS Co.,Ltd F8:5B:C9 M-Cube # M-Cube Spa F8:5C:45 IcNexus # IC Nexus Co. Ltd. F8:5F:2A Nokia # Nokia Corporation @@ -6527,10 +6527,10 @@ esimport 3564/udp # Electromed SIM port [Francois_Marchand] [Francois_Ma m2pa 3565/tcp # M2PA [RFC4165] m2pa 3565/sctp # M2PA [RFC4165] quest-data-hub 3566/tcp # Quest Data Hub [Greg_Cottman_2] [Greg_Cottman_2] 2010-10-18 -enc-eps 3567/tcp # EMIT protocol stack [Panasonic_Intranet_Panasonic_North_America_PEWLA] [Bryant_Eastham] 2002-08 2012-11-12 -enc-eps 3567/udp # EMIT protocol stack [Panasonic_Intranet_Panasonic_North_America_PEWLA] [Bryant_Eastham] 2002-08 2012-11-12 -enc-tunnel-sec 3568/tcp # EMIT secure tunnel [Panasonic_Intranet_Panasonic_North_America_PEWLA] [Bryant_Eastham] 2003-01 2012-11-12 -enc-tunnel-sec 3568/udp # EMIT secure tunnel [Panasonic_Intranet_Panasonic_North_America_PEWLA] [Bryant_Eastham] 2003-01 2012-11-12 +dof-eps 3567/tcp # DOF Protocol Stack [OpenDOF] [Bryant_Eastham] 2002-08 2015-04-23 +dof-eps 3567/udp # DOF Protocol Stack [OpenDOF] [Bryant_Eastham] 2002-08 2015-04-23 +dof-tunnel-sec 3568/tcp # DOF Secure Tunnel [OpenDOF] [Bryant_Eastham] 2003-01 2015-04-23 +dof-tunnel-sec 3568/udp # DOF Secure Tunnel [OpenDOF] [Bryant_Eastham] 2003-01 2015-04-23 mbg-ctrl 3569/tcp # Meinberg Control Service [Martin_Burnicki] [Martin_Burnicki] 2002-08 mbg-ctrl 3569/udp # Meinberg Control Service [Martin_Burnicki] [Martin_Burnicki] 2002-08 mccwebsvr-port 3570/tcp # MCC Web Server Port @@ -8804,8 +8804,8 @@ freeciv 5556/tcp # Freeciv gameplay [Reinier_Post_and_Pau] [Reinier_Pos freeciv 5556/udp # Freeciv gameplay [Reinier_Post_and_Pau] [Reinier_Post_and_Pau] 2006-01 Known Unauthorized Use on port 5556 farenet 5557/tcp # Sandlab FARENET [Kay_T_Labinsky] [Kay_T_Labinsky] 2010-05-03 westec-connect 5566/tcp # Westec Connect [Jon_Bolen] [Jon_Bolen] 2009-03-18 -enc-eps-mc-sec 5567/tcp # EMIT protocol stack multicast/secure transport [Panasonic_Intranet_Panasonic_North_America_PEWLA] [Bryant_Eastham] 2004-11 2012-11-12 -enc-eps-mc-sec 5567/udp # EMIT protocol stack multicast/secure transport [Panasonic_Intranet_Panasonic_North_America_PEWLA] [Bryant_Eastham] 2004-11 2012-11-12 +dof-dps-mc-sec 5567/tcp # DOF Protocol Stack Multicast/Secure Transport [OpenDOF] [Bryant_Eastham] 2004-11 2015-04-23 +dof-dps-mc-sec 5567/udp # DOF Protocol Stack Multicast/Secure Transport [OpenDOF] [Bryant_Eastham] 2004-11 2015-04-23 sdt 5568/tcp # Session Data Transport Multicast [Daniel_W_Antonuk] [Daniel_W_Antonuk] 2006-05 sdt 5568/udp # Session Data Transport Multicast [Daniel_W_Antonuk] [Daniel_W_Antonuk] 2006-05 rdmnet-ctrl 5569/tcp # PLASA E1.33, Remote Device Management (RDM) controller status notifications [PLASA] [Simon_Newton] 2012-06-01 @@ -9040,6 +9040,7 @@ nuxsl 5991/tcp # NUXSL [Kai_Kretschmann] [Kai_Kretschmann] 2002-03 nuxsl 5991/udp # NUXSL [Kai_Kretschmann] [Kai_Kretschmann] 2002-03 consul-insight 5992/tcp # Consul InSight Security [Arthur_Hillenaar] [Arthur_Hillenaar] 2006-01 consul-insight 5992/udp # Consul InSight Security [Arthur_Hillenaar] [Arthur_Hillenaar] 2006-01 +cim-rs 5993/tcp # DMTF WEBM CIM REST [WS_Inc] [Jim_Davis_2] 2015-04-24 cvsup 5999/tcp # CVSup [Randall_Atkinson_2] [Randall_Atkinson_2] cvsup 5999/udp # CVSup [Randall_Atkinson_2] [Randall_Atkinson_2] x11 6000-6063/tcp # X Window System [Stephen_Gildea] [Stephen_Gildea] Known Unauthorized Use on port 6003 @@ -9217,6 +9218,7 @@ metaedit-mu 6360/udp # MetaEdit+ Multi-User [Steven_Kelly] [Steven_Kelly] 2 ndn 6363/udp # Named Data Networking [Regents_of_the_University_of_California] [Jeff_Burke] 2013-10-30 metaedit-se 6370/tcp # MetaEdit+ Server Administration [Steven_Kelly] [Steven_Kelly] 2007-11-12 metaedit-se 6370/udp # MetaEdit+ Server Administration [Steven_Kelly] [Steven_Kelly] 2007-11-12 +redis 6379/tcp # An advanced key-value cache and store [Salvatore_Sanfilippo] [Itamar_Haber] 2015-04-23 metatude-mds 6382/tcp # Metatude Dialogue Server [Menno_Zweistra] [Menno_Zweistra] metatude-mds 6382/udp # Metatude Dialogue Server [Menno_Zweistra] [Menno_Zweistra] clariion-evr01 6389/tcp # clariion-evr01 [Dave_DesRoches] [Dave_DesRoches] @@ -10059,8 +10061,8 @@ rtsp-alt 8554/tcp # RTSP Alternate (see port 554) [Stephen_Casner_2] [St rtsp-alt 8554/udp # RTSP Alternate (see port 554) [Stephen_Casner_2] [Stephen_Casner_2] d-fence 8555/tcp # SYMAX D-FENCE [Thomas_Geisel] [Thomas_Geisel] 2003-01 d-fence 8555/udp # SYMAX D-FENCE [Thomas_Geisel] [Thomas_Geisel] 2003-01 -enc-tunnel 8567/tcp # EMIT tunneling protocol [Panasonic_Intranet_Panasonic_North_America_PEWLA] [Bryant_Eastham] 2005-08 2012-11-12 -enc-tunnel 8567/udp # EMIT tunneling protocol [Panasonic_Intranet_Panasonic_North_America_PEWLA] [Bryant_Eastham] 2005-08 2012-11-12 +dof-tunnel 8567/tcp # DOF Tunneling Protocol [OpenDOF] [Bryant_Eastham] 2005-08 2015-04-23 +dof-tunnel 8567/udp # DOF Tunneling Protocol [OpenDOF] [Bryant_Eastham] 2005-08 2015-04-23 asterix 8600/tcp # Surveillance Data [Eivan_Cerasi] [Eivan_Cerasi] 2005-11 asterix 8600/udp # Surveillance Data [Eivan_Cerasi] [Eivan_Cerasi] 2005-11 canon-cpp-disc 8609/udp # Canon Compact Printer Protocol Discovery [Canon_Inc] [Ryusuke_Okuhara] 2012-06-08 2012-06-15 diff --git a/ui/qt/wireshark_it.qm b/ui/qt/wireshark_it.qm Binary files differindex 7d15352fe3..f55e942aa7 100644 --- a/ui/qt/wireshark_it.qm +++ b/ui/qt/wireshark_it.qm diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts index 073b1e314c..715713d037 100644 --- a/ui/qt/wireshark_it.ts +++ b/ui/qt/wireshark_it.ts @@ -5276,12 +5276,12 @@ a:hover { <message> <location filename="main_window.ui" line="1068"/> <source>Copy All Visible Items</source> - <translation type="unfinished"></translation> + <translation>Copia tutti gli elementi visibili</translation> </message> <message> <location filename="main_window.ui" line="1073"/> <source>Copy All Visible Selected Tree Items</source> - <translation type="unfinished"></translation> + <translation>Copia tutti gli elementi visibili dell'albero selezionato</translation> </message> <message> <location filename="main_window.ui" line="1211"/> diff --git a/ui/qt/wireshark_zh_CN.qm b/ui/qt/wireshark_zh_CN.qm Binary files differindex 1578761d08..344a81c3ee 100644 --- a/ui/qt/wireshark_zh_CN.qm +++ b/ui/qt/wireshark_zh_CN.qm diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts index 4115e2db9b..57534829c8 100644 --- a/ui/qt/wireshark_zh_CN.ts +++ b/ui/qt/wireshark_zh_CN.ts @@ -15,7 +15,7 @@ <message> <location filename="about_dialog.ui" line="14"/> <source>About Wireshark</source> - <translation>关于Wireshark</translation> + <translation>关于 Wireshark</translation> </message> <message> <location filename="about_dialog.ui" line="36"/> @@ -68,7 +68,7 @@ <message> <location filename="bluetooth_att_server_attributes_dialog.ui" line="64"/> <source>UUID Name</source> - <translation>UUID名</translation> + <translation>UUID 名称</translation> </message> <message> <location filename="bluetooth_att_server_attributes_dialog.ui" line="96"/> @@ -156,7 +156,7 @@ <message> <location filename="capture_file_dialog.cpp" line="161"/> <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> + <translation>您所选择的文件格式不支持注释。您希望将捕获内容保存为支持注释的格式，还是希望丢弃注释，直接保存为您所选择的格式？</translation> </message> <message> <location filename="capture_file_dialog.cpp" line="166"/> @@ -172,7 +172,7 @@ <message> <location filename="capture_file_dialog.cpp" line="174"/> <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> + <translation>可以保存的文件格式中，没有支持注释的格式。您是否要丢弃注释并以您选择的格式保存？</translation> </message> <message> <location filename="capture_file_dialog.cpp" line="394"/> @@ -252,12 +252,12 @@ <message> <location filename="capture_file_dialog.cpp" line="515"/> <source>&Transport name resolution</source> - <translation>传输层名字解析</translation> + <translation>传输层名称解析(&T)</translation> </message> <message> <location filename="capture_file_dialog.cpp" line="519"/> <source>&Network name resolution</source> - <translation>网络层名字解析(&N)</translation> + <translation>网络层名称解析(&N)</translation> </message> <message> <location filename="capture_file_dialog.cpp" line="523"/> @@ -267,7 +267,7 @@ <message> <location filename="capture_file_dialog.cpp" line="529"/> <source>Compress with g&zip</source> - <translation>用 gzip 压缩(&z)</translation> + <translation>用 gzip 压缩(&Z)</translation> </message> <message> <location filename="capture_file_dialog.cpp" line="560"/> @@ -570,7 +570,7 @@ <source>Created by Wireshark %1 </source> - <translation>由Wireshark创建 %1</translation> + <translation>通过 Wireshark 创建 %1</translation> </message> </context> <context> @@ -619,7 +619,7 @@ <message> <location filename="capture_interfaces_dialog.ui" line="88"/> <source><html><head/><body><p>You probably want to enable this. Usually a network card will only capture the traffic sent to its own network address. If you want to capture all traffic that the network card can &quot;see&quot;, mark this option. See the FAQ for some more details of capturing packets from a switched network.</p></body></html></source> - <translation><html><head/><body><p>你可能希望打开这个功能。网卡通常只会捕获那些发给它自身地址的流量。如果你希望捕获所有网卡能够 &quot;看到&quot;的流量,请打开本选项。查看FAQ中关于从交换网络中捕获分组的详细信息。</p></body></html></translation> + <translation><html><head/><body><p>您可能希望启用这个功能。网卡通常只会捕获那些发给它自身地址的流量。如果您希望捕获所有网卡能够“看到”的流量，请启用此选项。参见FAQ中关于从交换网络中捕获分组的详细信息。</p></body></html></translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="168"/> @@ -654,7 +654,7 @@ <message> <location filename="capture_interfaces_dialog.ui" line="295"/> <source>Create a new file automatically after...</source> - <translation>自动创建新文件,经过...</translation> + <translation>自动创建新文件，经过...</translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="339"/> @@ -689,18 +689,18 @@ <message> <location filename="capture_interfaces_dialog.ui" line="639"/> <source>Stop capturing after the specified number of packets have been captured.</source> - <translation>超过指定数量的分组被捕获后,停止捕获。</translation> + <translation>超过指定数量的分组被捕获后，停止捕获。</translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="655"/> <location filename="capture_interfaces_dialog.ui" line="730"/> <source>Stop capturing after the specified amount of data has been captured.</source> - <translation>超过指定数量的分组被捕获后,停止捕获。</translation> + <translation>超过指定数量的分组被捕获后，停止捕获。</translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="671"/> <source><html><head/><body><p>Stop capturing after the specified amount of data has been captured.</p></body></html></source> - <translation><html><head/><body><p>超过指定数量的分组被捕获后,停止捕获。</p></body></html></translation> + <translation><html><head/><body><p>超过指定数量的分组被捕获后，停止捕获。</p></body></html></translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="681"/> @@ -740,7 +740,7 @@ <message> <location filename="capture_interfaces_dialog.ui" line="114"/> <source>Show and hide interfaces, add comments, and manage pipes and remote interfaces.</source> - <translation>显示和隐藏接口,添加注释,管理管道和远程接口。</translation> + <translation>显示和隐藏接口、添加注释、管理管道和远程接口。</translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="117"/> @@ -760,7 +760,7 @@ <message> <location filename="capture_interfaces_dialog.ui" line="241"/> <source><html><head/><body><p>Enter the file name to which captured data will be written. By default, a temporary file will be used.</p></body></html></source> - <translation><html><head/><body><p>输入用于保存捕获数据的文件名。缺省,将会使用临时文件。</p></body></html></translation> + <translation><html><head/><body><p>输入用于保存捕获数据的文件名。默认情况下，将会使用临时文件。</p></body></html></translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="247"/> @@ -770,12 +770,12 @@ <message> <location filename="capture_interfaces_dialog.ui" line="292"/> <source><html><head/><body><p>Instead of using a single capture file, multiple files will be created.</p><p>The generated file names will contain an incrementing number and the start time of the capture.</p></body></html></source> - <translation><html><head/><body><p>相对于使用单个捕获文件,多文件将会被创建。</p><p>生成的文件名会包含增加的序号和捕获开始时间。</p></body></html></translation> + <translation><html><head/><body><p>相对于使用单个捕获文件，多个文件将会被创建。</p><p>生成的文件名会包含增加的序号和捕获开始时间。</p></body></html></translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="307"/> <source><html><head/><body><p>If the selected file size is exceeded, capturing switches to the next file.</p><p>PLEASE NOTE: One option MUST be selected.</p></body></html></source> - <translation><html><head/><body><p>如果超过了指定的文件尺寸,切换到下一个文件进行捕获。</p><p>请注意：至少有一个功能必须选择。</p></body></html> + <translation><html><head/><body><p>如果超过了指定的文件尺寸，切换到下一个文件进行捕获。</p><p>请注意：至少有一个功能必须选择。</p></body></html> </translation> </message> <message> @@ -784,7 +784,7 @@ <location filename="capture_interfaces_dialog.ui" line="375"/> <source>If the selected file size is exceeded, capturing switches to the next file. PLEASE NOTE: One option MUST be selected.</source> - <translation>如果超过了指定的文件尺寸,切换到下一个文件进行捕获。 + <translation>如果超过了指定的文件尺寸，切换到下一个文件进行捕获。 请注意：至少有一个功能必须选择。</translation> </message> <message> @@ -796,12 +796,12 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="capture_interfaces_dialog.ui" line="443"/> <source><html><head/><body><p>After capturing has switched to the next file and the given number of files has exceeded, the oldest file will be removed.</p></body></html></source> - <translation><html><head/><body><p>当捕获切换到下一个文件并且给定的文件数已经达到, 最早的文件将会被删除。</p></body></html></translation> + <translation><html><head/><body><p>当捕获切换到下一个文件并且给定的文件数已经达到，最早的文件将会被删除。</p></body></html></translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="446"/> <source>Use a ring buffer with </source> - <translation>使用一个环形缓冲器,对于</translation> + <translation>使用一个环形缓冲器，采用</translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="463"/> @@ -821,7 +821,7 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="capture_interfaces_dialog.ui" line="518"/> <source><html><head/><body><p>Using this option will show the captured packets immediately on the main screen. Please note: this will slow down capturing, so increased packet drops might appear.</p></body></html></source> - <translation><html><head/><body><p>使用本功能会立即在主屏幕中显示捕获的分组。 请注意: 这将减慢捕获速度, 因此会导致出现分组丢失的情况。</p></body></html></translation> + <translation><html><head/><body><p>使用此功能将会立即在主屏幕中显示捕获的分组。请注意：这将减慢捕获速度，因此可能会增加分组丢失的情况。</p></body></html></translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="521"/> @@ -831,7 +831,7 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="capture_interfaces_dialog.ui" line="528"/> <source><html><head/><body><p>This will scroll the &quot;Packet List&quot; automatically to the latest captured packet, when the &quot;Update list of packets in real-time&quot; option is used.</p></body></html></source> - <translation><html><head/><body><p>当 &quot;实时更新分组列表&quot; 功能打开时,自动滚动 &quot;分组列表&quot;到最新的捕获分组。</p></body></html></translation> + <translation><html><head/><body><p>当“实时更新分组列表”选项启用时，自动滚动“分组列表”到最新捕获的分组。</p></body></html></translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="531"/> @@ -841,7 +841,7 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="capture_interfaces_dialog.ui" line="538"/> <source><html><head/><body><p>Show the capture info dialog while capturing.</p></body></html></source> - <translation><html><head/><body><p>在捕获时,显示捕获信息对话框。</p></body></html></translation> + <translation><html><head/><body><p>在捕获时，显示捕获信息对话框。</p></body></html></translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="541"/> @@ -851,12 +851,12 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="capture_interfaces_dialog.ui" line="564"/> <source>Name Resolution</source> - <translation>名字解析</translation> + <translation>解析名称</translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="573"/> <source>Perform MAC layer name resolution while capturing.</source> - <translation>在捕获时,执行MAC层名称解析。</translation> + <translation>在捕获期间进行 MAC 层名称解析。</translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="576"/> @@ -866,39 +866,39 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="capture_interfaces_dialog.ui" line="583"/> <source><html><head/><body><p>Perform network layer name resolution while capturing.</p></body></html></source> - <translation><html><head/><body><p>在捕获时,执行网络层名称解析。</p></body></html></translation> + <translation><html><head/><body><p>在捕获期间进行网络层名称解析。</p></body></html></translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="586"/> <source>Resolve network names</source> - <translation>网络名字解析</translation> + <translation>解析网络名称</translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="593"/> <source>Perform transport layer name resolution while capturing.</source> - <translation>捕获时,执行传输层名称解析。</translation> + <translation>在捕获期间进行传输层名称解析。</translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="596"/> <source>Resolve transport names</source> - <translation>传输层名字解析</translation> + <translation>解析传输层名称</translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="624"/> <source>Stop capture automatically after...</source> - <translation>自动停止捕获,经过...</translation> + <translation>自动停止捕获，在经过...</translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="688"/> <location filename="capture_interfaces_dialog.ui" line="698"/> <location filename="capture_interfaces_dialog.ui" line="752"/> <source>Stop capturing after the specified amount of time has passed.</source> - <translation>超过指定的时间后,停止捕获。</translation> + <translation>经过指定的时间后，停止捕获。</translation> </message> <message> <location filename="capture_interfaces_dialog.ui" line="720"/> <source><html><head/><body><p>Stop capturing after the specified number of packets have been captured.</p></body></html></source> - <translation><html><head/><body><p>超过指定数量的分组被捕获后,停止捕获。</p></body></html></translation> + <translation><html><head/><body><p>超过指定数量的分组被捕获后，停止捕获。</p></body></html></translation> </message> <message> <location filename="capture_interfaces_dialog.cpp" line="117"/> @@ -980,13 +980,13 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="capture_interfaces_dialog.cpp" line="687"/> <source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source> - <translation>多个文件：没有给出捕获文件名！如果你想使用多文件,你必须给出文件名。</translation> + <translation>多个文件：没有给出捕获文件名！如果您想使用多个文件，必须指定一个文件名。</translation> </message> <message> <location filename="capture_interfaces_dialog.cpp" line="691"/> <source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file if you want to use multiple files.</source> - <translation>多个文件：未给出文件大小限制！如果你想使用多文件,你必须指定文件大小或者时长切换到下一个捕获文件。</translation> + <translation>多个文件：未给出文件大小限制！如果您想使用多个文件，必须指定切换到下一个捕获文件的文件大小或者时长。</translation> </message> </context> <context> @@ -1004,7 +1004,7 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="capture_preferences_frame.ui" line="63"/> <source><html><head/><body><p>You probably want to enable this. Usually a network card will only capture the traffic sent to its own network address. If you want to capture all traffic that the network card can &quot;see&quot;, mark this option. See the FAQ for some more details of capturing packets from a switched network.</p></body></html></source> - <translation><html><head/><body><p>你可能希望打开这个功能。网卡通常只会捕获那些发给它自身地址的流量。如果你希望捕获所有网卡能够 &quot;看到&quot;的流量,请打开本选项。查看FAQ中关于从交换网络中捕获分组的详细信息。</p></body></html></translation> + <translation><html><head/><body><p>您可能希望启用此项。网卡通常只会捕获那些发给它自身地址的流量。如果您希望捕获网卡能够“看到”的所有流量，请启用此选项。查看FAQ中关于从交换网络中捕获分组的详细信息。</p></body></html></translation> </message> <message> <location filename="capture_preferences_frame.ui" line="66"/> @@ -1024,7 +1024,7 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="capture_preferences_frame.ui" line="83"/> <source><html><head/><body><p>Update the list of packets while capture is in progress. This can result in dropped packets on high-speed networks.</p></body></html></source> - <translation><html><head/><body><p>在捕获运行时,更新分组列表。这可能会导致在高速网络中丢弃分组。</p></body></html></translation> + <translation><html><head/><body><p>在捕获进行时更新分组列表。这可能会导致在高速网络中丢弃分组。</p></body></html></translation> </message> <message> <location filename="capture_preferences_frame.ui" line="86"/> @@ -1034,7 +1034,7 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="capture_preferences_frame.ui" line="93"/> <source><html><head/><body><p>Keep the packet list scrolled to the bottom while capturing.</p></body></html></source> - <translation><html><head/><body><p>在捕获时,保持分组列表滚动到底部。</p></body></html></translation> + <translation><html><head/><body><p>在捕获进行时，保持分组列表滚动到底部。</p></body></html></translation> </message> <message> <location filename="capture_preferences_frame.ui" line="96"/> @@ -1044,7 +1044,7 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="capture_preferences_frame.ui" line="103"/> <source><html><head/><body><p>Show the capture summary dialog while capturing.</p></body></html></source> - <translation><html><head/><body><p>在捕获时,显示捕获概要对话框。</p></body></html></translation> + <translation><html><head/><body><p>在捕获进行时，显示捕获概要对话框。</p></body></html></translation> </message> <message> <location filename="capture_preferences_frame.ui" line="106"/> @@ -1157,12 +1157,12 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="coloring_rules_dialog.cpp" line="351"/> <source>Your coloring rules file contains unknown rules</source> - <translation>你的着色规则文件包含未知规则</translation> + <translation>您的着色规则文件包含未知规则</translation> </message> <message> <location filename="coloring_rules_dialog.cpp" line="352"/> <source>Wireshark doesn't recognize one or more of your coloring rules. Saving will discard them.</source> - <translation>Wireshark无法识别一个或多个你的着色规则。保存将丢弃这些。</translation> + <translation>Wireshark 无法识别您的一个或多个着色规则。保存将会丢弃它们。</translation> </message> <message> <location filename="coloring_rules_dialog.cpp" line="362"/> @@ -1299,7 +1299,7 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="decode_as_dialog.ui" line="27"/> <source>Match using this field</source> - <translation>使用本字段匹配</translation> + <translation>使用此字段匹配</translation> </message> <message> <location filename="decode_as_dialog.ui" line="32"/> @@ -1334,7 +1334,7 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="decode_as_dialog.ui" line="56"/> <source>Change behavior when the protocol field matches this value</source> - <translation>当协议字段匹配本值时修改行为</translation> + <translation>当协议字段匹配此值时变更行为</translation> </message> <message> <location filename="decode_as_dialog.ui" line="66"/> @@ -1364,7 +1364,7 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="decode_as_dialog.cpp" line="364"/> <source>Integer, base </source> - <translation>整形</translation> + <translation>整数，底数 </translation> </message> <message> <location filename="decode_as_dialog.cpp" line="376"/> @@ -1417,7 +1417,7 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="display_filter_edit.cpp" line="190"/> <source>Apply this filter string to the display</source> - <translation>应用本筛选器字符串进行显示</translation> + <translation>应用此筛选器字符串进行显示</translation> </message> <message> <location filename="display_filter_edit.cpp" line="279"/> @@ -1671,7 +1671,7 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="follow_stream_dialog.cpp" line="98"/> <source>Hide this stream</source> - <translation>隐藏本条流</translation> + <translation>隐藏这条流</translation> </message> <message> <location filename="follow_stream_dialog.cpp" line="101"/> @@ -1713,7 +1713,7 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="follow_stream_dialog.cpp" line="93"/> <source>Hex Dump</source> - <translation>Hex Dump</translation> + <translation>Hex 转储</translation> </message> <message> <location filename="follow_stream_dialog.cpp" line="94"/> @@ -1734,14 +1734,14 @@ PLEASE NOTE: One option MUST be selected.</source> <location filename="follow_stream_dialog.cpp" line="149"/> <source>%Ln <span style="color: %1; background-color:%2">client</span> pkt(s), </source> <translation> - <numerusform>%Ln <span style="color: %1; background-color:%2">客户端</span> pkt(s), </numerusform> + <numerusform>%Ln <span style="color: %1; background-color:%2">客户端</span> 分组, </numerusform> </translation> </message> <message numerus="yes"> <location filename="follow_stream_dialog.cpp" line="152"/> <source>%Ln <span style="color: %1; background-color:%2">server</span> pkt(s), </source> <translation> - <numerusform>%Ln <span style="color: %1; background-color:%2">服务器</span> pkt(s), </numerusform> + <numerusform>%Ln <span style="color: %1; background-color:%2">服务器</span> 分组, </numerusform> </translation> </message> <message numerus="yes"> @@ -1775,7 +1775,7 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="follow_stream_dialog.cpp" line="853"/> <source>Please make sure you have a capture file opened.</source> - <translation>请确认你已经打开一个捕获文件。</translation> + <translation>请确认您已经打开一个捕获文件。</translation> </message> <message> <location filename="follow_stream_dialog.cpp" line="859"/> @@ -1793,22 +1793,22 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="follow_stream_dialog.cpp" line="869"/> <source>Please make sure you have a TCP packet selected.</source> - <translation>请确认你已经选择一个TCP分组。</translation> + <translation>请确认您已经选中一个 TCP 分组。</translation> </message> <message> <location filename="follow_stream_dialog.cpp" line="875"/> <source>Please make sure you have a UDP packet selected.</source> - <translation>请确认你已经选择一个UDP分组。</translation> + <translation>请确认您已经选中一个 UDP 分组。</translation> </message> <message> <location filename="follow_stream_dialog.cpp" line="884"/> <source>Please make sure you have an SSL packet selected.</source> - <translation>请确认你已经选择一个SSL分组。</translation> + <translation>请确认您已经选中一个 SSL 分组。</translation> </message> <message> <location filename="follow_stream_dialog.cpp" line="907"/> <source>Error creating filter for this stream.</source> - <translation>为本条流创建筛选器错误。</translation> + <translation>为这条流创建筛选器时出错。</translation> </message> <message> <location filename="follow_stream_dialog.cpp" line="908"/> @@ -1832,7 +1832,7 @@ PLEASE NOTE: One option MUST be selected.</source> <location filename="follow_stream_dialog.cpp" line="1056"/> <location filename="follow_stream_dialog.cpp" line="1301"/> <source>Short read from temporary file %1: expected %2, got %3</source> - <translation>从临时文件%1 中短读: 期待 %2, 获取 %3</translation> + <translation>从临时文件 %1 中短读: 期待 %2, 获取 %3</translation> </message> <message> <location filename="follow_stream_dialog.cpp" line="1209"/> @@ -1925,12 +1925,12 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="font_color_preferences_frame.ui" line="129"/> <source>Sample "Follow Stream" client text</source> - <translation>"Follow Stream"客户端</translation> + <translation>“追踪数据流”客户端示例文本</translation> </message> <message> <location filename="font_color_preferences_frame.ui" line="149"/> <source>Sample "Follow Stream" server text</source> - <translation>"Follow Stream"服务器</translation> + <translation>“追踪数据流”服务器示例文本</translation> </message> <message> <location filename="font_color_preferences_frame.ui" line="199"/> @@ -1998,7 +1998,7 @@ PLEASE NOTE: One option MUST be selected.</source> </body></html></source> <translation><html><head/><body> -<h3>有价值的和惊人的节省时间的快捷键</h3> +<h3>有价值且惊人的节省时间的快捷键</h3> <table><tbody> <tr><th>+</th><td>放大</td></th> @@ -2357,12 +2357,12 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="io_graph_dialog.cpp" line="209"/> <source>IO Graphs</source> - <translation>IO 图</translation> + <translation>IO 图表</translation> </message> <message> <location filename="io_graph_dialog.cpp" line="261"/> <source>Wireshark IO Graphs: %1</source> - <translation>Wireshark IO图: %1</translation> + <translation>Wireshark IO 图表: %1</translation> </message> <message> <location filename="io_graph_dialog.cpp" line="383"/> @@ -2687,7 +2687,7 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="import_text_dialog.cpp" line="58"/> <source>Import From Hex Dump</source> - <translation>从Hex Dump文件导入</translation> + <translation>从 Hex 转储文件导入</translation> </message> <message> <location filename="import_text_dialog.cpp" line="281"/> @@ -3122,7 +3122,7 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="lbm_lbtrm_transport_dialog.ui" line="686"/> <source>Resize columns to content size</source> - <translation>根据内容自动调整列宽</translation> + <translation>调整列宽以适应内容</translation> </message> <message> <location filename="lbm_lbtrm_transport_dialog.cpp" line="1315"/> @@ -3734,13 +3734,13 @@ PLEASE NOTE: One option MUST be selected.</source> <location filename="lbm_lbtru_transport_dialog.ui" line="1096"/> <location filename="lbm_lbtru_transport_dialog.ui" line="1104"/> <source>Auto-resize columns to content</source> - <translation>自动调整列以适应内容</translation> + <translation>根据内容自动调整列宽</translation> </message> <message> <location filename="lbm_lbtru_transport_dialog.ui" line="1099"/> <location filename="lbm_lbtru_transport_dialog.ui" line="1107"/> <source>Resize columns to content size</source> - <translation>根据内容自动调整列宽</translation> + <translation>调整列宽以适应内容</translation> </message> <message> <location filename="lbm_lbtru_transport_dialog.ui" line="1118"/> @@ -4318,7 +4318,7 @@ PLEASE NOTE: One option MUST be selected.</source> <location filename="main_welcome.ui" line="63"/> <location filename="main_welcome.cpp" line="56"/> <source>Welcome to Wireshark.</source> - <translation>欢迎使用Wireshark。</translation> + <translation>欢迎使用 Wireshark。</translation> </message> <message> <location filename="main_welcome.ui" line="70"/> @@ -4333,7 +4333,7 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="main_welcome.ui" line="136"/> <source><html><head/><body><p>Capture live packets from your network.</p></body></html></source> - <translation><html><head/><body><p>从你的网络中捕获实时分组。</p></body></html></translation> + <translation><html><head/><body><p>从您的网络中捕获实时分组。</p></body></html></translation> </message> <message> <location filename="main_welcome.ui" line="139"/> @@ -4449,12 +4449,12 @@ text-decoration: underline; <message> <location filename="main_welcome.cpp" line="181"/> <source>You are running Wireshark </source> - <translation>正在运行Wireshark</translation> + <translation>正在运行 Wireshark</translation> </message> <message> <location filename="main_welcome.cpp" line="186"/> <source> You receive automatic updates.</source> - <translation>接收自动更新。</translation> + <translation>接受自动更新。</translation> </message> <message> <location filename="main_welcome.cpp" line="188"/> @@ -4518,7 +4518,7 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="270"/> <source>Name Resolution</source> - <translation>名字解析</translation> + <translation>解析名称</translation> </message> <message> <location filename="main_window.ui" line="478"/> @@ -4633,7 +4633,7 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="450"/> <source>Telephon&y</source> - <translation>电话(&y)</translation> + <translation>电话(&Y)</translation> </message> <message> <location filename="main_window.ui" line="454"/> @@ -4804,7 +4804,7 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="758"/> <source>Sample Captures</source> - <translation>示例捕获</translation> + <translation>捕获示例</translation> </message> <message> <location filename="main_window.ui" line="763"/> @@ -4814,7 +4814,7 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="775"/> <source>Ask (Q&&A)</source> - <translation>提问 (Q&&A) (&A)</translation> + <translation>提问 (问答平台)</translation> </message> <message> <location filename="main_window.ui" line="783"/> @@ -4949,7 +4949,7 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="882"/> <source>&Import from Hex Dump...</source> - <translation>从Hex Dump文件导入...</translation> + <translation>从 Hex 转储文件导入(&I)...</translation> </message> <message> <location filename="main_window.ui" line="885"/> @@ -5267,12 +5267,12 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="1068"/> <source>Copy All Visible Items</source> - <translation type="unfinished"></translation> + <translation>复制所有可见项目</translation> </message> <message> <location filename="main_window.ui" line="1073"/> <source>Copy All Visible Selected Tree Items</source> - <translation type="unfinished"></translation> + <translation>复制选中树的所有可见项目</translation> </message> <message> <location filename="main_window.ui" line="1211"/> @@ -5848,7 +5848,7 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="1690"/> <source>SM&PP Operations</source> - <translation>SM&PP 操作</translation> + <translation>SMPP 操作(&P)</translation> </message> <message> <location filename="main_window.ui" line="1693"/> @@ -5858,7 +5858,7 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="1698"/> <source>&UCP Messages</source> - <translation>UCP消息（&U）</translation> + <translation>UCP 消息(&U)</translation> </message> <message> <location filename="main_window.ui" line="1701"/> @@ -5951,12 +5951,12 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="1802"/> <source>Export PDUs to File...</source> - <translation>导出PDU到文件...</translation> + <translation>导出 PDU 到文件...</translation> </message> <message> <location filename="main_window.ui" line="1807"/> <source>&I/O Graph</source> - <translation>I/O图(&I)</translation> + <translation>I/O 图表(&I)</translation> </message> <message> <location filename="main_window.ui" line="1810"/> @@ -6016,7 +6016,7 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="1870"/> <source>Draw packets using your coloring rules</source> - <translation>使用你的着色规则来画分组</translation> + <translation>使用您的着色规则来绘制分组</translation> </message> <message> <location filename="main_window.ui" line="1875"/> @@ -6056,7 +6056,7 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="1902"/> <source>Resize Columns</source> - <translation>调整列</translation> + <translation>调整列宽</translation> </message> <message> <location filename="main_window.ui" line="1905"/> @@ -6088,12 +6088,12 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="1930"/> <source>Year, Day of Year, and Time of Day (1970/001 01:02:03.123456)</source> - <translation>年,年积日,时间 (1970/001 01:02:03.123456)</translation> + <translation>年、年积日、时间 (1970/001 01:02:03.123456)</translation> </message> <message> <location filename="main_window.ui" line="1933"/> <source>Show packet times as the year, day of the year and time of day.</source> - <translation>使用年,年积日和时间来显示分组时间。</translation> + <translation>使用年、年积日和时间来显示分组时间。</translation> </message> <message> <location filename="main_window.ui" line="1941"/> @@ -6163,12 +6163,12 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="2011"/> <source>UTC Date and Time of Day (1970-01-01 01:02:03.123456)</source> - <translation>UTC日期和时间 (1970-01-01 01:02:03.123456)</translation> + <translation>UTC 日期和时间 (1970-01-01 01:02:03.123456)</translation> </message> <message> <location filename="main_window.ui" line="2014"/> <source>Show packet times as the UTC date and time of day.</source> - <translation>使用UTC日期和时间来显示分组时间。</translation> + <translation>使用 UTC 日期和时间来显示分组时间。</translation> </message> <message> <location filename="main_window.ui" line="2017"/> @@ -6178,12 +6178,12 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="2025"/> <source>UTC Year, Day of Year, and Time of Day (1970/001 01:02:03.123456)</source> - <translation>UTC年,年积日,时间 (1970/001 01:02:03.123456)</translation> + <translation>UTC 年、年积日、时间 (1970/001 01:02:03.123456)</translation> </message> <message> <location filename="main_window.ui" line="2028"/> <source>Show packet times as the UTC year, day of the year and time of day.</source> - <translation>使用UTC年,年积日和时间来显示分组时间。</translation> + <translation>使用 UTC 年、年积日和时间来显示分组时间。</translation> </message> <message> <location filename="main_window.ui" line="2036"/> @@ -6193,7 +6193,7 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="2039"/> <source>Show packet times as the UTC time of day.</source> - <translation>使用UTC时间来显示分组时间。</translation> + <translation>使用 UTC 时间来显示分组时间。</translation> </message> <message> <location filename="main_window.ui" line="2042"/> @@ -6258,7 +6258,7 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="2123"/> <source>Show names for known MAC addresses. Lookups use a local database.</source> - <translation>显示已知的MAC地址的名称。查找使用本地数据库。</translation> + <translation>显示已知 MAC 地址的名称。使用本地数据库查询。</translation> </message> <message> <location filename="main_window.ui" line="2131"/> @@ -6278,7 +6278,7 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="2145"/> <source>Show names for known TCP, UDP, and SCTP services. Lookups can generate traffic on some systems.</source> - <translation>显示已知的TCP、UDP和SCTP服务名称。在一些系统中,查找会产生流量。</translation> + <translation>显示已知的 TCP、UDP 和 SCTP 服务的名称。在一些系统中，查找会产生流量。</translation> </message> <message> <location filename="main_window.ui" line="2156"/> @@ -6343,7 +6343,7 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="2253"/> <source>&VoIP Calls</source> - <translation>&VoIP呼叫</translation> + <translation>&VoIP 通话</translation> </message> <message> <location filename="main_window.ui" line="2256"/> @@ -6353,7 +6353,7 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="2261"/> <source>SIP &Flows</source> - <translation>SIP流(&F)</translation> + <translation>SIP 流(&F)</translation> </message> <message> <location filename="main_window.ui" line="2264"/> @@ -6363,7 +6363,7 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="2269"/> <source>RTP Streams</source> - <translation>RTP流</translation> + <translation>RTP 流</translation> </message> <message> <location filename="main_window.ui" line="2274"/> @@ -6398,7 +6398,7 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="2300"/> <source>Show this packet in a separate window.</source> - <translation>在单独窗口显示本分组。</translation> + <translation>在单独窗口中显示此分组。</translation> </message> <message> <location filename="main_window.ui" line="2305"/> @@ -6413,7 +6413,7 @@ text-decoration: underline; <message> <location filename="main_window.ui" line="2316"/> <source>Auto Scroll in Li&ve Capture</source> - <translation>在实时捕获时自动滚动屏幕(&v)</translation> + <translation>实时捕获时自动滚动(&V)</translation> </message> <message> <location filename="main_window.ui" line="2319"/> @@ -6443,7 +6443,7 @@ text-decoration: underline; <message> <location filename="main_window.cpp" line="652"/> <source>Save packets before merging?</source> - <translation>是否在合并之前保存分组?</translation> + <translation>是否在合并之前保存分组？</translation> </message> <message> <location filename="main_window.cpp" line="653"/> @@ -6453,12 +6453,12 @@ text-decoration: underline; <message> <location filename="main_window.cpp" line="659"/> <source>Save changes in "%1" before merging?</source> - <translation>是否在合并前保存对“%1”的改动?</translation> + <translation>是否在合并前保存对“%1”的更改？</translation> </message> <message> <location filename="main_window.cpp" line="661"/> <source>Changes must be saved before the files can be merged.</source> - <translation>文件在合并之前,其改动必须先保存。</translation> + <translation>在文件合并之前，其更改必须先保存。</translation> </message> <message> <location filename="main_window.cpp" line="720"/> @@ -6500,13 +6500,13 @@ text-decoration: underline; <message> <location filename="main_window.cpp" line="1273"/> <source>They will be lost if you don't save them.</source> - <translation>若不保存,这些分组将会丢失。</translation> + <translation>若不保存，这些分组将会丢失。</translation> </message> <message> <location filename="main_window.cpp" line="1276"/> <location filename="main_window.cpp" line="1289"/> <source>Do you want to stop the capture and save the captured packets</source> - <translation>是否希望停止捕获,并保存已捕获的分组</translation> + <translation>您是否要停止捕获，并保存已捕获的分组</translation> </message> <message> <location filename="main_window.cpp" line="1278"/> @@ -6522,17 +6522,17 @@ text-decoration: underline; <message> <location filename="main_window.cpp" line="1292"/> <source>Your captured packets will be lost if you don't save them.</source> - <translation>若不保存,您已经捕获的分组将会丢失。</translation> + <translation>若不保存，您已经捕获的分组将会丢失。</translation> </message> <message> <location filename="main_window.cpp" line="1295"/> <source>Do you want to save the changes you've made to the capture file "%1"%2?</source> - <translation>是否希望保存对捕获文件“%1”%2 的更改?</translation> + <translation>是否希望保存对捕获文件“%1”%2 的更改？</translation> </message> <message> <location filename="main_window.cpp" line="1301"/> <source>Your changes will be lost if you don't save them.</source> - <translation>若不保存,您的更改将会丢失。</translation> + <translation>若不保存，您的更改将会丢失。</translation> </message> <message> <location filename="main_window.cpp" line="1313"/> @@ -6542,22 +6542,22 @@ text-decoration: underline; <message> <location filename="main_window.cpp" line="1321"/> <source>Stop and Quit without Saving</source> - <translation>停止,并且不保存直接退出</translation> + <translation>停止并退出，不保存</translation> </message> <message> <location filename="main_window.cpp" line="1324"/> <source>Quit without Saving</source> - <translation>不保存,直接退出</translation> + <translation>不保存，直接退出</translation> </message> <message> <location filename="main_window.cpp" line="1329"/> <source>Stop and Continue without Saving</source> - <translation>停止并继续,而不必保存</translation> + <translation>停止并继续，不保存</translation> </message> <message> <location filename="main_window.cpp" line="1332"/> <source>Continue &without Saving</source> - <translation>不保存继续(&w)</translation> + <translation>不保存并继续(&W)</translation> </message> <message> <location filename="main_window.cpp" line="1601"/> @@ -6569,7 +6569,7 @@ text-decoration: underline; <location filename="main_window.cpp" line="1619"/> <location filename="main_window.cpp" line="1634"/> <source>The Wireshark Network Analyzer</source> - <translation>The Wireshark Network Analyzer</translation> + <translation>Wireshark 网络分析器</translation> </message> <message> <location filename="main_window_slots.cpp" line="616"/> @@ -6594,7 +6594,7 @@ text-decoration: underline; <message> <location filename="main_window_slots.cpp" line="1394"/> <source>Please wait while Wireshark is initializing</source> - <translation>请稍候,Wireshark正在初始化</translation> + <translation>Wireshark 正在初始化，请稍候</translation> </message> <message> <location filename="main_window_slots.cpp" line="1539"/> @@ -6652,7 +6652,7 @@ text-decoration: underline; <message> <location filename="main_window_preferences_frame.ui" line="41"/> <source>Checking this will save the size, position, and maximized state of the main window.</source> - <translation>选中本项将保持主窗口的大小、位置及最大化状态。</translation> + <translation>选中此项将保持主窗口的大小、位置及最大化状态。</translation> </message> <message> <location filename="main_window_preferences_frame.ui" line="44"/> @@ -6702,7 +6702,7 @@ text-decoration: underline; <message> <location filename="main_window_preferences_frame.ui" line="160"/> <source>If checked the packet detail items will be automatically scrolled when they are expanded.</source> - <translation>若选中,分组详情项目将随着展开而自动滚动。</translation> + <translation>若选中，分组详情项目将随着展开而自动滚动。</translation> </message> <message> <location filename="main_window_preferences_frame.ui" line="163"/> @@ -6738,7 +6738,7 @@ text-decoration: underline; <message> <location filename="main_window_preferences_frame.ui" line="224"/> <source>Icons & Text</source> - <translation>图标&文本</translation> + <translation>图标和文本</translation> </message> <message> <location filename="main_window_preferences_frame.ui" line="249"/> @@ -6753,7 +6753,7 @@ text-decoration: underline; <message> <location filename="main_window_preferences_frame.cpp" line="186"/> <source>Open Files In</source> - <translation>打开文件夹中文件</translation> + <translation>打开文件夹中的文件</translation> </message> </context> <context> @@ -6811,7 +6811,7 @@ text-decoration: underline; <message> <location filename="manage_interfaces_dialog.ui" line="140"/> <source><html><head/><body><p>Remove the selected pipe from the list.</p></body></html></source> - <translation><html><head/><body><p>从列表中删除选定的管道。</p></body></html></translation> + <translation><html><head/><body><p>从列表中移除选中的管道。</p></body></html></translation> </message> <message> <location filename="manage_interfaces_dialog.ui" line="170"/> @@ -6846,17 +6846,17 @@ text-decoration: underline; <message> <location filename="manage_interfaces_dialog.cpp" line="168"/> <source>This version of Wireshark does not save pipe settings.</source> - <translation>这个版本Wireshark无法保存管道设置。</translation> + <translation>这个版本的 Wireshark 无法保存管道设置。</translation> </message> <message> <location filename="manage_interfaces_dialog.cpp" line="172"/> <source>This version of Wireshark does not save remote settings.</source> - <translation>这个版本Wireshark无法保存远端设置。</translation> + <translation>这个版本的 Wireshark 无法保存远端设置。</translation> </message> <message> <location filename="manage_interfaces_dialog.cpp" line="174"/> <source>This version of Wireshark does not support remote interfaces.</source> - <translation>这个版本Wireshark不支持远端接口。</translation> + <translation>这个版本的 Wireshark 不支持远端接口。</translation> </message> <message> <location filename="manage_interfaces_dialog.cpp" line="422"/> @@ -6918,7 +6918,7 @@ text-decoration: underline; <message> <location filename="packet_format_group_box.ui" line="23"/> <source><html><head/><body><p>Packet summary lines similar to the packet list</p></body></html></source> - <translation><html><head/><body><p>分组概要行,与分组列表类似</p></body></html></translation> + <translation><html><head/><body><p>分组概要行，与分组列表类似</p></body></html></translation> </message> <message> <location filename="packet_format_group_box.ui" line="26"/> @@ -6928,7 +6928,7 @@ text-decoration: underline; <message> <location filename="packet_format_group_box.ui" line="36"/> <source><html><head/><body><p>Packet details similar to the protocol tree</p></body></html></source> - <translation><html><head/><body><p>分组详情,与协议树类似</p></body></html></translation> + <translation><html><head/><body><p>分组详情，与协议树类似</p></body></html></translation> </message> <message> <location filename="packet_format_group_box.ui" line="39"/> @@ -6968,7 +6968,7 @@ text-decoration: underline; <message> <location filename="packet_format_group_box.ui" line="100"/> <source><html><head/><body><p>Export a hexdump of the packet data similar to the packet bytes view</p></body></html></source> - <translation><html><head/><body><p>导出分组数据的十六进制转储,类似于分组字节视图</p></body></html></translation> + <translation><html><head/><body><p>导出分组数据的十六进制转储，类似于分组字节视图</p></body></html></translation> </message> <message> <location filename="packet_format_group_box.ui" line="103"/> @@ -7016,7 +7016,7 @@ text-decoration: underline; <message> <location filename="packet_list.cpp" line="617"/> <source>Remove This Column</source> - <translation>删除本列</translation> + <translation>删除此列</translation> </message> <message> <location filename="packet_list.cpp" line="892"/> @@ -7034,14 +7034,14 @@ text-decoration: underline; <message> <location filename="packet_list.cpp" line="1016"/> <source>Change Time Display Format?</source> - <translation>更改时间显示格式?</translation> + <translation>更改时间显示格式？</translation> </message> <message> <location filename="packet_list.cpp" line="1017"/> <source>Time References don't work well with the currently selected Time Display Format. Do you want to switch to "Seconds Since Beginning of Capture" now?</source> <translation>时间参考与当前选中的时间显示格式搭配使用效果不佳。 -您是否希望立刻切换为“捕获开始后秒数”?</translation> +您是否希望立刻切换为“捕获开始后秒数”？</translation> </message> </context> <context> @@ -7224,7 +7224,7 @@ Do you want to switch to "Seconds Since Beginning of Capture" now?</so <message> <location filename="print_dialog.ui" line="57"/> <source><html><head/><body><p>Use the &quot;+&quot; and &quot;-&quot; keys to zoom the preview in and out. Use the &quot;0&quot; key to reset the zoom level.</p></body></html></source> - <translation><html><head/><body><p>使用“+”“-”键可放大与缩小预览。用“0”键可重置缩放级别。</p><!--&quot;--></body></html></translation> + <translation><html><head/><body><p>使用“+”和“-”键可放大与缩小预览。用“0”键可重置缩放级别。</p></body></html></translation> </message> <message> <location filename="print_dialog.ui" line="60"/> @@ -7249,7 +7249,7 @@ Do you want to switch to "Seconds Since Beginning of Capture" now?</so <message> <location filename="print_dialog.cpp" line="121"/> <source>Page &Setup...</source> - <translation>页面配置(&S)...</translation> + <translation>页面设置(&S)...</translation> </message> <message> <location filename="print_dialog.cpp" line="156"/> @@ -7446,7 +7446,7 @@ Do you want to switch to "Seconds Since Beginning of Capture" now?</so <message> <location filename="preferences_dialog.cpp" line="101"/> <source>Has this preference been changed?</source> - <translation>首选项是否改变?</translation> + <translation>此首选项已被更改？</translation> </message> <message> <location filename="preferences_dialog.cpp" line="105"/> @@ -7941,7 +7941,7 @@ Do you want to switch to "Seconds Since Beginning of Capture" now?</so <message> <location filename="rtp_stream_dialog.ui" line="158"/> <source>Go to the setup packet for this stream.</source> - <translation>跳转到本条流的设置分组。</translation> + <translation>跳转到这条流的设置分组。</translation> </message> <message> <location filename="rtp_stream_dialog.ui" line="161"/> @@ -7986,7 +7986,7 @@ Do you want to switch to "Seconds Since Beginning of Capture" now?</so <message> <location filename="rtp_stream_dialog.ui" line="191"/> <source>Open the analysis window for the selected stream(s)</source> - <translation>为所选择的流打开分析窗口</translation> + <translation>为选中的流打开分析窗口</translation> </message> <message> <location filename="rtp_stream_dialog.ui" line="196"/> @@ -8011,7 +8011,7 @@ Do you want to switch to "Seconds Since Beginning of Capture" now?</so <message> <location filename="rtp_stream_dialog.cpp" line="224"/> <source>RTP Streams</source> - <translation>RTP流</translation> + <translation>RTP 流</translation> </message> <message> <location filename="rtp_stream_dialog.cpp" line="250"/> @@ -8041,7 +8041,7 @@ Do you want to switch to "Seconds Since Beginning of Capture" now?</so <message> <location filename="rtp_stream_dialog.cpp" line="387"/> <source>, %1 selected, %2 total packets</source> - <translation>, %1 选择, %2 全部分组</translation> + <translation>, %1 项已选中, 总计 %2 项分组</translation> </message> <message> <location filename="rtp_stream_dialog.cpp" line="498"/> @@ -8054,7 +8054,7 @@ Do you want to switch to "Seconds Since Beginning of Capture" now?</so <message> <location filename="sctp_all_assocs_dialog.ui" line="14"/> <source>Wireshark - SCTP Associations</source> - <translation>Wireshark - SCTP分析助手</translation> + <translation>Wireshark - SCTP 分析助手</translation> </message> <message> <location filename="sctp_all_assocs_dialog.ui" line="62"/> @@ -8422,7 +8422,7 @@ Do you want to switch to "Seconds Since Beginning of Capture" now?</so <message> <location filename="sctp_assoc_analyse_dialog.ui" line="20"/> <source>Wireshark - Analyse Association</source> - <translation>Wireshark = 分析助手</translation> + <translation>Wireshark - 分析助手</translation> </message> <message> <location filename="sctp_assoc_analyse_dialog.ui" line="35"/> @@ -9589,7 +9589,7 @@ Do you want to switch to "Seconds Since Beginning of Capture" now?</so </body></html></source> <translation><html><head/><body> -<h3>有价值的和惊人的节省时间的快捷键</h3> +<h3>有价值且惊人的节省时间的快捷键</h3> <table><tbody> <tr><th>+</th><td>放大</td></th> @@ -10016,7 +10016,7 @@ Do you want to switch to "Seconds Since Beginning of Capture" now?</so <message> <location filename="tcp_stream_dialog.cpp" line="415"/> <source>%1 %2 pkts, %3 %4 %5 pkts, %6 </source> - <translation>%1 %2 pkts, %3 %4 %5 pkts, %6</translation> + <translation>%1 %2 分组, %3 %4 %5 分组, %6</translation> </message> <message> <location filename="tcp_stream_dialog.cpp" line="496"/> @@ -10178,7 +10178,7 @@ Do you want to switch to "Seconds Since Beginning of Capture" now?</so <message> <location filename="traffic_table_dialog.ui" line="25"/> <source>Name resolution</source> - <translation>解析名字</translation> + <translation>解析名称</translation> </message> <message> <location filename="traffic_table_dialog.ui" line="45"/> @@ -10213,7 +10213,7 @@ Do you want to switch to "Seconds Since Beginning of Capture" now?</so <message> <location filename="traffic_table_dialog.cpp" line="76"/> <source>Copy all values of this page to the clipboard in CSV (Comma Separated Values) format.</source> - <translation>使用CSV（逗号分隔值）格式,复制本页的所有值到剪贴板。</translation> + <translation>复制此页的所有值到剪贴板，使用CSV（逗号分隔值）格式。</translation> </message> <message> <location filename="traffic_table_dialog.cpp" line="78"/> @@ -10223,7 +10223,7 @@ Do you want to switch to "Seconds Since Beginning of Capture" now?</so <message> <location filename="traffic_table_dialog.cpp" line="79"/> <source>Copy all values of this page to the clipboard in the YAML data serialization format.</source> - <translation>使用YAML数据串行格式,复制本页的所有值到剪贴板。</translation> + <translation>复制此页的所有值到剪贴板，使用 YAML 数据串行格式。</translation> </message> <message> <location filename="traffic_table_dialog.h" line="109"/> |