aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-06-14 08:33:58 -0700
committerGerald Combs <gerald@wireshark.org>2015-06-14 15:34:05 +0000
commit5432151d163ffea7b2a4c91ef1b43dbd597aabcd (patch)
tree8407ba8954083ff5d3ecf1f00d76ab57a3e0b0cf
parenteaf702bdcc90e869599709d227fad0b281723091 (diff)
[Automatic update for 2015-06-14]
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Id3ff0d609b0a34066c3d23053b8d8bbebfc43070 Reviewed-on: https://code.wireshark.org/review/8914 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat
-rw-r--r--epan/dissectors/usb.c84
-rw-r--r--epan/enterprise-numbers170
-rw-r--r--epan/sminmpec.c42
-rw-r--r--manuf41
-rw-r--r--services4
-rw-r--r--ui/qt/wireshark_de.qmbin203720 -> 205247 bytes
-rw-r--r--ui/qt/wireshark_de.ts179
-rw-r--r--ui/qt/wireshark_en.ts172
-rw-r--r--ui/qt/wireshark_fr.qmbin139269 -> 139084 bytes
-rw-r--r--ui/qt/wireshark_fr.ts154
-rw-r--r--ui/qt/wireshark_it.qmbin244199 -> 248039 bytes
-rw-r--r--ui/qt/wireshark_it.ts220
-rw-r--r--ui/qt/wireshark_ja_JP.qmbin152329 -> 152106 bytes
-rw-r--r--ui/qt/wireshark_ja_JP.ts146
-rw-r--r--ui/qt/wireshark_pl.qmbin234116 -> 239496 bytes
-rw-r--r--ui/qt/wireshark_pl.ts228
-rw-r--r--ui/qt/wireshark_zh_CN.qmbin177042 -> 180835 bytes
-rw-r--r--ui/qt/wireshark_zh_CN.ts228
18 files changed, 1219 insertions, 449 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 6cd3145c97..2704b67524 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -997,6 +997,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x08a6, "Toshiba TEC" },
{ 0x08a8, "Andrea Electronics" },
{ 0x08a9, "CWAV Inc." },
+ { 0x08ac, "Macraigor Systems LLC" },
{ 0x08ae, "Macally (Mace Group, Inc.)" },
{ 0x08b0, "Metrohm" },
{ 0x08b4, "Sorenson Vision, Inc." },
@@ -2806,21 +2807,31 @@ static const value_string usb_vendors_vals[] = {
{ 0x1fff, "Ideofy Inc." },
{ 0x2001, "D-Link Corp." },
{ 0x2002, "DAP Technologies" },
+ { 0x2003, "detectomat" },
{ 0x200c, "Reloop" },
{ 0x2013, "PCTV Systems" },
{ 0x2019, "PLANEX" },
+ { 0x203d, "Encore Electronics Inc." },
{ 0x2040, "Hauppauge" },
{ 0x2047, "Texas Instruments" },
+ { 0x2058, "Nano River Technology" },
+ { 0x2077, "Taicang T&W Electronics Co. Ltd" },
{ 0x2080, "Barnes & Noble" },
+ { 0x2086, "SIMPASS" },
{ 0x2087, "Cando" },
{ 0x20a0, "Clay Logic" },
{ 0x20b1, "XMOS Ltd" },
{ 0x20b3, "Hanvon" },
{ 0x20b7, "Qi Hardware" },
+ { 0x20ce, "Minicircuits" },
{ 0x20df, "Simtec Electronics" },
+ { 0x20f1, "NET New Electronic Technology GmbH" },
{ 0x20f4, "TRENDnet" },
+ { 0x20f7, "XIMEA" },
+ { 0x2100, "RT Systems" },
{ 0x2101, "ActionStar" },
{ 0x2109, "VIA Labs, Inc." },
+ { 0x2113, "Softkinetic" },
{ 0x2149, "Advanced Silicon S.A." },
{ 0x2162, "Creative (?)" },
{ 0x2184, "GW Instek" },
@@ -2877,6 +2888,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x3504, "Micro Star" },
{ 0x3538, "Power Quotient International Co., Ltd" },
{ 0x3579, "DIVA" },
+ { 0x357d, "Sharkoon" },
{ 0x3636, "InVibro" },
{ 0x3838, "WEM" },
{ 0x3923, "National Instruments Corp." },
@@ -2911,6 +2923,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x5543, "UC-Logic Technology Corp." },
{ 0x5555, "Epiphan Systems Inc." },
{ 0x55aa, "OnSpec Electronic, Inc." },
+ { 0x5654, "Gotview" },
{ 0x5656, "Uni-Trend Group Limited" },
{ 0x595a, "IRTOUCHSYSTEMS Co. Ltd." },
{ 0x5986, "Acer, Inc" },
@@ -2934,6 +2947,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x7104, "CME (Central Music Co.)" },
{ 0x726c, "StackFoundry LLC" },
{ 0x734c, "TBS Technologies China" },
+ { 0x7373, "Beijing STONE Technology Co. Ltd." },
{ 0x7392, "Edimax Technology Co., Ltd" },
{ 0x8086, "Intel Corp." },
{ 0x8087, "Intel Corp." },
@@ -2951,6 +2965,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x9999, "Odeon" },
{ 0x99fa, "Grandtec" },
{ 0x9ac4, "J. Westhues" },
+ { 0x9e88, "Marvell Semiconductor, Inc." },
{ 0xa128, "AnMo Electronics Corp. / Dino-Lite (?)" },
{ 0xa168, "AnMo Electronics Corporation" },
{ 0xa600, "Asix" },
@@ -3110,6 +3125,7 @@ static const value_string usb_products_vals[] = {
{ 0x03f0011d, "Bluetooth 1.2 Interface [Broadcom BCM2035]" },
{ 0x03f00121, "HP49g+ Calculator" },
{ 0x03f00122, "HID Internet Keyboard" },
+ { 0x03f00125, "DAT72 Tape" },
{ 0x03f00139, "Barcode Scanner 4430" },
{ 0x03f00201, "ScanJet 6200c" },
{ 0x03f00202, "PhotoSmart S20" },
@@ -3209,6 +3225,7 @@ static const value_string usb_products_vals[] = {
{ 0x03f01205, "ScanJet 4500C/5550C" },
{ 0x03f01211, "OfficeJet v60xi" },
{ 0x03f01217, "LaserJet 2300L" },
+ { 0x03f01227, "Virtual CD-ROM" },
{ 0x03f01302, "PhotoSmart 370 series" },
{ 0x03f01305, "ScanJet 4570c" },
{ 0x03f01311, "OfficeJet V30" },
@@ -3648,6 +3665,7 @@ static const value_string usb_products_vals[] = {
{ 0x04025635, "M5635 Flash Card Reader" },
{ 0x04025636, "USB 2.0 Storage Device" },
{ 0x04025637, "M5637 IDE Controller" },
+ { 0x04025642, "Storage Device" },
{ 0x04025661, "M5661 MP3 player" },
{ 0x04025667, "M5667 MP3 player" },
{ 0x04025668, "Nextar MA715A-8R" },
@@ -4241,6 +4259,7 @@ static const value_string usb_products_vals[] = {
{ 0x041e4083, "Live! Cam Socialize [VF0640]" },
{ 0x041e4087, "Live! Cam Socialize HD 1080 [VF0680]" },
{ 0x041e4088, "Live! Cam Chat HD [VF0700]" },
+ { 0x041e4095, "Live! Cam Sync HD [VF0770]" },
{ 0x041e4100, "Nomad Jukebox 2" },
{ 0x041e4101, "Nomad Jukebox 3" },
{ 0x041e4102, "NOMAD MuVo^2" },
@@ -5932,6 +5951,7 @@ static const value_string usb_products_vals[] = {
{ 0x04833744, "STLINK Pseudo disk" },
{ 0x04833747, "ST Micro Connect Lite" },
{ 0x04833748, "ST-LINK/V2" },
+ { 0x0483374b, "ST-LINK/V2.1 (Nucleo-F103RB)" },
{ 0x04834810, "ISDN adapter" },
{ 0x0483481d, "BT Digital Access adapter" },
{ 0x04835000, "ST Micro/Ergenic ERG BT-002 Bluetooth Adapter" },
@@ -6023,6 +6043,7 @@ static const value_string usb_products_vals[] = {
{ 0x04991037, "PSR-E403" },
{ 0x0499103c, "MOTIF-RACK ES" },
{ 0x04991054, "S90XS Keyboard/Music Synthesizer" },
+ { 0x0499160f, "P-105" },
{ 0x04992000, "DGP-7" },
{ 0x04992001, "DGP-5" },
{ 0x04993001, "YST-MS55D USB Speaker" },
@@ -6308,11 +6329,13 @@ static const value_string usb_products_vals[] = {
{ 0x04a91728, "MX310 ser" },
{ 0x04a91729, "MX700 ser" },
{ 0x04a9172b, "MP140 ser" },
+ { 0x04a91736, "PIXMA MX320 series" },
{ 0x04a9173b, "PIXMA MP270 All-In-One Printer" },
{ 0x04a9173e, "MP560" },
{ 0x04a9173f, "Pixma MP640 Multifunction device" },
{ 0x04a91748, "Pixma MG5150" },
{ 0x04a9174d, "MX360 ser" },
+ { 0x04a9176d, "PIXMA MG2550" },
{ 0x04a91900, "CanoScan LiDE 90" },
{ 0x04a91901, "CanoScan 8800F" },
{ 0x04a91904, "CanoScan LiDE 100" },
@@ -7237,8 +7260,10 @@ static const value_string usb_products_vals[] = {
{ 0x04ca004f, "SK-9020 keyboard" },
{ 0x04ca1766, "HID Monitor Controls" },
{ 0x04ca2004, "Bluetooth 4.0 [Broadcom BCM20702A0]" },
+ { 0x04ca2006, "Broadcom BCM43142A0 Bluetooth Device" },
{ 0x04ca300b, "Atheros AR3012 Bluetooth" },
{ 0x04ca300d, "Atheros AR3012 Bluetooth" },
+ { 0x04ca300f, "Atheros AR3012 Bluetooth" },
{ 0x04ca7025, "HP HD Webcam" },
{ 0x04ca9304, "Hub" },
{ 0x04caf01c, "TT1280DA DVB-T TV Tuner" },
@@ -7410,6 +7435,7 @@ static const value_string usb_products_vals[] = {
{ 0x04d8fbbb, "DiscFerret Magnetic Disc Analyser (active mode)" },
{ 0x04d8fc1e, "Bachrus Speedometer Interface" },
{ 0x04d8fc92, "Open Bench Logic Sniffer" },
+ { 0x04d8ffee, "Devantech USB-ISS" },
{ 0x04d8ffef, "PICoPLC [APStech]" },
{ 0x04d90022, "Portable Keyboard" },
{ 0x04d9048e, "Optical Mouse" },
@@ -7761,6 +7787,7 @@ static const value_string usb_products_vals[] = {
{ 0x04e860b3, "M2 Portable Hard Drive" },
{ 0x04e860c4, "M2 Portable Hard Drive USB 3.0" },
{ 0x04e86124, "D3 Station External Hard Drive" },
+ { 0x04e86125, "D3 Station External Hard Drive" },
{ 0x04e861b6, "M3 Portable Hard Drive 1TB" },
{ 0x04e86601, "Mobile Phone" },
{ 0x04e86602, "Galaxy" },
@@ -8133,6 +8160,7 @@ static const value_string usb_products_vals[] = {
{ 0x04f90223, "DCP-365CN" },
{ 0x04f90248, "DCP-7055 scanner/printer" },
{ 0x04f90273, "DCP-7057 scanner/printer" },
+ { 0x04f9029f, "MFC-9325CW Multifunction Printer" },
{ 0x04f902b3, "MFC J4510DW" },
{ 0x04f91000, "Printer" },
{ 0x04f91002, "Printer" },
@@ -8362,7 +8390,7 @@ static const value_string usb_products_vals[] = {
{ 0x05287568, "TV Wonder, Edition (FQ)" },
{ 0x05287569, "Live! Pro (A)" },
{ 0x0528756a, "Live! Pro Audio (O)" },
- { 0x05290001, "HASP v0.06" },
+ { 0x05290001, "HASP copy protection dongle" },
{ 0x0529030b, "eToken R1 v3.1.3.x" },
{ 0x05290313, "eToken R1 v3.2.3.x" },
{ 0x0529031b, "eToken R1 v3.3.3.x" },
@@ -8668,6 +8696,7 @@ static const value_string usb_products_vals[] = {
{ 0x05500005, "InkJet Color Printer" },
{ 0x0550000b, "Workcentre 24" },
{ 0x0550014e, "CM215b Printer" },
+ { 0x05500165, "DocuPrint M215b" },
{ 0x05530001, "TerraCAM" },
{ 0x05530002, "CPiA Webcam" },
{ 0x05530100, "STV0672 Camera" },
@@ -9021,6 +9050,7 @@ static const value_string usb_products_vals[] = {
{ 0x057c8402, "Fritz!WLAN N 2.4 [Atheros AR9001U]" },
{ 0x057c8403, "Fritz!WLAN N v2 [Atheros AR9271]" },
{ 0x057c84ff, "AVM Fritz!WLAN USB N (in CD-ROM-mode)" },
+ { 0x057c8501, "FRITZ WLAN N v2 [RT5572/rt2870.bin]" },
{ 0x057e0305, "Broadcom BCM2045A Bluetooth Radio [Nintendo Wii]" },
{ 0x057e0306, "Wii Remote Controller RVL-003" },
{ 0x057f6238, "USB StrikePad" },
@@ -9441,6 +9471,7 @@ static const value_string usb_products_vals[] = {
{ 0x059f1049, "rikiki Harddrive" },
{ 0x059f1052, "P'9220 Mobile Drive" },
{ 0x059f1064, "Rugged 16 and 32 GB" },
+ { 0x059f106e, "Porsche Design Desktop Drive" },
{ 0x059fa601, "HardDrive" },
{ 0x059fa602, "CD R/W" },
{ 0x05a38388, "Marvell 88W8388 802.11a/b/g WLAN" },
@@ -9701,6 +9732,7 @@ static const value_string usb_products_vals[] = {
{ 0x05c66000, "Siemens SG75" },
{ 0x05c66503, "AnyData APE-540H" },
{ 0x05c66613, "Onda H600/N501HS ZTE MF330" },
+ { 0x05c66764, "A0001 Phone [OnePlus One]" },
{ 0x05c69000, "SIMCom SIM5218 modem" },
{ 0x05c69001, "Gobi Wireless Modem" },
{ 0x05c69002, "Gobi Wireless Modem" },
@@ -10239,6 +10271,7 @@ static const value_string usb_products_vals[] = {
{ 0x064703ec, "Inspectrum 256x1024 B VIS Spectrograph" },
{ 0x064b0165, "Blackfin 535 [ADZS HPUSB ICE]" },
{ 0x064e2100, "Sony Visual Communication Camera" },
+ { 0x064e9700, "Asus Integrated Webcam" },
{ 0x064ea100, "Acer OrbiCam" },
{ 0x064ea101, "Acer CrystalEye Webcam" },
{ 0x064ea102, "Acer/Lenovo Webcam [CN0316]" },
@@ -11255,6 +11288,7 @@ static const value_string usb_products_vals[] = {
{ 0x0781556d, "Memory Vault" },
{ 0x07815571, "Cruzer Fit" },
{ 0x07815576, "Cruzer Facet" },
+ { 0x0781557d, "Cruzer Force (64GB)" },
{ 0x07815580, "SDCZ80 Flash Drive" },
{ 0x07815581, "Ultra" },
{ 0x07815e10, "Encrypted" },
@@ -12075,6 +12109,7 @@ static const value_string usb_products_vals[] = {
{ 0x08a90013, "USBee AX-Plus" },
{ 0x08a90014, "USBee AX-Pro" },
{ 0x08a90015, "USBee DX" },
+ { 0x08ac2024, "usbWiggler" },
{ 0x08b00006, "814 Sample Processor" },
{ 0x08b00015, "857 Titrando" },
{ 0x08b0001a, "852 Titrando" },
@@ -12318,6 +12353,8 @@ static const value_string usb_products_vals[] = {
{ 0x09010002, "SigmaDrive Adapter (TPP)" },
{ 0x090801f4, "SIMATIC NET CP 5711" },
{ 0x090801fe, "SIMATIC NET PC Adapter A2" },
+ { 0x090804b1, "MediSET" },
+ { 0x090804b2, "NC interface" },
{ 0x09082701, "ShenZhen SANZHAI Technology Co.,Ltd Spy Pen VGA" },
{ 0x090a1001, "T33520 Flash Card Controller" },
{ 0x090a1100, "Comotron C3310 MP3 player" },
@@ -12585,6 +12622,7 @@ static const value_string usb_products_vals[] = {
{ 0x09511606, "Eee PC 701 SD Card Reader [ENE UB6225]" },
{ 0x09511607, "DataTraveler 100" },
{ 0x0951160d, "DataTraveler Vault Privacy" },
+ { 0x0951160e, "DT110P/1GB Capless" },
{ 0x09511613, "DataTraveler DT101C Flash Drive" },
{ 0x09511616, "DataTraveler Locker 4GB" },
{ 0x0951161a, "Dell HyperVisor internal flash drive" },
@@ -12881,6 +12919,7 @@ static const value_string usb_products_vals[] = {
{ 0x0a5c2151, "Bluetooth" },
{ 0x0a5c2154, "BCM92046DG-CL1ROM Bluetooth 2.1 UHE Dongle" },
{ 0x0a5c216c, "BCM43142A0 Bluetooth Device" },
+ { 0x0a5c216f, "BCM20702A0 Bluetooth" },
{ 0x0a5c217d, "HP Bluethunder" },
{ 0x0a5c217f, "BCM2045B (BDC-2.1)" },
{ 0x0a5c2198, "Bluetooth 3.0 Device" },
@@ -12906,6 +12945,7 @@ static const value_string usb_products_vals[] = {
{ 0x0a5c5801, "BCM5880 Secure Applications Processor with fingerprint swipe sensor" },
{ 0x0a5c5802, "BCM5880 Secure Applications Processor with fingerprint touch sensor" },
{ 0x0a5c5803, "BCM5880 Secure Applications Processor with secure keyboard" },
+ { 0x0a5c5804, "BCM5880 Secure Applications Processor with fingerprint swipe sensor" },
{ 0x0a5c6300, "Pirelli Remote NDIS Device" },
{ 0x0a5cbd11, "TiVo AG0100 802.11bg Wireless Adapter [Broadcom BCM4320]" },
{ 0x0a5cbd13, "BCM4323 802.11abgn Wireless Adapter" },
@@ -14055,6 +14095,7 @@ static const value_string usb_products_vals[] = {
{ 0x0ce91212, "PicoScope 4000 series PC Oscilloscope" },
{ 0x0cf26220, "SD Card Reader (SG361)" },
{ 0x0cf26225, "SD card reader (UB6225)" },
+ { 0x0cf26230, "SD Card Reader (UB623X)" },
{ 0x0cf26250, "SD card reader (UB6250)" },
{ 0x0cf30001, "AR5523" },
{ 0x0cf30002, "AR5523 (no firmware)" },
@@ -14132,6 +14173,7 @@ static const value_string usb_products_vals[] = {
{ 0x0d5e2346, "BT Digital Access adapter" },
{ 0x0d620003, "Smartcard Reader" },
{ 0x0d620004, "Keyboard" },
+ { 0x0d62001b, "Keyboard" },
{ 0x0d62001c, "Benq X120 Internet Keyboard Pro" },
{ 0x0d620306, "M530 Mouse" },
{ 0x0d620800, "Magic Wheel" },
@@ -14189,6 +14231,7 @@ static const value_string usb_products_vals[] = {
{ 0x0d8c0107, "CM108 Audio Controller" },
{ 0x0d8c010f, "CM108 Audio Controller" },
{ 0x0d8c0115, "CM108 Audio Controller" },
+ { 0x0d8c0139, "Multimedia Headset [Gigaware by Ignition L.P.]" },
{ 0x0d8c013c, "CM108 Audio Controller" },
{ 0x0d8c0201, "CM6501" },
{ 0x0d8c5000, "Mass Storage Controller" },
@@ -14299,6 +14342,7 @@ static const value_string usb_products_vals[] = {
{ 0x0db50139, "LSR116 CDC" },
{ 0x0db5013a, "LSR116 Keyboard" },
{ 0x0db5013b, "LSR116 HID" },
+ { 0x0db50160, "NFC and Smartcard Module (NSM)" },
{ 0x0db70002, "Goldpfeil P-LAN" },
{ 0x0dba1000, "Mbox 1 [Mbox]" },
{ 0x0dba3000, "Mbox 2" },
@@ -14429,6 +14473,7 @@ static const value_string usb_products_vals[] = {
{ 0x0e0f0006, "Virtual Keyboard" },
{ 0x0e0ff80a, "Smoker FX2" },
{ 0x0e200101, "NoteTaker" },
+ { 0x0e200200, "Seiko Instruments InkLink Handwriting System" },
{ 0x0e210300, "iAudio CW200" },
{ 0x0e210400, "MP3 Player" },
{ 0x0e210500, "iAudio M3" },
@@ -14645,6 +14690,7 @@ static const value_string usb_products_vals[] = {
{ 0x0f300111, "Colour Rumble Pad" },
{ 0x0f300208, "Xbox & PC Gamepad" },
{ 0x0f390876, "Keyboard [87 Francium Pro]" },
+ { 0x0f391086, "DK2108SZ Keyboard [Ducky Zero]" },
{ 0x0f3d0112, "CDMA 1xEVDO PC Card, PC 5220" },
{ 0x0f44ef11, "Patriot (firmware not loaded)" },
{ 0x0f44ef12, "Patriot" },
@@ -14908,11 +14954,13 @@ static const value_string usb_products_vals[] = {
{ 0x100461f9, "LG Electronics Inc. V909 G-Slate" },
{ 0x100461fc, "Optimus 3" },
{ 0x100461fe, "Optimus Android Phone [USB tethering mode]" },
- { 0x10046300, "Optimus Android Phone" },
+ { 0x10046300, "G2/Optimus Android Phone" },
{ 0x1004631c, "LG Electronics Inc. LG-E617G/P700" },
{ 0x1004631d, "Optimus Android Phone (Camera/PTP Mode)" },
{ 0x1004631e, "G2/Optimus Android Phone [Camera/PTP mode]" },
{ 0x1004631f, "Optimus Android Phone (Charge Mode)" },
+ { 0x1004633e, "G2 Android Phone [MTP mode]" },
+ { 0x10046344, "G2 Android Phone [tethering mode]" },
{ 0x10046356, "Optimus Android Phone [Virtual CD mode]" },
{ 0x10046800, "CDMA Modem" },
{ 0x10047000, "LG LDP-7024D(LD)USB" },
@@ -16125,7 +16173,7 @@ static const value_string usb_products_vals[] = {
{ 0x152d2551, "JMS551 SATA 3Gb/s bridge" },
{ 0x152d2566, "JMS566 SATA 3Gb/s bridge" },
{ 0x152d3562, "JMS567 SATA 6.0Gb/s bridge" },
- { 0x152d3569, "ATA/ATAPI Bridge [AdPlus SuperVer]" },
+ { 0x152d3569, "JMS566 SATA 3Gb/s bridge" },
{ 0x152e2507, "PL-2507 IDE Controller" },
{ 0x152ee001, "GSA-5120D DVD-RW" },
{ 0x15320001, "RZ01-020300 Optical Mouse [Diamondback]" },
@@ -16428,6 +16476,7 @@ static const value_string usb_products_vals[] = {
{ 0x16860045, "H4 Digital Recorder" },
{ 0x16875289, "FlashDisk" },
{ 0x16876211, "FlashDisk" },
+ { 0x16876213, "FlashDisk" },
{ 0x1689fd00, "Onza Tournament Edition controller" },
{ 0x168c0001, "AR5523" },
{ 0x168c0002, "AR5523 (no firmware)" },
@@ -17186,13 +17235,20 @@ static const value_string usb_products_vals[] = {
{ 0x1bc71010, "DE910-DUAL" },
{ 0x1bc71011, "CE910-DUAL" },
{ 0x1bc71200, "LE920" },
+ { 0x1bcf0005, "Optical Mouse" },
{ 0x1bcf0007, "Optical Mouse" },
{ 0x1bcf053a, "Targa Silvercrest OMC807-C optische Funkmaus" },
{ 0x1bcf05c5, "SPRF2413A [2.4GHz Wireless Keyboard/Mouse Receiver]" },
{ 0x1bcf05cf, "Micro keyboard & mouse receiver" },
{ 0x1bcf0c31, "SPIF30x Serial-ATA bridge" },
+ { 0x1bcf2880, "Dell HD Webcam" },
{ 0x1bcf2885, "ASUS Webcam" },
{ 0x1bcf2888, "HP Universal Camera" },
+ { 0x1bcf28a2, "Dell Integrated Webcam" },
+ { 0x1bcf28a6, "DELL XPS Integrated Webcam" },
+ { 0x1bcf28ae, "Laptop Integrated Webcam HD" },
+ { 0x1bcf28bd, "Dell Integrated HD Webcam" },
+ { 0x1bcf2985, "Laptop Integrated Webcam HD" },
{ 0x1bcf2b83, "Laptop Integrated Webcam FHD" },
{ 0x1bdcfabf, "Slacker Inc. Slacker Portable Media Player" },
{ 0x1bfd1268, "Touch Screen" },
@@ -17354,6 +17410,7 @@ static const value_string usb_products_vals[] = {
{ 0x1f480627, "Data capturing system" },
{ 0x1f480628, "Data capturing and control module" },
{ 0x1f4db803, "Lifeview LV5TDLX DVB-T [RTL2832U]" },
+ { 0x1f4dd220, "Geniatech T220 DVB-T2 TV Stick" },
{ 0x1f6f0023, "Jawbone Jambox" },
{ 0x1f6f8000, "Jawbone Jambox - Updating" },
{ 0x1f750888, "IS888 SATA Storage Controller" },
@@ -17430,6 +17487,7 @@ static const value_string usb_products_vals[] = {
{ 0x2001f116, "Formosa 2" },
{ 0x2001f117, "Formosa 3" },
{ 0x2001f118, "Formosa 4" },
+ { 0x2003ea61, "dc3500" },
{ 0x200c100b, "Play audio soundcard" },
{ 0x20130245, "PCTV 73ESE" },
{ 0x20130246, "PCTV 74E" },
@@ -17459,6 +17517,7 @@ static const value_string usb_products_vals[] = {
{ 0x2019ed16, "GW-USMicroN2W 802.11bgn Wireless Adapter [Realtek RTL8188SU]" },
{ 0x2019ed17, "GW-USValue-EZ 802.11n Wireless Adapter [Realtek RTL8188CUS]" },
{ 0x2019ed18, "GW-USHyper300 / GW-USH300N 802.11bgn Wireless Adapter [Realtek RTL8191SU]" },
+ { 0x203d1480, "ENUWI-N3 [802.11n Wireless N150 Adapter]" },
{ 0x20400c80, "Windham" },
{ 0x20400c90, "Windham" },
{ 0x20401700, "CataMount" },
@@ -17502,6 +17561,8 @@ static const value_string usb_products_vals[] = {
{ 0x20470200, "MSP430 USB HID Bootstrap Loader" },
{ 0x20470855, "Invensense Embedded MotionApp HID Sensor" },
{ 0x20470964, "Inventio Software MSP430" },
+ { 0x20582058, "ViperBoard I2C, SPI, GPIO interface" },
+ { 0x20779002, "W1M100 HSPA/WCDMA Module" },
{ 0x20800001, "nook" },
{ 0x20800002, "NOOKcolor" },
{ 0x20800003, "NOOK Simple Touch" },
@@ -17523,8 +17584,18 @@ static const value_string usb_products_vals[] = {
{ 0x20b71db6, "IDBG in normal mode" },
{ 0x20b7c25b, "C2 Dongle" },
{ 0x20b7cb72, "ben-wpan, cntr" },
+ { 0x20ce0012, "RF Sythesizer 250-4200MHz model SSG-4000LH" },
+ { 0x20ce0021, "RF Switch Matrix" },
+ { 0x20ce0022, "I/O Controller" },
{ 0x20df0001, "Entropy Key [UDEKEY01]" },
+ { 0x20f10101, "iCube3 Camera" },
{ 0x20f4648b, "TEW-648UBM 802.11n 150Mbps Micro Wireless N Adapter [Realtek RTL8188CUS]" },
+ { 0x20f7a003, "Subminiature 5Mpix B/W Camera, MU9PM-MH" },
+ { 0x21009e52, "Yaesu VX-7" },
+ { 0x21009e54, "CT29B Radio Cable" },
+ { 0x21009e57, "RTS01 Radio Cable" },
+ { 0x21009e5d, "K4Y Radio Cable" },
+ { 0x21009e5f, "FT232RL [RTS05 Serial Cable]" },
{ 0x21010201, "SIIG 4-to-2 Printer Switch" },
{ 0x21090700, "VL700 SATA 3Gb/s bridge" },
{ 0x21090701, "VL701 SATA 3Gb/s bridge" },
@@ -17535,6 +17606,9 @@ static const value_string usb_products_vals[] = {
{ 0x21092812, "VL812 Hub" },
{ 0x21093431, "Hub" },
{ 0x21098110, "Hub" },
+ { 0x21130137, "DepthSense 311 (3D)" },
+ { 0x21130145, "DepthSense 325" },
+ { 0x21138000, "DepthSense 311 (Color)" },
{ 0x2149211b, "Touchscreen Controller" },
{ 0x21492703, "TS58xxA/TC56xxA [CoolTouch]" },
{ 0x21622031, "Network Blaster Wireless Adapter" },
@@ -17872,6 +17946,7 @@ static const value_string usb_products_vals[] = {
{ 0x35380042, "Cool Drive U339 Flash Disk" },
{ 0x35380054, "Flash Drive (2GB)" },
{ 0x35796901, "Media Reader" },
+ { 0x357d7788, "QuickPort XT" },
{ 0x38380001, "5-in-1 Card Reader" },
{ 0x392312c0, "DAQPad-6020E" },
{ 0x392312d0, "DAQPad-6507" },
@@ -18119,6 +18194,7 @@ static const value_string usb_products_vals[] = {
{ 0x55aab200, "Compact Flash Reader" },
{ 0x55aab204, "MMC/ SD Reader" },
{ 0x55aab207, "Memory Stick Reader" },
+ { 0x5654ca42, "MasterHD 3" },
{ 0x56560832, "UT2000/UT3000 Digital Storage Oscilloscope" },
{ 0x595a0001, "Touchscreen" },
{ 0x59860100, "Orbicam" },
@@ -18189,6 +18265,7 @@ static const value_string usb_products_vals[] = {
{ 0x726c2149, "EntropyKing Random Number Generator" },
{ 0x734c5920, "Q-Box II DVB-S2 HD" },
{ 0x734c5928, "Q-Box II DVB-S2 HD" },
+ { 0x73735740, "Intelligent TFT-LCD Module" },
{ 0x73927711, "EW-7711UTn nLite Wireless Adapter [Ralink RT2870]" },
{ 0x73927717, "EW-7717UN 802.11n Wireless Adapter [Ralink RT2870]" },
{ 0x73927718, "EW-7718UN 802.11n Wireless Adapter [Ralink RT2870]" },
@@ -18267,6 +18344,7 @@ static const value_string usb_products_vals[] = {
{ 0x99990001, "JAF Mobile Phone Flasher Interface" },
{ 0x99fa8988, "V.cap Camera Device" },
{ 0x9ac44b8f, "ProxMark-3 RFID Instrument" },
+ { 0x9e889e8f, "Plug Computer Basic [SheevaPlug]" },
{ 0xa1280610, "Dino-Lite Digital Microscope (SN9C201 + HV7131R)" },
{ 0xa1280611, "Dino-Lite Digital Microscope (SN9C201 + HV7131R)" },
{ 0xa1280612, "Dino-Lite Digital Microscope (SN9C120 + HV7131R)" },
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 5c2f53f83a..88dd165b0d 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2015-06-05)
+(last updated 2015-06-12)
SMI Network Management Private Enterprise Codes:
@@ -45770,9 +45770,9 @@ Decimal
Jose Gomez Garcia
jgomez&altadis.com
11454
- Avenci SA
+ Avencis SA
David Wonner
- david.wonner&avenci.com
+ david.wonner&avencis.net
11455
Aviation Management Technologies GmbH
Röther Armin
@@ -107802,9 +107802,9 @@ Institute
Alex Masidlover
alex.masidlover&zednax.com
27057
- Elektrobit Automotive GmbH (former 3SOFT GmbH)
- Thomas Hofmann
- Thomas.Hofmann&Elektrobit.com
+ Elektrobit Automotive GmbH (formerly '3SOFT GmbH')
+ Markus Roesch
+ Markus.Roesch&Elektrobit.com
27058
Ventelo Norge AS
Dag Stenstad
@@ -135728,7 +135728,7 @@ Decentralization / Helenic Public Administra
lebars&benchmark.fr
34037
European Nazarene College
- Rich Walker
+ J. Alan Schrock
itdirector&eunc.edu
34038
USGN
@@ -160629,8 +160629,8 @@ Decentralization / Helenic Public Administra
r.janssen&keensystems.eu
40262
Airbnb, Inc.
- Morten Kuehl
- morten&airbnb.com
+ Will Willis
+ will.willis&airbnb.com
40263
Bank of Latvia
Arnis Gigulis
@@ -183475,6 +183475,158 @@ Decentralization / Helenic Public Administra
Playground Global
Dan Morrill
morrildl&playground.global
+45974
+ SPINNER GmbH
+ Michael Lege
+ m.lege&spinner-group.com
+45975
+ Securities Finance Trust Company
+ David Griswold
+ dgriswold&eseclending.com
+45976
+ Intema Comunicaciones
+ Agustín Ivorra
+ aivorra&intema.biz
+45977
+ Platform.sh
+ Damien Tournoud
+ damien&platform.sh
+45978
+ Vision 95 Ltd.
+ Zoltan Kakuk
+ zoltan.kakuk&vision95.hu
+45979
+ Intevac, Inc.
+ Brenda Thrasher
+ blthrasher&intevac.com
+45980
+ S.Network Communications Ltd.
+ Denis Ignatov
+ denis&snc.ru
+45981
+ DroidInActu
+ Andy Aspell-Clark
+ andyaspellclark&gmail.com
+45982
+ Goletas
+ Maksim Goleta
+ admin&goletas.com
+45983
+ Airbus DS Limited - MIPN
+ Andy Aspell-Clark
+ Andy.Aspell-Clark&airbus.com
+45984
+ OOO Stels
+ Vladimir Gorpenko
+ vgo&stels.ru
+45985
+ CyberStream Ltd
+ Nikos Lykouropoulos
+ nikos.lykouropoulos&cyberstream.gr
+45986
+ Kramer Electronics Ltd.
+ Nahum Aharon
+ naharon&kramerel.com
+45987
+ Rete telematica del CNR di Pisa
+ Alessandro Mancini
+ alessandro.mancini&iit.cnr.it
+45988
+ SKYCOM
+ Hyeok-Hee Lee
+ hhlee&skycom.ne.kr
+45989
+ SKYCOM
+ Hyeok-Hee Lee
+ hhlee&skycom.ne.kr
+45990
+ Brueckner-Werke KG
+ Jan Beers
+ edv&bwhh.de
+45991
+ KLENK HOLZ AG
+ Winfried Hofmann
+ edv&klenk.de
+45992
+ Grabeuh Corp.
+ Javelini
+ javelini-xwyn9p&yopmail.com
+45993
+ ITSMOS
+ Nestor Charczuk
+ nestor.charczuk&itsmos.com
+45994
+ Prink s.r.l
+ Paolo De Vito
+ paolo&prink.it
+45995
+ Posteo e.K.
+ Patrik Löhr
+ iana&posteo.de
+45996
+ Chora A/S
+ Johnny Vestergaard
+ chora&chora.dk
+45997
+ Colorado Center for Gynecologic Oncology
+ Kelly Sullivan
+ kelly&ccgynonc.com
+45998
+ JENSEN-GROUP
+ Fabian Lutz
+ it-ch&jensen-group.com
+45999
+ The Dysongang
+ Jon Dyson
+ jon&thedysongang.co.uk
+46000
+ Third Light Ltd.
+ Dominic Benson
+ dominic.benson&thirdlight.com
+46001
+ Vektra Advanced Engineering
+ Evan Phoenix
+ evan&vektra.com
+46002
+ 6Harmonics Inc.
+ Yaoyang Wang
+ yaoyang.wang&6wilink.com
+46003
+ NAUTILUS INFOTECH Co., Ltd.
+ Cheng Chao
+ cheng.chao&nautilus.com.tw
+46004
+ 50Hertz Transmission GmbH
+ Thomas Naumann
+ thomas.naumann&50hertz.com
+46005
+ SAG Informatik AG
+ Anthony Uk
+ sysadmin&sag-ag.ch
+46006
+ Greetz BV
+ Jan van der Veen
+ jan.van.der.veen&greetz.com
+46007
+ Augustinum gGmbH
+ Thorsten Mueller
+ t.mueller&augustinum.de
+46008
+ Codan A/S
+ Alan Burton-Woods
+ abw&codan.dk
+46009
+ Advanced Hematology & Oncology Group of PR
+ Maria Rincon
+ advonco&gmail.com
+46010
+ Westfalen Weser Netz GmbH
+ Rudolf Hessel
+ rudolf.hessel&ww-energie.com
+46011
+ cloudVM Inc.
+ Matthew Gamble
+ mgamble&cloudvm.io
End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index d60283ded6..ee072c1761 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -11474,7 +11474,7 @@ const value_string sminmpec_values[] = {
{ 11451, "SINBON ELECTRONIC CO., LTD" },
{ 11452, "Allegient Systems" },
{ 11453, "Altadis" },
- { 11454, "Avenci SA" },
+ { 11454, "Avencis SA" },
{ 11455, "Aviation Management Technologies GmbH" },
{ 11456, "CalvaEDI S.A." },
{ 11457, "Cimcor, Inc." },
@@ -27077,7 +27077,7 @@ const value_string sminmpec_values[] = {
{ 27054, "Oneida Baptist Institute" },
{ 27055, "ZANDER LLC." },
{ 27056, "Zednax Limited" },
- { 27057, "Elektrobit Automotive GmbH (former 3SOFT GmbH)" },
+ { 27057, "Elektrobit Automotive GmbH (formerly '3SOFT GmbH')" },
{ 27058, "Ventelo Norge AS" },
{ 27059, "SmartSol d.o.o." },
{ 27060, "interactive instruments" },
@@ -45994,6 +45994,44 @@ const value_string sminmpec_values[] = {
{ 45971, "CJSC \"Transinfoset\"" },
{ 45972, "Baptist School of Health Professions" },
{ 45973, "Playground Global" },
+ { 45974, "SPINNER GmbH" },
+ { 45975, "Securities Finance Trust Company" },
+ { 45976, "Intema Comunicaciones" },
+ { 45977, "Platform.sh" },
+ { 45978, "Vision 95 Ltd." },
+ { 45979, "Intevac, Inc." },
+ { 45980, "S.Network Communications Ltd." },
+ { 45981, "DroidInActu" },
+ { 45982, "Goletas" },
+ { 45983, "Airbus DS Limited - MIPN" },
+ { 45984, "OOO Stels" },
+ { 45985, "CyberStream Ltd" },
+ { 45986, "Kramer Electronics Ltd." },
+ { 45987, "Rete telematica del CNR di Pisa" },
+ { 45988, "SKYCOM" },
+ { 45989, "SKYCOM" },
+ { 45990, "Brueckner-Werke KG" },
+ { 45991, "KLENK HOLZ AG" },
+ { 45992, "Grabeuh Corp." },
+ { 45993, "ITSMOS" },
+ { 45994, "Prink s.r.l" },
+ { 45995, "Posteo e.K." },
+ { 45996, "Chora A/S" },
+ { 45997, "Colorado Center for Gynecologic Oncology" },
+ { 45998, "JENSEN-GROUP" },
+ { 45999, "The Dysongang" },
+ { 46000, "Third Light Ltd." },
+ { 46001, "Vektra Advanced Engineering" },
+ { 46002, "6Harmonics Inc." },
+ { 46003, "NAUTILUS INFOTECH Co., Ltd." },
+ { 46004, "50Hertz Transmission GmbH" },
+ { 46005, "SAG Informatik AG" },
+ { 46006, "Greetz BV" },
+ { 46007, "Augustinum gGmbH" },
+ { 46008, "Codan A/S" },
+ { 46009, "Advanced Hematology & Oncology Group of PR" },
+ { 46010, "Westfalen Weser Netz GmbH" },
+ { 46011, "cloudVM Inc." },
{ 0, NULL}
};
diff --git a/manuf b/manuf
index 589040a624..cc9c1e1125 100644
--- a/manuf
+++ b/manuf
@@ -1153,7 +1153,7 @@
00:04:4C Jenoptik
00:04:4D Cisco # CISCO SYSTEMS, INC.
00:04:4E Cisco # CISCO SYSTEMS, INC.
-00:04:4F Leukhard # Leukhardt Systemelektronik GmbH
+00:04:4F Schubert # Schubert System Elektronik Gmbh
00:04:50 DmdCompu # DMD Computers SRL
00:04:51 Medrad # Medrad, Inc.
00:04:52 Rocketlo # RocketLogix, Inc.
@@ -9517,7 +9517,7 @@
00:24:55 MulogicB # MuLogic BV
00:24:56 2wire
00:24:58 PaBastio # PA Bastion CC
-00:24:59 AbbStotz # ABB STOTZ-KONTAKT GmbH
+00:24:59 AbbAutom # ABB Automation products GmbH
00:24:5A NanjingP # Nanjing Panda Electronics Company Limited
00:24:5B RaidonTe # RAIDON TECHNOLOGY, INC.
00:24:5C Design-C # Design-Com Technologies Pty. Ltd.
@@ -16845,7 +16845,7 @@
00:E0:59 Controll # CONTROLLED ENVIRONMENTS, LTD.
00:E0:5A GaleaNet # GALEA NETWORK SECURITY
00:E0:5B WestEnd # WEST END SYSTEMS CORP.
-00:E0:5C Matsushi # MATSUSHITA KOTOBUKI ELECTRONICS INDUSTRIES, LTD.
+00:E0:5C Panasoni # Panasonic Healthcare Co., Ltd.
00:E0:5D Unitec # UNITEC CO., LTD.
00:E0:5E JapanAvi # JAPAN AVIATION ELECTRONICS INDUSTRY, LTD.
00:E0:5F E-Net # e-Net, Inc.
@@ -17391,6 +17391,7 @@
08:95:2A Technico # Technicolor CH USA Inc
08:96:D7 Avm # AVM GmbH
08:97:58 Shenzhen # Shenzhen Strong Rising Electronics Co.,Ltd DongGuan Subsidiary
+08:9B:4B IkuaiNet # iKuai Networks
08:9E:01 QuantaCo # QUANTA COMPUTER INC.
08:9F:97 LeroyAut # LEROY AUTOMATION
08:A1:2B Shenzhen # ShenZhen EZL Technology Co., Ltd
@@ -17716,6 +17717,7 @@
14:13:30 Anakreon # Anakreon UK LLP
14:14:4B FujianSt # FUJIAN STAR-NET COMMUNICATION CO.,LTD
14:15:7C TokyoCos # TOKYO COSMOS ELECTRIC CO.,LTD.
+14:18:77 Dell # Dell Inc
14:1A:51 Treetech # Treetech Sistemas Digitais
14:1A:A3 Motorola # Motorola Mobility LLC
14:1B:BD Volex # Volex Inc.
@@ -18576,6 +18578,7 @@
30:19:66 SamsungE # Samsung Electronics Co.,Ltd
30:1A:28 MakoNetw # Mako Networks Ltd
30:21:5B Shenzhen # Shenzhen Ostar Display Electronic Co.,Ltd
+30:29:BE Shanghai # Shanghai MRDcom Co.,Ltd
30:2D:E8 JdaLlcJd # JDA, LLC (JDA Systems)
30:32:94 W-Ie-Ne- # W-IE-NE-R Plein & Baus GmbH
30:32:D4 Hanilstm # Hanilstm Co., Ltd.
@@ -18810,7 +18813,8 @@
34:FC:6F Alcea
34:FC:EF LgElectr # LG Electronics
38:01:95 SamsungE # Samsung Electronics Co.,Ltd
-38:01:97 ToshibaS # Toshiba Samsung Storage Technolgoy Korea Corporation
+38:01:97 TsstGlob # TSST Global,Inc
+38:05:46 FoctekPh # Foctek Photonics, Inc.
38:06:B4 ADC # A.D.C. GmbH
38:08:FD Silca # Silca Spa
38:09:A4 FireflyI # Firefly Integrations
@@ -19083,6 +19087,7 @@
40:33:6C GodrejBo # Godrej & Boyce Mfg. co. ltd
40:37:AD MacroIma # Macro Image Technology, Inc.
40:3C:FC Apple
+40:3D:EC Humax # HUMAX Co., Ltd.
40:40:22 Ziv
40:40:6B Icomera
40:45:DA Spreadtr # Spreadtrum Communications (Shanghai) Co., Ltd.
@@ -20431,6 +20436,7 @@
5C:6F:4F SASistel # S.A. SISTEL
5C:77:57 Haivisio # Haivision Network Video
5C:7D:5E HuaweiTe # Huawei Technologies Co., Ltd
+5C:83:8F Cisco # Cisco Systems
5C:84:86 Brightso # Brightsource Industries Israel LTD
5C:86:4A SecretLa # Secret Labs LLC
5C:87:78 Cybertel # Cybertelbridge co.,ltd
@@ -20465,6 +20471,7 @@
5C:CA:32 Theben # Theben AG
5C:CC:FF Techrout # Techroutes Network Pvt Ltd
5C:CE:AD Cdyne # CDYNE Corporation
+5C:CF:7F Espressi # Espressif Inc.
5C:D1:35 XtremePo # Xtreme Power Systems
5C:D2:E4 IntelCor # Intel Corporate
5C:D4:1B UczoonTe # UCZOON Technology Co., LTD
@@ -20715,6 +20722,7 @@
64:99:5D Lge
64:99:68 Elentec
64:99:A0 Elektron # AG Elektronik AB
+64:9A:12 P2Mobile # P2 Mobile Technologies Limited
64:9A:BE Apple
64:9B:24 VTechnol # V Technology Co., Ltd.
64:9C:81 Qualcomm # Qualcomm iSkoot, Inc.
@@ -20782,6 +20790,7 @@
68:09:27 Apple
68:0A:D7 Yancheng # Yancheng Kecheng Optoelectronic Technology Co., Ltd
68:12:2D SpecialI # Special Instrument Development Co., Ltd.
+68:12:95 LupineLi # Lupine Lighting Systems GmbH
68:15:90 Sagemcom # SAGEMCOM SAS
68:15:D3 ZakladyE # Zaklady Elektroniki i Mechaniki Precyzyjnej R&G S.A.
68:16:05 AndElect # Systems And Electronic Development FZCO
@@ -20808,6 +20817,7 @@
68:51:B7 Powerclo # PowerCloud Systems, Inc.
68:54:ED Alcatel- # Alcatel-Lucent - Nuage
68:54:F5 Enlighte # enLighted Inc
+68:58:C5 ZfTrwAut # ZF TRW Automotive
68:59:7F AlcatelL # Alcatel Lucent
68:5B:35 Apple
68:5B:36 Powertec # POWERTECH INDUSTRIAL CO., LTD.
@@ -21026,6 +21036,7 @@
70:0F:EC Poindus # Poindus Systems Corp.
70:10:5C Cisco
70:11:24 Apple
+70:11:AE MusicLif # Music Life LTD
70:14:04 Liabilit # Limited Liability Company
70:14:A6 Apple # Apple, Inc.
70:18:8B HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
@@ -21183,6 +21194,7 @@
70:B3:D5:13:A0:00/36 Deuta-We # DEUTA-WERKE GmbH
70:B3:D5:13:F0:00/36 Farmobil # Farmobile
70:B3:D5:14:60:00/36 3cityEle # 3City Electronics
+70:B3:D5:15:20:00/36 XpedPty # Xped Corporation Pty Ltd
70:B3:D5:15:F0:00/36 Savroni̇ # SAVRONİK ELEKTRONİK
70:B3:D5:16:40:00/36 TokyoDra # Tokyo Drawing Ltd.
70:B3:D5:16:60:00/36 SerialIm # SERIAL IMAGE INC.
@@ -21244,6 +21256,7 @@
70:B3:D5:2F:10:00/36 InspikeS # Inspike S.R.L.
70:B3:D5:2F:D0:00/36 SpecialP # Special Projects Group, Inc
70:B3:D5:30:00:00/36 NovoDr # Novo DR Ltd.
+70:B3:D5:30:30:00/36 FuchuGik # Fuchu Giken, Inc.
70:B3:D5:30:50:00/36 CaitronI # CAITRON Industrial Solutions GmbH
70:B3:D5:30:80:00/36 DsdMicro # DSD MICROTECHNOLOGY,INC.
70:B3:D5:32:30:00/36 TattileS # TATTILE SRL
@@ -21293,6 +21306,7 @@
70:B3:D5:3F:10:00/36 OlympusN # Olympus NDT Canada
70:B3:D5:3F:90:00/36 HerrickT # Herrick Tech Labs
70:B3:D5:3F:F0:00/36 HydraCon # Hydra Controls
+70:B3:D5:40:40:00/36 Ranix # RANIX,Inc.
70:B3:D5:40:A0:00/36 MonroeEl # Monroe Electronics, Inc.
70:B3:D5:41:20:00/36 TattileS # TATTILE SRL
70:B3:D5:41:70:00/36 FigmentD # Figment Design Laboratories
@@ -21317,6 +21331,7 @@
70:B3:D5:47:20:00/36 QuadioDe # Quadio Devices Private Limited
70:B3:D5:48:C0:00/36 Integrat # Integrated Systems Engineering, Inc.
70:B3:D5:48:D0:00/36 OmegaBil # OMEGA BILANCE SRL SOCIETA' UNIPERSONALE
+70:B3:D5:48:E0:00/36 AllimSys # Allim System Co,.Ltd.
70:B3:D5:4A:A0:00/36 TwowayCo # Twoway Communications, Inc.
70:B3:D5:4A:D0:00/36 Gaci
70:B3:D5:4B:10:00/36 LaceLlc # LACE LLC.
@@ -21341,6 +21356,7 @@
70:B3:D5:51:D0:00/36 TecnintH # Tecnint HTE Srl
70:B3:D5:51:E0:00/36 Fundació # Fundación Cardiovascular de Colombia
70:B3:D5:52:B0:00/36 GeAviati # GE Aviation Cheltenham
+70:B3:D5:52:D0:00/36 TanakaEl # Tanaka Electric Industry Co., Ltd.
70:B3:D5:53:00:00/36 Isis-Ex # iSiS-Ex Limited
70:B3:D5:53:80:00/36 Sydetion # sydetion UG (h.b.)
70:B3:D5:54:D0:00/36 QingdaoH # Qingdao Haitian Weiye Automation Control System Co., Ltd
@@ -21357,6 +21373,7 @@
70:B3:D5:58:E0:00/36 Veilux # Veilux Inc.
70:B3:D5:58:F0:00/36 Lsl # LSL systems
70:B3:D5:59:50:00/36 PlrPruef # PLR Prueftechnik Linke und Ruehe GmbH
+70:B3:D5:59:D0:00/36 Servicio # servicios de consultoria independiente S.L.
70:B3:D5:5A:20:00/36 WallnerA # Wallner Automation GmbH
70:B3:D5:5A:80:00/36 Farmobil # Farmobile
70:B3:D5:5A:90:00/36 BunkaShu # Bunka Shutter Co., Ltd.
@@ -21412,6 +21429,7 @@
70:B3:D5:6F:30:00/36 Iungo
70:B3:D5:6F:60:00/36 AccoBran # Acco Brands Europe
70:B3:D5:6F:80:00/36 Senseon # SENSEON Corporation
+70:B3:D5:6F:90:00/36 Envitech # ENVItech s.r.o.
70:B3:D5:6F:A0:00/36 Datafort # Dataforth Corporation
70:B3:D5:70:20:00/36 SensorHi # Sensor Highway Ltd
70:B3:D5:70:30:00/36 Stromide # StromIdee GmbH
@@ -21506,6 +21524,7 @@
70:B3:D5:91:E0:00/36 Creotech # Creotech Instruments S.A.
70:B3:D5:92:30:00/36 EumigInd # eumig industrie-tv GmbH
70:B3:D5:93:20:00/36 Rohde&Sc # Rohde&Schwarz Topex SA
+70:B3:D5:93:30:00/36 SarlS@Ti # SARL S@TIS
70:B3:D5:93:50:00/36 SensorDe # Sensor Developments
70:B3:D5:93:60:00/36 FaroTech # FARO TECHNOLOGIES, INC.
70:B3:D5:94:10:00/36 Triax # Triax A/S
@@ -21620,8 +21639,10 @@
70:B3:D5:BD:A0:00/36 5-D # 5-D Systems, Inc.
70:B3:D5:BD:D0:00/36 CdrSrl # CDR SRL
70:B3:D5:BE:10:00/36 Fecon # FeCon GmbH
+70:B3:D5:BE:50:00/36 PantecEn # Pantec Engineering AG
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:BF:10:00/36 Flashnet # Flashnet SRL
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
@@ -21704,6 +21725,7 @@
70:B3:D5:DC:50:00/36 ExcelMed # Excel Medical Electronics LLC
70:B3:D5:DC:F0:00/36 KlsNethe # KLS Netherlands B.V.
70:B3:D5:DD:D0:00/36 BioRadLa # BIO RAD LABORATORIES
+70:B3:D5:DD:F0:00/36 Aerovisi # AeroVision Avionics, Inc.
70:B3:D5:DE:70:00/36 Innomind # Innominds Software Private Limited
70:B3:D5:DE:80:00/36 Nation-E # Nation-E Ltd.
70:B3:D5:DE:C0:00/36 Condev-A # Condev-Automation GmbH
@@ -21791,6 +21813,7 @@
70:B3:D5:F7:20:00/36 HanshinE # Hanshin Electronics
70:B3:D5:F7:30:00/36 AslHoldi # ASL Holdings
70:B3:D5:F7:80:00/36 ManvishE # Manvish eTech Pvt. Ltd.
+70:B3:D5:F7:90:00/36 Firehose # Firehose Labs, Inc.
70:B3:D5:F7:E0:00/36 AlphaEle # Alpha Elettronica s.r.l.
70:B3:D5:F8:C0:00/36 European # EUROPEAN ADVANCED TECHNOLOGIES
70:B3:D5:F8:E0:00/36 Isabelle # Isabellenhütte Heusler Gmbh &Co KG
@@ -22538,6 +22561,7 @@
88:14:2B Protonic # Protonic Holland
88:15:44 Meraki # Meraki, Inc.
88:18:AE Tamron # Tamron Co., Ltd
+88:1B:99 Shenzhen # SHENZHEN XIN FEI JIA ELECTRONIC CO. LTD.
88:1D:FC Cisco
88:1F:A1 Apple
88:20:12 LmiTechn # LMI Technologies
@@ -23411,6 +23435,7 @@ A4:2C:08 Masterwo # Masterwork Automodules
A4:31:35 Apple # Apple Inc
A4:33:D1 Fibrlink # Fibrlink Communications Co.,Ltd.
A4:34:D9 IntelCor # Intel Corporate
+A4:38:31 RfElemen # RF elements s.r.o.
A4:38:FC PlasticL # Plastic Logic
A4:3A:69 Vers # Vers Inc
A4:3B:FA IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information.
@@ -23500,6 +23525,7 @@ A4:D8:56 Gimbal # Gimbal, Inc
A4:DA:3F Bionics # Bionics Corp.
A4:DB:2E Kingspan # Kingspan Environmental Ltd
A4:DB:30 LiteonTe # Liteon Technology Corporation
+A4:DC:BE HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
A4:DE:50 TotalWal # Total Walther GmbH
A4:E0:E6 Filizola # FILIZOLA S.A. PESAGEM E AUTOMACAO
A4:E3:2E SiliconS # Silicon & Software Systems Ltd.
@@ -23685,6 +23711,7 @@ AC:72:89 IntelCor # Intel Corporate
AC:7A:42 Iconnect # iConnectivity
AC:7A:4D AlpsElec # ALPS ELECTRIC CO.,LTD.
AC:7B:A1 IntelCor # Intel Corporate
+AC:7E:8A Cisco # Cisco Systems
AC:7F:3E Apple
AC:80:D6 Hexatron # Hexatronic AB
AC:81:12 GemtekTe # Gemtek Technology Co., Ltd.
@@ -23809,6 +23836,7 @@ B0:75:0C QaCafe # QA Cafe
B0:75:4D Alcatel- # Alcatel-Lucent
B0:75:D5 Zte # ZTE Corporation
B0:77:AC ArrisGro # ARRIS Group, Inc.
+B0:78:F0 BeijingH # Beijing HuaqinWorld Technology Co.,Ltd.
B0:79:08 Cummings # Cummings Engineering
B0:79:3C Revolv # Revolv Inc
B0:79:94 Motorola # Motorola Mobility LLC
@@ -24863,6 +24891,7 @@ D0:B4:98 RobertBo # Robert Bosch LLC Automotive Electronics
D0:B5:23 Bestcare # Bestcare Cloucal Corp.
D0:B5:3D SeproRob # SEPRO ROBOTIQUE
D0:B5:C2 TexasIns # Texas Instruments
+D0:BA:E4 Shanghai # Shanghai MXCHIP Information Technology Co., Ltd.
D0:BB:80 ShlTelem # SHL Telemedicine International Ltd.
D0:BD:01 DsIntern # DS International
D0:BE:2C Cnslink # CNSLink Co., Ltd.
@@ -24987,7 +25016,7 @@ D4:95:24 CloverNe # Clover Network, Inc.
D4:96:DF SungjinC # SUNGJIN C&T CO.,LTD
D4:97:0B Xiaomi # XIAOMI CORPORATION
D4:9A:20 Apple
-D4:9C:28 JaybirdG # JayBird Gear LLC
+D4:9C:28 JaybirdL # JayBird LLC
D4:9C:8E Universi # University of FUKUI
D4:9E:6D WuhanZho # Wuhan Zhongyuan Huadian Science & Technology Co.,
D4:A0:2A Cisco # CISCO SYSTEMS, INC.
@@ -25487,6 +25516,7 @@ E4:AF:A1 Hes-So
E4:B0:21 SamsungE # Samsung Electronics Co.,Ltd
E4:BA:D9 360Fly # 360 Fly Inc.
E4:C1:46 Objetivo # Objetivos y Servicios de Valor A
+E4:C2:D1 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
E4:C6:2B Airware
E4:C6:3D Apple # Apple, Inc.
E4:C6:E6 MophieLl # Mophie, LLC
@@ -25722,6 +25752,7 @@ EC:A9:FA Guangdon # GUANGDONG GENIUS TECHNOLOGY CO.,LTD.
EC:B1:06 AcuroNet # Acuro Networks, Inc
EC:B1:D7 HewlettP # Hewlett Packard
EC:B5:41 ShinanoE # SHINANO E and E Co.Ltd.
+EC:B8:70 BeijingH # Beijing Heweinet Technology Co.,Ltd.
EC:B9:07 Cloudgen # CloudGenix Inc
EC:BA:FE Giroptic
EC:BB:AE Digivoic # Digivoice Tecnologia em Eletronica Ltda
diff --git a/services b/services
index 0fa657de2a..96cb270fb7 100644
--- a/services
+++ b/services
@@ -8365,6 +8365,8 @@ surfpass 5030/tcp # SurfPass [Olivier_Guezenec] [Olivier_Guezenec] 2006-
surfpass 5030/udp # SurfPass [Olivier_Guezenec] [Olivier_Guezenec] 2006-12
dmp 5031/udp # Direct Message Protocol [Gjermund_Wallenius] [Gjermund_Wallenius] 2009-09-30
signacert-agent 5032/tcp # SignaCert Enterprise Trust Server Agent [Harris_Corporation] [Daniel_R_Somerfield] 2011-08-05
+jtnetd-server 5033/tcp # Janstor Secure Data [Janstor_Technology] [Anthony_Johnson_2] 2015-06-08
+jtnetd-status 5034/tcp # Janstor Status [Janstor_Technology] [Anthony_Johnson_2] 2015-06-08
asnaacceler8db 5042/tcp # asnaacceler8db [Walter_Goodwin] [Walter_Goodwin]
asnaacceler8db 5042/udp # asnaacceler8db [Walter_Goodwin] [Walter_Goodwin]
swxadmin 5043/tcp # ShopWorX Administration [Don_W_Fitzpatrick] [Don_W_Fitzpatrick] 2005-08
@@ -10017,6 +10019,7 @@ cruise-update 8380/tcp # Cruise UPDATE [Steve_Husak] [Steve_Husak]
cruise-update 8380/udp # Cruise UPDATE [Steve_Husak] [Steve_Husak]
m2mservices 8383/tcp # M2m Services [Carlos_Arteaga_2] [Carlos_Arteaga_2] 2004-11
m2mservices 8383/udp # M2m Services [Carlos_Arteaga_2] [Carlos_Arteaga_2] 2004-11
+marathontp 8384/udp # Marathon Transport Protocol [Inertia_Systemes] [Jasmin_Blouin] 2015-06-11
cvd 8400/tcp # cvd [Aaron_Bilbrey] [Aaron_Bilbrey]
cvd 8400/udp # cvd [Aaron_Bilbrey] [Aaron_Bilbrey]
sabarsd 8401/tcp # sabarsd [Aaron_Bilbrey] [Aaron_Bilbrey]
@@ -10057,6 +10060,7 @@ fmtp 8500/udp # Flight Message Transfer Protocol [Eivan_Cerasi] [Eiv
cmtp-mgt 8501/tcp # CYTEL Message Transfer Management
cmtp-av 8501/udp # CYTEL Message Transfer Audio and Video [Frank_Jakel] [Frank_Jakel] 2011-04-29
ftnmtp 8502/tcp # FTN Message Transfer Protocol [Yuri_Myakotin] [Yuri_Myakotin] 2014-01-07
+lsp-self-ping 8503/udp # MPLS LSP Self Ping [Juniper_Networks_2] [Ron_Bonica] 2015-06-11 [draft-ietf-mpls-self-ping]
rtsp-alt 8554/tcp # RTSP Alternate (see port 554) [Stephen_Casner_2] [Stephen_Casner_2]
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
diff --git a/ui/qt/wireshark_de.qm b/ui/qt/wireshark_de.qm
index e6e7ca9011..f96863691a 100644
--- a/ui/qt/wireshark_de.qm
+++ b/ui/qt/wireshark_de.qm
Binary files differ
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 639e56ade3..0657fd9bb6 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -96,10 +96,25 @@
<translation>Zeilen kopieren</translation>
</message>
<message>
- <location filename="bluetooth_att_server_attributes_dialog.cpp" line="138"/>
+ <location filename="bluetooth_att_server_attributes_dialog.ui" line="190"/>
<source>Copy All</source>
<translation>Alles kopieren</translation>
</message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.ui" line="195"/>
+ <source>Save as image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.cpp" line="361"/>
+ <source>Save Table Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.cpp" line="363"/>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ByteViewTab</name>
@@ -1931,73 +1946,78 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<message>
<location filename="filter_dialog.ui" line="48"/>
<source>Create a new profile using default settings.</source>
- <translation type="unfinished">Ein neues Profil mit den Standardeinstellungen erstellen.</translation>
+ <translation>Neues Profil mit den Standardeinstellungen erstellen.</translation>
</message>
<message>
<location filename="filter_dialog.ui" line="62"/>
<source>Remove this profile.</source>
- <translation type="unfinished">Diese Profil löschen.</translation>
+ <translation>Diese Profil entfernen.</translation>
</message>
<message>
<location filename="filter_dialog.ui" line="73"/>
<source>Copy this profile.</source>
- <translation type="unfinished">Dieses Profil kopieren.</translation>
+ <translation>Diese Profil kopieren.</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="73"/>
<source>Capture Filters</source>
- <translation type="unfinished"></translation>
+ <translation>Mitschnittfilter</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="85"/>
<source>Display Filters</source>
- <translation type="unfinished"></translation>
+ <translation>Anzeigefilter</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="161"/>
<source>New capture filter</source>
<extracomment>This text is automatically filled in when a new filter is created</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Neuer Mitschnittfilter</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="165"/>
<source>New display filter</source>
<extracomment>This text is automatically filled in when a new filter is created</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Neuer Anzeigefilter</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="210"/>
<source>Unable to create profile directory.</source>
- <translation type="unfinished"></translation>
+ <translation>Profilverzeichnis kann nicht erstellt werden.</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="211"/>
<source>Unable to create directory
&quot;%1&quot;
for filter files: %2.</source>
- <translation type="unfinished"></translation>
+ <translation>Verzeichnis
+&quot;%1&quot;
+für die Filterdateien kann nicht erstellt werden:
+%2.</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="225"/>
<source>Unable to save capture filter settings.</source>
- <translation type="unfinished"></translation>
+ <translation>Einstellungen für die Mitschnittfilter konnten nicht gespeichert werden.</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="226"/>
<source>Could not save to your capture filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished"></translation>
+ <translation>Ihre Mitschnittfilterdatei konnte nicht gespeichert werden
+&quot;%1&quot;: %2.</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="229"/>
<source>Unable to save display filter settings.</source>
- <translation type="unfinished"></translation>
+ <translation>Einstellungen für die Anzeigenfilter konnten nicht gespeichert werden.</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="230"/>
<source>Could not save to your display filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished"></translation>
+ <translation>Ihre Anzeigefilterdatei konnte nicht gespeichert werden
+&quot;%1&quot;: %2.</translation>
</message>
</context>
<context>
@@ -4610,7 +4630,7 @@ for filter files: %2.</source>
<location filename="main_status_bar.cpp" line="199"/>
<source> is the highest expert information level</source>
<oldsource> is the highest expert info level</oldsource>
- <translation type="unfinished"></translation>
+ <translation>liefert die detailliertesten Experten-Informationen</translation>
</message>
<message>
<location filename="main_status_bar.cpp" line="204"/>
@@ -4636,7 +4656,7 @@ for filter files: %2.</source>
<location filename="main_status_bar.cpp" line="223"/>
<source>No expert information</source>
<oldsource>No expert info</oldsource>
- <translation type="unfinished"></translation>
+ <translation>Keine Experten-Informationen</translation>
</message>
<message>
<location filename="main_status_bar.cpp" line="318"/>
@@ -7719,7 +7739,7 @@ Wollen Sie zur Anzeige &quot;Sekunden seit dem Beginn der Aufzeichnung&quot; wec
<translation>Ein Profil mit diesem Namen existiert bereits.</translation>
</message>
<message>
- <location filename="profile_dialog.cpp" line="275"/>
+ <location filename="profile_dialog.cpp" line="276"/>
<source>Profile Error</source>
<translation>Profil Fehler</translation>
</message>
@@ -9881,91 +9901,75 @@ Wollen Sie zur Anzeige &quot;Sekunden seit dem Beginn der Aufzeichnung&quot; wec
<context>
<name>StatsTreeDialog</name>
<message>
- <location filename="stats_tree_dialog.ui" line="14"/>
<source>Dialog</source>
- <translation>Dialog</translation>
+ <translation type="vanished">Dialog</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="31"/>
<source>Display filter:</source>
- <translation>Anzeigefilter:</translation>
+ <translation type="vanished">Anzeigefilter:</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="41"/>
<source>Regenerate statistics using this display filter</source>
- <translation>Statistik mit Anzeigenfilter neu generieren</translation>
+ <translation type="vanished">Statistik mit Anzeigenfilter neu generieren</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="44"/>
<source>Apply</source>
- <translation>Anwenden</translation>
+ <translation type="vanished">Anwenden</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="63"/>
- <location filename="stats_tree_dialog.cpp" line="97"/>
<source>Copy</source>
- <translation>Kopieren</translation>
+ <translation type="vanished">Kopieren</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="66"/>
<source>Copy a text representation of the tree to the clipboard</source>
- <translation>Baumansicht als Text in die Zwischenablage kopieren</translation>
+ <translation type="vanished">Baumansicht als Text in die Zwischenablage kopieren</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="69"/>
<source>Ctrl+C</source>
- <translation>Strg+C</translation>
+ <translation type="vanished">Strg+C</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="74"/>
- <location filename="stats_tree_dialog.cpp" line="100"/>
<source>Save as...</source>
- <translation>Speichern unter...</translation>
+ <translation type="vanished">Speichern unter...</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="77"/>
<source>Save the stats_tree data in various formats</source>
- <translation>Statistikbaum speichern</translation>
+ <translation type="vanished">Statistikbaum speichern</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="80"/>
<source>Ctrl+S</source>
- <translation>Strg + S</translation>
+ <translation type="vanished">Strg + S</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="87"/>
+ <location filename="stats_tree_dialog.cpp" line="69"/>
<source>Configuration not found</source>
<translation>Konfiguration nicht gefunden</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="88"/>
+ <location filename="stats_tree_dialog.cpp" line="70"/>
<source>Unable to find configuration for %1.</source>
<translation>Konfiguration für %1 nicht auffindbar.</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="156"/>
+ <location filename="stats_tree_dialog.cpp" line="149"/>
<source>%1 failed to attach to tap</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="268"/>
<source>Save Statistics As</source>
- <translation>Statistik speichern als</translation>
+ <translation type="vanished">Statistik speichern als</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="270"/>
<source>Plain text file (*.txt);;Comma separated values (*.csv);;XML document (*.xml);;YAML document (*.yaml)</source>
- <translation>Textdatei (*.txt);;Komma separierte werte (*.csv);;XML Dokument (*.xml);;YAML Dokument (*.yaml)</translation>
+ <translation type="vanished">Textdatei (*.txt);;Komma separierte werte (*.csv);;XML Dokument (*.xml);;YAML Dokument (*.yaml)</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="274"/>
<source>Plain text file (*.txt)</source>
- <translation>Textdatei (*.txt)</translation>
+ <translation type="vanished">Textdatei (*.txt)</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="318"/>
<source>Error saving file %1</source>
- <translation>Fehler beim Speichern der Datei %1</translation>
+ <translation type="vanished">Fehler beim Speichern der Datei %1</translation>
</message>
</context>
<context>
@@ -10531,6 +10535,81 @@ Wollen Sie zur Anzeige &quot;Sekunden seit dem Beginn der Aufzeichnung&quot; wec
</message>
</context>
<context>
+ <name>TapParameterDialog</name>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="14"/>
+ <source>Dialog</source>
+ <translation type="unfinished">Dialog</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="31"/>
+ <source>Display filter:</source>
+ <translation type="unfinished">Anzeigefilter:</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="41"/>
+ <source>Regenerate statistics using this display filter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="44"/>
+ <source>Apply</source>
+ <translation type="unfinished">Anwenden</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="63"/>
+ <location filename="tap_parameter_dialog.cpp" line="73"/>
+ <source>Copy</source>
+ <translation type="unfinished">Kopieren</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="66"/>
+ <source>Copy a text representation of the tree to the clipboard</source>
+ <translation type="unfinished">Baumansicht als Text in die Zwischenablage kopieren</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="69"/>
+ <source>Ctrl+C</source>
+ <translation type="unfinished">Strg+C</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="74"/>
+ <location filename="tap_parameter_dialog.cpp" line="76"/>
+ <source>Save as...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="77"/>
+ <source>Save the displayed data in various formats</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="80"/>
+ <source>Ctrl+S</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="147"/>
+ <source>Save Statistics As</source>
+ <translation type="unfinished">Statistik speichern als</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="149"/>
+ <source>Plain text file (*.txt);;Comma separated values (*.csv);;XML document (*.xml);;YAML document (*.yaml)</source>
+ <translation type="unfinished">Textdatei (*.txt);;Komma separierte werte (*.csv);;XML Dokument (*.xml);;YAML Dokument (*.yaml)</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="153"/>
+ <source>Plain text file (*.txt)</source>
+ <translation type="unfinished">Textdatei (*.txt)</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="195"/>
+ <source>Error saving file %1</source>
+ <translation type="unfinished">Fehler beim Speichern der Datei %1</translation>
+ </message>
+</context>
+<context>
<name>TimeShiftDialog</name>
<message>
<location filename="time_shift_dialog.ui" line="25"/>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index 059234c0ca..b95f38c87e 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -96,10 +96,25 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="bluetooth_att_server_attributes_dialog.cpp" line="138"/>
+ <location filename="bluetooth_att_server_attributes_dialog.ui" line="190"/>
<source>Copy All</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.ui" line="195"/>
+ <source>Save as image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.cpp" line="361"/>
+ <source>Save Table Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.cpp" line="363"/>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ByteViewTab</name>
@@ -7638,7 +7653,7 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="profile_dialog.cpp" line="275"/>
+ <location filename="profile_dialog.cpp" line="276"/>
<source>Profile Error</source>
<translation type="unfinished"></translation>
</message>
@@ -9781,92 +9796,20 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
<context>
<name>StatsTreeDialog</name>
<message>
- <location filename="stats_tree_dialog.ui" line="14"/>
- <source>Dialog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="stats_tree_dialog.ui" line="31"/>
- <source>Display filter:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="stats_tree_dialog.ui" line="41"/>
- <source>Regenerate statistics using this display filter</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="stats_tree_dialog.ui" line="44"/>
- <source>Apply</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="stats_tree_dialog.ui" line="63"/>
- <location filename="stats_tree_dialog.cpp" line="97"/>
- <source>Copy</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="stats_tree_dialog.ui" line="66"/>
- <source>Copy a text representation of the tree to the clipboard</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="stats_tree_dialog.ui" line="69"/>
- <source>Ctrl+C</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="stats_tree_dialog.ui" line="74"/>
- <location filename="stats_tree_dialog.cpp" line="100"/>
- <source>Save as...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="stats_tree_dialog.ui" line="77"/>
- <source>Save the stats_tree data in various formats</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="stats_tree_dialog.ui" line="80"/>
- <source>Ctrl+S</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="stats_tree_dialog.cpp" line="87"/>
+ <location filename="stats_tree_dialog.cpp" line="69"/>
<source>Configuration not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="88"/>
+ <location filename="stats_tree_dialog.cpp" line="70"/>
<source>Unable to find configuration for %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="156"/>
+ <location filename="stats_tree_dialog.cpp" line="149"/>
<source>%1 failed to attach to tap</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="stats_tree_dialog.cpp" line="268"/>
- <source>Save Statistics As</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="stats_tree_dialog.cpp" line="270"/>
- <source>Plain text file (*.txt);;Comma separated values (*.csv);;XML document (*.xml);;YAML document (*.yaml)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="stats_tree_dialog.cpp" line="274"/>
- <source>Plain text file (*.txt)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="stats_tree_dialog.cpp" line="318"/>
- <source>Error saving file %1</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>TCPStreamDialog</name>
@@ -10396,6 +10339,81 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
</message>
</context>
<context>
+ <name>TapParameterDialog</name>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="14"/>
+ <source>Dialog</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="31"/>
+ <source>Display filter:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="41"/>
+ <source>Regenerate statistics using this display filter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="44"/>
+ <source>Apply</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="63"/>
+ <location filename="tap_parameter_dialog.cpp" line="73"/>
+ <source>Copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="66"/>
+ <source>Copy a text representation of the tree to the clipboard</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="69"/>
+ <source>Ctrl+C</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="74"/>
+ <location filename="tap_parameter_dialog.cpp" line="76"/>
+ <source>Save as...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="77"/>
+ <source>Save the displayed data in various formats</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="80"/>
+ <source>Ctrl+S</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="147"/>
+ <source>Save Statistics As</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="149"/>
+ <source>Plain text file (*.txt);;Comma separated values (*.csv);;XML document (*.xml);;YAML document (*.yaml)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="153"/>
+ <source>Plain text file (*.txt)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="195"/>
+ <source>Error saving file %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TimeShiftDialog</name>
<message>
<location filename="time_shift_dialog.ui" line="25"/>
diff --git a/ui/qt/wireshark_fr.qm b/ui/qt/wireshark_fr.qm
index beffc3cc96..74d9a8ff9a 100644
--- a/ui/qt/wireshark_fr.qm
+++ b/ui/qt/wireshark_fr.qm
Binary files differ
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 67197903c2..7b55a21ecd 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -96,10 +96,25 @@
<translation>Copier la ligne</translation>
</message>
<message>
- <location filename="bluetooth_att_server_attributes_dialog.cpp" line="138"/>
+ <location filename="bluetooth_att_server_attributes_dialog.ui" line="190"/>
<source>Copy All</source>
<translation>Copier Tout</translation>
</message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.ui" line="195"/>
+ <source>Save as image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.cpp" line="361"/>
+ <source>Save Table Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.cpp" line="363"/>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ByteViewTab</name>
@@ -7644,7 +7659,7 @@ Voulez-vous passer en &quot;secondes depuis le début de Capture&quot; maintenan
<translation>Un profil déjà avec ce nom.</translation>
</message>
<message>
- <location filename="profile_dialog.cpp" line="275"/>
+ <location filename="profile_dialog.cpp" line="276"/>
<source>Profile Error</source>
<translation>Erreur de Profil</translation>
</message>
@@ -9787,91 +9802,55 @@ Voulez-vous passer en &quot;secondes depuis le début de Capture&quot; maintenan
<context>
<name>StatsTreeDialog</name>
<message>
- <location filename="stats_tree_dialog.ui" line="14"/>
<source>Dialog</source>
- <translation>Dialogue</translation>
+ <translation type="vanished">Dialogue</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="31"/>
<source>Display filter:</source>
- <translation>Filtre d&apos;affichage:</translation>
+ <translation type="vanished">Filtre d&apos;affichage:</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="41"/>
<source>Regenerate statistics using this display filter</source>
- <translation>Régénérer les statistiques en utilisant ce filtre d&apos;affichage</translation>
+ <translation type="vanished">Régénérer les statistiques en utilisant ce filtre d&apos;affichage</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="44"/>
<source>Apply</source>
- <translation>Appliquer</translation>
+ <translation type="vanished">Appliquer</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="63"/>
- <location filename="stats_tree_dialog.cpp" line="97"/>
<source>Copy</source>
- <translation>Copier</translation>
+ <translation type="vanished">Copier</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="66"/>
<source>Copy a text representation of the tree to the clipboard</source>
- <translation>Copier une représentation textuelle pour le presse-papiers</translation>
- </message>
- <message>
- <location filename="stats_tree_dialog.ui" line="69"/>
- <source>Ctrl+C</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Copier une représentation textuelle pour le presse-papiers</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="74"/>
- <location filename="stats_tree_dialog.cpp" line="100"/>
<source>Save as...</source>
- <translation>Sauvegarder sous...</translation>
+ <translation type="vanished">Sauvegarder sous...</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="77"/>
<source>Save the stats_tree data in various formats</source>
- <translation>Sauvegardez les données de stats_tree dans différents formats</translation>
- </message>
- <message>
- <location filename="stats_tree_dialog.ui" line="80"/>
- <source>Ctrl+S</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Sauvegardez les données de stats_tree dans différents formats</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="87"/>
+ <location filename="stats_tree_dialog.cpp" line="69"/>
<source>Configuration not found</source>
<translation>Configuration non trouvée</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="88"/>
+ <location filename="stats_tree_dialog.cpp" line="70"/>
<source>Unable to find configuration for %1.</source>
<translation>Impossible de trouver la configuration pour %1.</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="156"/>
+ <location filename="stats_tree_dialog.cpp" line="149"/>
<source>%1 failed to attach to tap</source>
<translation>%1 Impossible de joindre le tap</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="268"/>
- <source>Save Statistics As</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="stats_tree_dialog.cpp" line="270"/>
- <source>Plain text file (*.txt);;Comma separated values (*.csv);;XML document (*.xml);;YAML document (*.yaml)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="stats_tree_dialog.cpp" line="274"/>
- <source>Plain text file (*.txt)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="stats_tree_dialog.cpp" line="318"/>
<source>Error saving file %1</source>
- <translation>Erreur pour sauvegarder le fichier %1</translation>
+ <translation type="vanished">Erreur pour sauvegarder le fichier %1</translation>
</message>
</context>
<context>
@@ -10403,6 +10382,81 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
</message>
</context>
<context>
+ <name>TapParameterDialog</name>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="14"/>
+ <source>Dialog</source>
+ <translation type="unfinished">Dialogue</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="31"/>
+ <source>Display filter:</source>
+ <translation type="unfinished">Filtre d&apos;affichage:</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="41"/>
+ <source>Regenerate statistics using this display filter</source>
+ <translation type="unfinished">Régénérer les statistiques en utilisant ce filtre d&apos;affichage</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="44"/>
+ <source>Apply</source>
+ <translation type="unfinished">Appliquer</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="63"/>
+ <location filename="tap_parameter_dialog.cpp" line="73"/>
+ <source>Copy</source>
+ <translation type="unfinished">Copier</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="66"/>
+ <source>Copy a text representation of the tree to the clipboard</source>
+ <translation type="unfinished">Copier une représentation textuelle pour le presse-papiers</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="69"/>
+ <source>Ctrl+C</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="74"/>
+ <location filename="tap_parameter_dialog.cpp" line="76"/>
+ <source>Save as...</source>
+ <translation type="unfinished">Sauvegarder sous...</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="77"/>
+ <source>Save the displayed data in various formats</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="80"/>
+ <source>Ctrl+S</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="147"/>
+ <source>Save Statistics As</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="149"/>
+ <source>Plain text file (*.txt);;Comma separated values (*.csv);;XML document (*.xml);;YAML document (*.yaml)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="153"/>
+ <source>Plain text file (*.txt)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="195"/>
+ <source>Error saving file %1</source>
+ <translation type="unfinished">Erreur pour sauvegarder le fichier %1</translation>
+ </message>
+</context>
+<context>
<name>TimeShiftDialog</name>
<message>
<location filename="time_shift_dialog.ui" line="25"/>
diff --git a/ui/qt/wireshark_it.qm b/ui/qt/wireshark_it.qm
index c8e125db8b..818053f4c4 100644
--- a/ui/qt/wireshark_it.qm
+++ b/ui/qt/wireshark_it.qm
Binary files differ
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index 1cbb8a16aa..e54471c40c 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -96,10 +96,25 @@
<translation>Copia righe</translation>
</message>
<message>
- <location filename="bluetooth_att_server_attributes_dialog.cpp" line="138"/>
+ <location filename="bluetooth_att_server_attributes_dialog.ui" line="190"/>
<source>Copy All</source>
<translation>Copia tutto</translation>
</message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.ui" line="195"/>
+ <source>Save as image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.cpp" line="361"/>
+ <source>Save Table Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.cpp" line="363"/>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ByteViewTab</name>
@@ -1438,27 +1453,27 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<message>
<location filename="display_filter_expression_dialog.ui" line="14"/>
<source>Dialog</source>
- <translation type="unfinished">Finestra</translation>
+ <translation>Finestra</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="24"/>
<source>Select a field to start building a display filter.</source>
- <translation type="unfinished"></translation>
+ <translation>Seleziona un campo per avviare la creazione di un filtro di visualizzazione.</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="27"/>
<source>Field Name</source>
- <translation type="unfinished"></translation>
+ <translation>Nome campo</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="51"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search the list of field names.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cerca nell&apos;elenco dei nomi di campo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="54"/>
<source>Search:</source>
- <translation type="unfinished">Cerca:</translation>
+ <translation>Cerca:</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="72"/>
@@ -1474,27 +1489,27 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<message>
<location filename="display_filter_expression_dialog.ui" line="81"/>
<source>Relation</source>
- <translation type="unfinished"></translation>
+ <translation>Relazione</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="108"/>
<source>Match against this value.</source>
- <translation type="unfinished"></translation>
+ <translation>Verifica questo valore.</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="111"/>
<source>Value</source>
- <translation type="unfinished">Valore</translation>
+ <translation>Valore</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="125"/>
<source>If the field you have selected has a known set of valid values they will be listed here.</source>
- <translation type="unfinished"></translation>
+ <translation>Se il campo selezionato ha un insieme noto di valori validi, questi valori saranno elencati qui.</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="128"/>
<source>Predefined Values</source>
- <translation type="unfinished"></translation>
+ <translation>Valori predefiniti</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="155"/>
@@ -1509,27 +1524,27 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<message>
<location filename="display_filter_expression_dialog.ui" line="177"/>
<source>No display filter</source>
- <translation type="unfinished">Nessun filtro di visualizzazione</translation>
+ <translation>Nessun filtro di visualizzazione</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="184"/>
<source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
- <translation type="unfinished">&lt;small&gt;&lt;i&gt;Un suggerimento.&lt;/i&gt;&lt;/small&gt;</translation>
+ <translation>&lt;small&gt;&lt;i&gt;Un suggerimento.&lt;/i&gt;&lt;/small&gt;</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.cpp" line="70"/>
<source>Display Filter Expression</source>
- <translation type="unfinished"></translation>
+ <translation>Espressione del filtro di visualizzazione</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.cpp" line="187"/>
<source>Select a field name to get started</source>
- <translation type="unfinished"></translation>
+ <translation>Seleziona il nome di un campo per iniziare</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.cpp" line="191"/>
<source>Click OK to insert this filter</source>
- <translation type="unfinished"></translation>
+ <translation>Fai clic su OK per inserire questo filtro</translation>
</message>
</context>
<context>
@@ -1916,88 +1931,92 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<message>
<location filename="filter_dialog.ui" line="14"/>
<source>Dialog</source>
- <translation type="unfinished">Finestra</translation>
+ <translation>Finestra</translation>
</message>
<message>
<location filename="filter_dialog.ui" line="33"/>
<source>Name</source>
- <translation type="unfinished">Nome</translation>
+ <translation>Nome</translation>
</message>
<message>
<location filename="filter_dialog.ui" line="38"/>
<source>Filter</source>
- <translation type="unfinished">Filtro</translation>
+ <translation>Filtro</translation>
</message>
<message>
<location filename="filter_dialog.ui" line="48"/>
<source>Create a new profile using default settings.</source>
- <translation type="unfinished"></translation>
+ <translation>Crea un nuovo profilo usando le impostazioni predefinite.</translation>
</message>
<message>
<location filename="filter_dialog.ui" line="62"/>
<source>Remove this profile.</source>
- <translation type="unfinished">Rimuovi questo profilo.</translation>
+ <translation>Rimuovi questo profilo.</translation>
</message>
<message>
<location filename="filter_dialog.ui" line="73"/>
<source>Copy this profile.</source>
- <translation type="unfinished">Copia questo profilo.</translation>
+ <translation>Copia questo profilo.</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="73"/>
<source>Capture Filters</source>
- <translation type="unfinished"></translation>
+ <translation>Filtri di cattura</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="85"/>
<source>Display Filters</source>
- <translation type="unfinished"></translation>
+ <translation>Filtri di visualizzazione</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="161"/>
<source>New capture filter</source>
<extracomment>This text is automatically filled in when a new filter is created</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Nuovo filtro di cattura</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="165"/>
<source>New display filter</source>
<extracomment>This text is automatically filled in when a new filter is created</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Nuovo filtro di visualizzazione</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="210"/>
<source>Unable to create profile directory.</source>
- <translation type="unfinished"></translation>
+ <translation>Impossibile creare la cartella del profilo.</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="211"/>
<source>Unable to create directory
&quot;%1&quot;
for filter files: %2.</source>
- <translation type="unfinished"></translation>
+ <translation>Impossibile creare la cartella
+&quot;%1&quot;
+per i file di filtro: %2.</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="225"/>
<source>Unable to save capture filter settings.</source>
- <translation type="unfinished"></translation>
+ <translation>Impossibile salvare le impostazioni del filtro di cattura.</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="226"/>
<source>Could not save to your capture filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished"></translation>
+ <translation>Impossibile salvare il file del filtro di cattura
+&quot;%1&quot;: %2.</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="229"/>
<source>Unable to save display filter settings.</source>
- <translation type="unfinished"></translation>
+ <translation>Impossibile salvare le impostazioni del filtro di visualizzazione.</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="230"/>
<source>Could not save to your display filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished"></translation>
+ <translation>Impossibile salvare il file del filtro di visualizzazione
+&quot;%1&quot;: %2.</translation>
</message>
</context>
<context>
@@ -5614,7 +5633,7 @@ a:hover {
<message>
<location filename="main_window.ui" line="345"/>
<source>Conversation Filter</source>
- <translation type="unfinished"></translation>
+ <translation>Filtro di conversazione</translation>
</message>
<message>
<location filename="main_window.ui" line="525"/>
@@ -6800,17 +6819,17 @@ a:hover {
<message>
<location filename="main_window.ui" line="2332"/>
<source>&amp;Expression...</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Espressione...</translation>
</message>
<message>
<location filename="main_window.ui" line="2335"/>
<source>Expression...</source>
- <translation type="unfinished"></translation>
+ <translation>Espressione...</translation>
</message>
<message>
<location filename="main_window.ui" line="2338"/>
<source>Add an expression to the display filter.</source>
- <translation type="unfinished"></translation>
+ <translation>Aggiungi un&apos;espressione per il filtro di visualizzazione.</translation>
</message>
<message>
<location filename="main_window.cpp" line="265"/>
@@ -7718,7 +7737,7 @@ Vuoi passare a &quot;Secondi dall&apos;inizio della cattura&quot; adesso?</trans
<translation>Un profilo con questo nome esiste già.</translation>
</message>
<message>
- <location filename="profile_dialog.cpp" line="275"/>
+ <location filename="profile_dialog.cpp" line="276"/>
<source>Profile Error</source>
<translation>Errore di profilo</translation>
</message>
@@ -8040,7 +8059,7 @@ Vuoi passare a &quot;Secondi dall&apos;inizio della cattura&quot; adesso?</trans
<message>
<location filename="filter_action.cpp" line="76"/>
<source>Conversation Filter</source>
- <translation type="unfinished"></translation>
+ <translation>Filtro di conversazione</translation>
</message>
<message>
<location filename="filter_action.cpp" line="79"/>
@@ -9880,91 +9899,75 @@ Vuoi passare a &quot;Secondi dall&apos;inizio della cattura&quot; adesso?</trans
<context>
<name>StatsTreeDialog</name>
<message>
- <location filename="stats_tree_dialog.ui" line="14"/>
<source>Dialog</source>
- <translation>Finestra</translation>
+ <translation type="vanished">Finestra</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="31"/>
<source>Display filter:</source>
- <translation>Filtro di visualizzazione:</translation>
+ <translation type="vanished">Filtro di visualizzazione:</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="41"/>
<source>Regenerate statistics using this display filter</source>
- <translation>Rigenera le statistiche utilizzando questo filtro di visualizzazione</translation>
+ <translation type="vanished">Rigenera le statistiche utilizzando questo filtro di visualizzazione</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="44"/>
<source>Apply</source>
- <translation>Applica</translation>
+ <translation type="vanished">Applica</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="63"/>
- <location filename="stats_tree_dialog.cpp" line="97"/>
<source>Copy</source>
- <translation>Copia</translation>
+ <translation type="vanished">Copia</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="66"/>
<source>Copy a text representation of the tree to the clipboard</source>
- <translation>Copia una rappresentazione testuale dell&apos;albero negli appunti</translation>
+ <translation type="vanished">Copia una rappresentazione testuale dell&apos;albero negli appunti</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="69"/>
<source>Ctrl+C</source>
- <translation>Ctrl+C</translation>
+ <translation type="vanished">Ctrl+C</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="74"/>
- <location filename="stats_tree_dialog.cpp" line="100"/>
<source>Save as...</source>
- <translation>Salva come...</translation>
+ <translation type="vanished">Salva come...</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="77"/>
<source>Save the stats_tree data in various formats</source>
- <translation>Salva i dati dello stats_tree in vari formati</translation>
+ <translation type="vanished">Salva i dati dello stats_tree in vari formati</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="80"/>
<source>Ctrl+S</source>
- <translation>Ctrl+S</translation>
+ <translation type="vanished">Ctrl+S</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="87"/>
+ <location filename="stats_tree_dialog.cpp" line="69"/>
<source>Configuration not found</source>
<translation>Configurazione non trovata</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="88"/>
+ <location filename="stats_tree_dialog.cpp" line="70"/>
<source>Unable to find configuration for %1.</source>
<translation>Impossibile trovare la configurazione per %1.</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="156"/>
+ <location filename="stats_tree_dialog.cpp" line="149"/>
<source>%1 failed to attach to tap</source>
<translation>%1 non è riuscito ad agganciare il tap</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="268"/>
<source>Save Statistics As</source>
- <translation>Salva le statistiche come</translation>
+ <translation type="vanished">Salva le statistiche come</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="270"/>
<source>Plain text file (*.txt);;Comma separated values (*.csv);;XML document (*.xml);;YAML document (*.yaml)</source>
- <translation>File di testo (*.txt);;Valori separati da virgole (*.csv);;Documento XML (*.xml);;Documento YAML (*.yaml)</translation>
+ <translation type="vanished">File di testo (*.txt);;Valori separati da virgole (*.csv);;Documento XML (*.xml);;Documento YAML (*.yaml)</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="274"/>
<source>Plain text file (*.txt)</source>
- <translation>File di testo (*.txt)</translation>
+ <translation type="vanished">File di testo (*.txt)</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="318"/>
<source>Error saving file %1</source>
- <translation>Errore durante il salvataggio del file %1</translation>
+ <translation type="vanished">Errore durante il salvataggio del file %1</translation>
</message>
</context>
<context>
@@ -10530,6 +10533,81 @@ Vuoi passare a &quot;Secondi dall&apos;inizio della cattura&quot; adesso?</trans
</message>
</context>
<context>
+ <name>TapParameterDialog</name>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="14"/>
+ <source>Dialog</source>
+ <translation type="unfinished">Finestra</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="31"/>
+ <source>Display filter:</source>
+ <translation type="unfinished">Filtro di visualizzazione:</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="41"/>
+ <source>Regenerate statistics using this display filter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="44"/>
+ <source>Apply</source>
+ <translation type="unfinished">Applica</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="63"/>
+ <location filename="tap_parameter_dialog.cpp" line="73"/>
+ <source>Copy</source>
+ <translation type="unfinished">Copia</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="66"/>
+ <source>Copy a text representation of the tree to the clipboard</source>
+ <translation type="unfinished">Copia una rappresentazione testuale dell&apos;albero negli appunti</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="69"/>
+ <source>Ctrl+C</source>
+ <translation type="unfinished">Ctrl+C</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="74"/>
+ <location filename="tap_parameter_dialog.cpp" line="76"/>
+ <source>Save as...</source>
+ <translation type="unfinished">Salva come...</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="77"/>
+ <source>Save the displayed data in various formats</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="80"/>
+ <source>Ctrl+S</source>
+ <translation type="unfinished">Ctrl+S</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="147"/>
+ <source>Save Statistics As</source>
+ <translation type="unfinished">Salva le statistiche come</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="149"/>
+ <source>Plain text file (*.txt);;Comma separated values (*.csv);;XML document (*.xml);;YAML document (*.yaml)</source>
+ <translation type="unfinished">File di testo (*.txt);;Valori separati da virgole (*.csv);;Documento XML (*.xml);;Documento YAML (*.yaml)</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="153"/>
+ <source>Plain text file (*.txt)</source>
+ <translation type="unfinished">File di testo (*.txt)</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="195"/>
+ <source>Error saving file %1</source>
+ <translation type="unfinished">Errore durante il salvataggio del file %1</translation>
+ </message>
+</context>
+<context>
<name>TimeShiftDialog</name>
<message>
<location filename="time_shift_dialog.ui" line="25"/>
diff --git a/ui/qt/wireshark_ja_JP.qm b/ui/qt/wireshark_ja_JP.qm
index 0b34030b3c..f62e638883 100644
--- a/ui/qt/wireshark_ja_JP.qm
+++ b/ui/qt/wireshark_ja_JP.qm
Binary files differ
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index a66868bb66..2faae98d14 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -96,10 +96,25 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="bluetooth_att_server_attributes_dialog.cpp" line="138"/>
+ <location filename="bluetooth_att_server_attributes_dialog.ui" line="190"/>
<source>Copy All</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.ui" line="195"/>
+ <source>Save as image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.cpp" line="361"/>
+ <source>Save Table Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.cpp" line="363"/>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ByteViewTab</name>
@@ -7675,7 +7690,7 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
<translation>その名前のプロファイルはすでに存在しています</translation>
</message>
<message>
- <location filename="profile_dialog.cpp" line="275"/>
+ <location filename="profile_dialog.cpp" line="276"/>
<source>Profile Error</source>
<translation>プロファイルエラー</translation>
</message>
@@ -9835,91 +9850,71 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
<context>
<name>StatsTreeDialog</name>
<message>
- <location filename="stats_tree_dialog.ui" line="14"/>
<source>Dialog</source>
- <translation>ダイアログ</translation>
+ <translation type="vanished">ダイアログ</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="31"/>
<source>Display filter:</source>
- <translation>表示フィルタ:</translation>
+ <translation type="vanished">表示フィルタ:</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="41"/>
<source>Regenerate statistics using this display filter</source>
- <translation>この表示フィルタを用いて統計を再生成</translation>
+ <translation type="vanished">この表示フィルタを用いて統計を再生成</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="44"/>
<source>Apply</source>
- <translation>適用</translation>
+ <translation type="vanished">適用</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="63"/>
- <location filename="stats_tree_dialog.cpp" line="97"/>
<source>Copy</source>
- <translation>コピー</translation>
+ <translation type="vanished">コピー</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="66"/>
<source>Copy a text representation of the tree to the clipboard</source>
- <translation>ツリーのテキスト表現をクリップボードへコピー</translation>
+ <translation type="vanished">ツリーのテキスト表現をクリップボードへコピー</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="69"/>
<source>Ctrl+C</source>
- <translation>Ctrl+C</translation>
+ <translation type="vanished">Ctrl+C</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="74"/>
- <location filename="stats_tree_dialog.cpp" line="100"/>
<source>Save as...</source>
- <translation>...として保存</translation>
+ <translation type="vanished">...として保存</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="77"/>
<source>Save the stats_tree data in various formats</source>
- <translation>様々なフォーマットで統計ツリーデータを保存</translation>
+ <translation type="vanished">様々なフォーマットで統計ツリーデータを保存</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="80"/>
<source>Ctrl+S</source>
- <translation>Ctrl+S</translation>
+ <translation type="vanished">Ctrl+S</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="87"/>
+ <location filename="stats_tree_dialog.cpp" line="69"/>
<source>Configuration not found</source>
<translation>設定が見つかりませんでした</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="88"/>
+ <location filename="stats_tree_dialog.cpp" line="70"/>
<source>Unable to find configuration for %1.</source>
<translation>%1 に対する設定を見つけることができません</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="156"/>
+ <location filename="stats_tree_dialog.cpp" line="149"/>
<source>%1 failed to attach to tap</source>
<translation>%1 タップに割り当てるのに失敗しました</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="268"/>
- <source>Save Statistics As</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="stats_tree_dialog.cpp" line="270"/>
<source>Plain text file (*.txt);;Comma separated values (*.csv);;XML document (*.xml);;YAML document (*.yaml)</source>
- <translation>プレインテキストファイル (*.txt);;カンマ区切りテキストファイル (*.csv);;XML形式文章 (*.xml);;YAML形式文章 (*.yaml)</translation>
+ <translation type="vanished">プレインテキストファイル (*.txt);;カンマ区切りテキストファイル (*.csv);;XML形式文章 (*.xml);;YAML形式文章 (*.yaml)</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="274"/>
<source>Plain text file (*.txt)</source>
- <translation>プレインテキストファイル (*.txt)</translation>
+ <translation type="vanished">プレインテキストファイル (*.txt)</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="318"/>
<source>Error saving file %1</source>
- <translation>ファイル保存中エラー %1</translation>
+ <translation type="vanished">ファイル保存中エラー %1</translation>
</message>
</context>
<context>
@@ -10485,6 +10480,81 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
</message>
</context>
<context>
+ <name>TapParameterDialog</name>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="14"/>
+ <source>Dialog</source>
+ <translation type="unfinished">ダイアログ</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="31"/>
+ <source>Display filter:</source>
+ <translation type="unfinished">表示フィルタ:</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="41"/>
+ <source>Regenerate statistics using this display filter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="44"/>
+ <source>Apply</source>
+ <translation type="unfinished">適用</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="63"/>
+ <location filename="tap_parameter_dialog.cpp" line="73"/>
+ <source>Copy</source>
+ <translation type="unfinished">コピー</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="66"/>
+ <source>Copy a text representation of the tree to the clipboard</source>
+ <translation type="unfinished">ツリーのテキスト表現をクリップボードへコピー</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="69"/>
+ <source>Ctrl+C</source>
+ <translation type="unfinished">Ctrl+C</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="74"/>
+ <location filename="tap_parameter_dialog.cpp" line="76"/>
+ <source>Save as...</source>
+ <translation type="unfinished">...として保存</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="77"/>
+ <source>Save the displayed data in various formats</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="80"/>
+ <source>Ctrl+S</source>
+ <translation type="unfinished">Ctrl+S</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="147"/>
+ <source>Save Statistics As</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="149"/>
+ <source>Plain text file (*.txt);;Comma separated values (*.csv);;XML document (*.xml);;YAML document (*.yaml)</source>
+ <translation type="unfinished">プレインテキストファイル (*.txt);;カンマ区切りテキストファイル (*.csv);;XML形式文章 (*.xml);;YAML形式文章 (*.yaml)</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="153"/>
+ <source>Plain text file (*.txt)</source>
+ <translation type="unfinished">プレインテキストファイル (*.txt)</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="195"/>
+ <source>Error saving file %1</source>
+ <translation type="unfinished">ファイル保存中エラー %1</translation>
+ </message>
+</context>
+<context>
<name>TimeShiftDialog</name>
<message>
<location filename="time_shift_dialog.ui" line="25"/>
diff --git a/ui/qt/wireshark_pl.qm b/ui/qt/wireshark_pl.qm
index e534f01c17..184bceab8c 100644
--- a/ui/qt/wireshark_pl.qm
+++ b/ui/qt/wireshark_pl.qm
Binary files differ
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index 77f96c5b51..7ae831bc0d 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -96,10 +96,25 @@
<translation>Kopiuj wiersze</translation>
</message>
<message>
- <location filename="bluetooth_att_server_attributes_dialog.cpp" line="138"/>
+ <location filename="bluetooth_att_server_attributes_dialog.ui" line="190"/>
<source>Copy All</source>
<translation>Kopiuj wszystko</translation>
</message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.ui" line="195"/>
+ <source>Save as image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.cpp" line="361"/>
+ <source>Save Table Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.cpp" line="363"/>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ByteViewTab</name>
@@ -1437,27 +1452,27 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
<message>
<location filename="display_filter_expression_dialog.ui" line="14"/>
<source>Dialog</source>
- <translation type="unfinished">Okno</translation>
+ <translation>Okno</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="24"/>
<source>Select a field to start building a display filter.</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz pole by zacząć tworzenie filtru wyświetlania.</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="27"/>
<source>Field Name</source>
- <translation type="unfinished">Nazwa pola</translation>
+ <translation>Nazwa pola</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="51"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search the list of field names.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Przeszukiwanie listy nazw pól.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="54"/>
<source>Search:</source>
- <translation type="unfinished">Szukaj:</translation>
+ <translation>Szukaj:</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="72"/>
@@ -1468,67 +1483,73 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
&lt;tr&gt;&lt;th&gt;contains, matches&lt;/th&gt;&lt;td&gt;Check the field against a string (contains) or a regular expression (matches)&lt;/td&gt;&lt;/tr&gt;
&lt;/tbody&gt;&lt;/table&gt;
&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Relacji można użyć by ograniczyć wyszukiwanie pól do wybranych ich wartości. Każda relacja posiada następujące właściwości:&lt;/p&gt;
+&lt;table&gt;&lt;tbody&gt;
+&lt;tr&gt;&lt;th&gt;ramka posiadająca to pole&lt;/th&gt;&lt;td&gt;Sprawdza każdy pakiet czy zawiera to pole&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;&lt;th&gt;==, !=, itd.&lt;/th&gt;&lt;td&gt;Porównuje wartość pola do zadanej wartości&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;&lt;th&gt;contains, matches&lt;/th&gt;&lt;td&gt;Sprawdza czy pole zawiera dany tekst (contains) lub spełnia dane wyrażenie regularne (matches)&lt;/td&gt;&lt;/tr&gt;
+&lt;/tbody&gt;&lt;/table&gt;
+&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="81"/>
<source>Relation</source>
- <translation type="unfinished"></translation>
+ <translation>Relacja</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="108"/>
<source>Match against this value.</source>
- <translation type="unfinished"></translation>
+ <translation>Porównuje z tą wartością.</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="111"/>
<source>Value</source>
- <translation type="unfinished">Wartość</translation>
+ <translation>Wartość</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="125"/>
<source>If the field you have selected has a known set of valid values they will be listed here.</source>
- <translation type="unfinished"></translation>
+ <translation>Jeśli pole, które wybrano ma znane wartości to będą tu wyświetlane.</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="128"/>
<source>Predefined Values</source>
- <translation type="unfinished"></translation>
+ <translation>Predefiniowane wartości</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="155"/>
<source>If the field you have selected covers a range of bytes (e.g. you have selected a protocol) you can restrict the match to a range of bytes here.</source>
- <translation type="unfinished"></translation>
+ <translation>Jeśli pole, które wybrano obejmuje zakres bajtów (np. wybrano protokół) to tutaj można ograniczyć porównywanie do pewnego zakresu bajtów.</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="158"/>
<source>Range (offset:length)</source>
- <translation type="unfinished"></translation>
+ <translation>Zakres (pozycja:długość)</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="177"/>
<source>No display filter</source>
- <translation type="unfinished">Brak filtru wyświetlania.</translation>
+ <translation>Brak filtru wyświetlania</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="184"/>
<source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
- <translation type="unfinished">&lt;small&gt;&lt;i&gt;Podpowiedź.&lt;/i&gt;&lt;/small&gt;</translation>
+ <translation>&lt;small&gt;&lt;i&gt;Podpowiedź.&lt;/i&gt;&lt;/small&gt;</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.cpp" line="70"/>
<source>Display Filter Expression</source>
- <translation type="unfinished"></translation>
+ <translation>Wyrażenie filtru wyświetlania</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.cpp" line="187"/>
<source>Select a field name to get started</source>
- <translation type="unfinished"></translation>
+ <translation>Wybierz nazwę pola by rozpocząć</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.cpp" line="191"/>
<source>Click OK to insert this filter</source>
- <translation type="unfinished"></translation>
+ <translation>Kliknij OK by dodać filtr</translation>
</message>
</context>
<context>
@@ -1915,88 +1936,92 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
<message>
<location filename="filter_dialog.ui" line="14"/>
<source>Dialog</source>
- <translation type="unfinished">Okno</translation>
+ <translation>Okno</translation>
</message>
<message>
<location filename="filter_dialog.ui" line="33"/>
<source>Name</source>
- <translation type="unfinished">Nazwa</translation>
+ <translation>Nazwa</translation>
</message>
<message>
<location filename="filter_dialog.ui" line="38"/>
<source>Filter</source>
- <translation type="unfinished">Filtr</translation>
+ <translation>Filtr</translation>
</message>
<message>
<location filename="filter_dialog.ui" line="48"/>
<source>Create a new profile using default settings.</source>
- <translation type="unfinished">Utwórz nowy profil używając ustawień domyślnych.</translation>
+ <translation>Utwórz nowy profil używając domyślnych ustawień.</translation>
</message>
<message>
<location filename="filter_dialog.ui" line="62"/>
<source>Remove this profile.</source>
- <translation type="unfinished">Usuń profil.</translation>
+ <translation>Usuń profil.</translation>
</message>
<message>
<location filename="filter_dialog.ui" line="73"/>
<source>Copy this profile.</source>
- <translation type="unfinished">Kopiuj ten profil.</translation>
+ <translation>Kopiuj profil.</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="73"/>
<source>Capture Filters</source>
- <translation type="unfinished"></translation>
+ <translation>Filtry przechwytywania</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="85"/>
<source>Display Filters</source>
- <translation type="unfinished"></translation>
+ <translation>Filtry wyświetlania</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="161"/>
<source>New capture filter</source>
<extracomment>This text is automatically filled in when a new filter is created</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Nowy filtr przechwytywania</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="165"/>
<source>New display filter</source>
<extracomment>This text is automatically filled in when a new filter is created</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Nowy filtr wyświetlania</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="210"/>
<source>Unable to create profile directory.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć katalogu profilu.</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="211"/>
<source>Unable to create directory
&quot;%1&quot;
for filter files: %2.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można utworzyć katalogu
+&quot;%1&quot;
+dla plików filtrów: %2.</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="225"/>
<source>Unable to save capture filter settings.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zapisać ustawień filtru przechwytywania.</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="226"/>
<source>Could not save to your capture filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zapisać do pliku filtrów przechwytywania
+&quot;%1&quot;:%2.</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="229"/>
<source>Unable to save display filter settings.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zapisać ustawień filtru wyświetlania.</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="230"/>
<source>Could not save to your display filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished"></translation>
+ <translation>Nie można zapisać do pliku filtrów wyświetlania
+&quot;%1&quot;:%2.</translation>
</message>
</context>
<context>
@@ -6807,17 +6832,17 @@ text-decoration: underline;
<message>
<location filename="main_window.ui" line="2332"/>
<source>&amp;Expression...</source>
- <translation type="unfinished"></translation>
+ <translation>Wyraż&amp;enie...</translation>
</message>
<message>
<location filename="main_window.ui" line="2335"/>
<source>Expression...</source>
- <translation type="unfinished"></translation>
+ <translation>Wyrażenie...</translation>
</message>
<message>
<location filename="main_window.ui" line="2338"/>
<source>Add an expression to the display filter.</source>
- <translation type="unfinished"></translation>
+ <translation>Dodaj wyrażenie do filtru wyświetlania.</translation>
</message>
<message>
<location filename="main_window.cpp" line="265"/>
@@ -7724,7 +7749,7 @@ Czy chcesz przełączyć format do &quot;Sekundy od początku przechywytania&quo
<translation>Utwórz nowy profil używając ustawień domyślnych.</translation>
</message>
<message>
- <location filename="profile_dialog.cpp" line="275"/>
+ <location filename="profile_dialog.cpp" line="276"/>
<source>Profile Error</source>
<translation>Błąd w profilu</translation>
</message>
@@ -9888,91 +9913,75 @@ Czy chcesz przełączyć format do &quot;Sekundy od początku przechywytania&quo
<context>
<name>StatsTreeDialog</name>
<message>
- <location filename="stats_tree_dialog.ui" line="14"/>
<source>Dialog</source>
- <translation>Okno</translation>
+ <translation type="vanished">Okno</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="31"/>
<source>Display filter:</source>
- <translation>Filtr:</translation>
+ <translation type="vanished">Filtr:</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="41"/>
<source>Regenerate statistics using this display filter</source>
- <translation>Wygeneruj statystyki używając filtru</translation>
+ <translation type="vanished">Wygeneruj statystyki używając filtru</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="44"/>
<source>Apply</source>
- <translation>Zastosuj</translation>
+ <translation type="vanished">Zastosuj</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="63"/>
- <location filename="stats_tree_dialog.cpp" line="97"/>
<source>Copy</source>
- <translation>Kopiuj</translation>
+ <translation type="vanished">Kopiuj</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="66"/>
<source>Copy a text representation of the tree to the clipboard</source>
- <translation>Kopiuj prezentację drzewa do schowka</translation>
+ <translation type="vanished">Kopiuj prezentację drzewa do schowka</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="69"/>
<source>Ctrl+C</source>
- <translation>Ctrl+C</translation>
+ <translation type="vanished">Ctrl+C</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="74"/>
- <location filename="stats_tree_dialog.cpp" line="100"/>
<source>Save as...</source>
- <translation>Zapisz jako...</translation>
+ <translation type="vanished">Zapisz jako...</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="77"/>
<source>Save the stats_tree data in various formats</source>
- <translation>Zapisz dane statystyk w formatach</translation>
+ <translation type="vanished">Zapisz dane statystyk w formatach</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="80"/>
<source>Ctrl+S</source>
- <translation>Ctrl+S</translation>
+ <translation type="vanished">Ctrl+S</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="87"/>
+ <location filename="stats_tree_dialog.cpp" line="69"/>
<source>Configuration not found</source>
<translation>Nie znaleziono konfiguracji</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="88"/>
+ <location filename="stats_tree_dialog.cpp" line="70"/>
<source>Unable to find configuration for %1.</source>
<translation>Nie można znaleźć konfiguracji dla %1.</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="156"/>
+ <location filename="stats_tree_dialog.cpp" line="149"/>
<source>%1 failed to attach to tap</source>
<translation>%1 nie można podłączyć do kanału komunikacyjnego</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="268"/>
<source>Save Statistics As</source>
- <translation>Zapisz statystyki jako</translation>
+ <translation type="vanished">Zapisz statystyki jako</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="270"/>
<source>Plain text file (*.txt);;Comma separated values (*.csv);;XML document (*.xml);;YAML document (*.yaml)</source>
- <translation>Plik tekstowy (*.c);; Wartości rozdzielane przecinkami (*.csv);; Dokument XML (*.xml);;Dokument YAML (*.yaml)</translation>
+ <translation type="vanished">Plik tekstowy (*.c);; Wartości rozdzielane przecinkami (*.csv);; Dokument XML (*.xml);;Dokument YAML (*.yaml)</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="274"/>
<source>Plain text file (*.txt)</source>
- <translation>Plik tekstowy (*.c)</translation>
+ <translation type="vanished">Plik tekstowy (*.c)</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="318"/>
<source>Error saving file %1</source>
- <translation>Błąd podczas zapisywania pliku %1</translation>
+ <translation type="vanished">Błąd podczas zapisywania pliku %1</translation>
</message>
</context>
<context>
@@ -10538,6 +10547,81 @@ Czy chcesz przełączyć format do &quot;Sekundy od początku przechywytania&quo
</message>
</context>
<context>
+ <name>TapParameterDialog</name>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="14"/>
+ <source>Dialog</source>
+ <translation type="unfinished">Okno</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="31"/>
+ <source>Display filter:</source>
+ <translation type="unfinished">Filtr:</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="41"/>
+ <source>Regenerate statistics using this display filter</source>
+ <translation type="unfinished">Wygeneruj statystyki używając filtru</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="44"/>
+ <source>Apply</source>
+ <translation type="unfinished">Zastosuj</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="63"/>
+ <location filename="tap_parameter_dialog.cpp" line="73"/>
+ <source>Copy</source>
+ <translation type="unfinished">Kopiuj</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="66"/>
+ <source>Copy a text representation of the tree to the clipboard</source>
+ <translation type="unfinished">Kopiuj prezentację drzewa do schowka</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="69"/>
+ <source>Ctrl+C</source>
+ <translation type="unfinished">Ctrl+C</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="74"/>
+ <location filename="tap_parameter_dialog.cpp" line="76"/>
+ <source>Save as...</source>
+ <translation type="unfinished">Zapisz jako...</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="77"/>
+ <source>Save the displayed data in various formats</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="80"/>
+ <source>Ctrl+S</source>
+ <translation type="unfinished">Ctrl+S</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="147"/>
+ <source>Save Statistics As</source>
+ <translation type="unfinished">Zapisz statystyki jako</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="149"/>
+ <source>Plain text file (*.txt);;Comma separated values (*.csv);;XML document (*.xml);;YAML document (*.yaml)</source>
+ <translation type="unfinished">Plik tekstowy (*.c);; Wartości rozdzielane przecinkami (*.csv);; Dokument XML (*.xml);;Dokument YAML (*.yaml)</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="153"/>
+ <source>Plain text file (*.txt)</source>
+ <translation type="unfinished">Plik tekstowy (*.c)</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="195"/>
+ <source>Error saving file %1</source>
+ <translation type="unfinished">Błąd podczas zapisywania pliku %1</translation>
+ </message>
+</context>
+<context>
<name>TimeShiftDialog</name>
<message>
<location filename="time_shift_dialog.ui" line="25"/>
diff --git a/ui/qt/wireshark_zh_CN.qm b/ui/qt/wireshark_zh_CN.qm
index 7cc3afad13..771cfe0bf1 100644
--- a/ui/qt/wireshark_zh_CN.qm
+++ b/ui/qt/wireshark_zh_CN.qm
Binary files differ
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 198736c85e..a460a82b34 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -96,10 +96,25 @@
<translation>复制行</translation>
</message>
<message>
- <location filename="bluetooth_att_server_attributes_dialog.cpp" line="138"/>
+ <location filename="bluetooth_att_server_attributes_dialog.ui" line="190"/>
<source>Copy All</source>
<translation>复制所有</translation>
</message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.ui" line="195"/>
+ <source>Save as image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.cpp" line="361"/>
+ <source>Save Table Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_att_server_attributes_dialog.cpp" line="363"/>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ByteViewTab</name>
@@ -1437,27 +1452,27 @@ PLEASE NOTE: One option MUST be selected.</source>
<message>
<location filename="display_filter_expression_dialog.ui" line="14"/>
<source>Dialog</source>
- <translation type="unfinished">对话框</translation>
+ <translation>对话框</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="24"/>
<source>Select a field to start building a display filter.</source>
- <translation type="unfinished"></translation>
+ <translation>选择一个字段以开始建立一个显示筛选器。</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="27"/>
<source>Field Name</source>
- <translation type="unfinished">字段名称</translation>
+ <translation>字段名称</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="51"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search the list of field names.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;搜索字段名称列表。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="54"/>
<source>Search:</source>
- <translation type="unfinished"></translation>
+ <translation>搜索:</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="72"/>
@@ -1468,67 +1483,73 @@ PLEASE NOTE: One option MUST be selected.</source>
&lt;tr&gt;&lt;th&gt;contains, matches&lt;/th&gt;&lt;td&gt;Check the field against a string (contains) or a regular expression (matches)&lt;/td&gt;&lt;/tr&gt;
&lt;/tbody&gt;&lt;/table&gt;
&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;“关系”可用于限定字段为指定的值。每项关系将执行下列操作：&lt;/p&gt;
+&lt;table&gt;&lt;tbody&gt;
+&lt;tr&gt;&lt;th&gt;目前在&lt;/th&gt;&lt;td&gt;匹配包含此字段的任何分组&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;&lt;th&gt;==、!= 等&lt;/th&gt;&lt;td&gt;在字段与指定值之间进行比较&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;&lt;th&gt;包含、匹配&lt;/th&gt;&lt;td&gt;检查该字段是否对应一个字符串（包含）或者正则表达式（匹配）&lt;/td&gt;&lt;/tr&gt;
+&lt;/tbody&gt;&lt;/table&gt;
+&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="81"/>
<source>Relation</source>
- <translation type="unfinished"></translation>
+ <translation>关系</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="108"/>
<source>Match against this value.</source>
- <translation type="unfinished"></translation>
+ <translation>匹配对应此值。</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="111"/>
<source>Value</source>
- <translation type="unfinished">值</translation>
+ <translation>值</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="125"/>
<source>If the field you have selected has a known set of valid values they will be listed here.</source>
- <translation type="unfinished"></translation>
+ <translation>如果您已选择的字段有一个已知的有效值的集，它将被在这里列出。</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="128"/>
<source>Predefined Values</source>
- <translation type="unfinished"></translation>
+ <translation>预定义的值</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="155"/>
<source>If the field you have selected covers a range of bytes (e.g. you have selected a protocol) you can restrict the match to a range of bytes here.</source>
- <translation type="unfinished"></translation>
+ <translation>如果您已选择的字段涵盖范围字节（例如您选择了一个协议），您可以在这里对匹配进行字节范围的限制。</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="158"/>
<source>Range (offset:length)</source>
- <translation type="unfinished"></translation>
+ <translation>范围 (偏移:长度)</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="177"/>
<source>No display filter</source>
- <translation type="unfinished">无显示过滤器</translation>
+ <translation>无显示筛选器</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="184"/>
<source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
- <translation type="unfinished">&lt;small&gt;&lt;i&gt;提示&lt;/i&gt;&lt;/small&gt;</translation>
+ <translation>&lt;small&gt;&lt;i&gt;提示&lt;/i&gt;&lt;/small&gt;</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.cpp" line="70"/>
<source>Display Filter Expression</source>
- <translation type="unfinished"></translation>
+ <translation>显示筛选器例外</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.cpp" line="187"/>
<source>Select a field name to get started</source>
- <translation type="unfinished"></translation>
+ <translation>选择一个字段名称以开始</translation>
</message>
<message>
<location filename="display_filter_expression_dialog.cpp" line="191"/>
<source>Click OK to insert this filter</source>
- <translation type="unfinished"></translation>
+ <translation>点击确定插入此筛选器</translation>
</message>
</context>
<context>
@@ -1915,88 +1936,92 @@ PLEASE NOTE: One option MUST be selected.</source>
<message>
<location filename="filter_dialog.ui" line="14"/>
<source>Dialog</source>
- <translation type="unfinished">对话框</translation>
+ <translation>对话框</translation>
</message>
<message>
<location filename="filter_dialog.ui" line="33"/>
<source>Name</source>
- <translation type="unfinished">名称</translation>
+ <translation>名称</translation>
</message>
<message>
<location filename="filter_dialog.ui" line="38"/>
<source>Filter</source>
- <translation type="unfinished">筛选器</translation>
+ <translation>筛选器</translation>
</message>
<message>
<location filename="filter_dialog.ui" line="48"/>
<source>Create a new profile using default settings.</source>
- <translation type="unfinished">用默认设置创建新的配置文件。</translation>
+ <translation>使用默认设置创建一个新的配置文件。</translation>
</message>
<message>
<location filename="filter_dialog.ui" line="62"/>
<source>Remove this profile.</source>
- <translation type="unfinished">移除该配置文件。</translation>
+ <translation>移除此配置文件。</translation>
</message>
<message>
<location filename="filter_dialog.ui" line="73"/>
<source>Copy this profile.</source>
- <translation type="unfinished">复制该配置文件。</translation>
+ <translation>复制此配置文件。</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="73"/>
<source>Capture Filters</source>
- <translation type="unfinished"></translation>
+ <translation>捕获筛选器</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="85"/>
<source>Display Filters</source>
- <translation type="unfinished"></translation>
+ <translation>显示筛选器</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="161"/>
<source>New capture filter</source>
<extracomment>This text is automatically filled in when a new filter is created</extracomment>
- <translation type="unfinished"></translation>
+ <translation>新建捕获筛选器</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="165"/>
<source>New display filter</source>
<extracomment>This text is automatically filled in when a new filter is created</extracomment>
- <translation type="unfinished"></translation>
+ <translation>新建显示筛选器</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="210"/>
<source>Unable to create profile directory.</source>
- <translation type="unfinished"></translation>
+ <translation>无法创建配置文件目录。</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="211"/>
<source>Unable to create directory
&quot;%1&quot;
for filter files: %2.</source>
- <translation type="unfinished"></translation>
+ <translation>无法创建目录
+“%1”
+为筛选器文件：%2。</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="225"/>
<source>Unable to save capture filter settings.</source>
- <translation type="unfinished"></translation>
+ <translation>无法保存捕获筛选器设置。</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="226"/>
<source>Could not save to your capture filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished"></translation>
+ <translation>未能保存您的捕获筛选器文件
+“%1”：%2。</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="229"/>
<source>Unable to save display filter settings.</source>
- <translation type="unfinished"></translation>
+ <translation>无法保存显示筛选器设置。</translation>
</message>
<message>
<location filename="filter_dialog.cpp" line="230"/>
<source>Could not save to your display filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished"></translation>
+ <translation>未能保存您的显示筛选器文件
+“%1”：%2。</translation>
</message>
</context>
<context>
@@ -6791,17 +6816,17 @@ text-decoration: underline;
<message>
<location filename="main_window.ui" line="2332"/>
<source>&amp;Expression...</source>
- <translation type="unfinished"></translation>
+ <translation>例外(&amp;E)...</translation>
</message>
<message>
<location filename="main_window.ui" line="2335"/>
<source>Expression...</source>
- <translation type="unfinished"></translation>
+ <translation>例外...</translation>
</message>
<message>
<location filename="main_window.ui" line="2338"/>
<source>Add an expression to the display filter.</source>
- <translation type="unfinished"></translation>
+ <translation>添加一个例外到显示筛选器。</translation>
</message>
<message>
<location filename="main_window.cpp" line="265"/>
@@ -7708,7 +7733,7 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
<translation>已存在该名称的配置文件。</translation>
</message>
<message>
- <location filename="profile_dialog.cpp" line="275"/>
+ <location filename="profile_dialog.cpp" line="276"/>
<source>Profile Error</source>
<translation>配置文件错误</translation>
</message>
@@ -9868,91 +9893,75 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
<context>
<name>StatsTreeDialog</name>
<message>
- <location filename="stats_tree_dialog.ui" line="14"/>
<source>Dialog</source>
- <translation>对话框</translation>
+ <translation type="vanished">对话框</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="31"/>
<source>Display filter:</source>
- <translation>显示筛选器：</translation>
+ <translation type="vanished">显示筛选器：</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="41"/>
<source>Regenerate statistics using this display filter</source>
- <translation>使用显示筛选器重新生成统计</translation>
+ <translation type="vanished">使用显示筛选器重新生成统计</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="44"/>
<source>Apply</source>
- <translation>应用</translation>
+ <translation type="vanished">应用</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="63"/>
- <location filename="stats_tree_dialog.cpp" line="97"/>
<source>Copy</source>
- <translation>复制</translation>
+ <translation type="vanished">复制</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="66"/>
<source>Copy a text representation of the tree to the clipboard</source>
- <translation>复制代表树的文本到剪贴板</translation>
+ <translation type="vanished">复制代表树的文本到剪贴板</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="69"/>
<source>Ctrl+C</source>
- <translation>Ctrl+C</translation>
+ <translation type="vanished">Ctrl+C</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="74"/>
- <location filename="stats_tree_dialog.cpp" line="100"/>
<source>Save as...</source>
- <translation>保存为...</translation>
+ <translation type="vanished">保存为...</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="77"/>
<source>Save the stats_tree data in various formats</source>
- <translation>使用不同的格式保存状态树数据</translation>
+ <translation type="vanished">使用不同的格式保存状态树数据</translation>
</message>
<message>
- <location filename="stats_tree_dialog.ui" line="80"/>
<source>Ctrl+S</source>
- <translation>Ctrl+S</translation>
+ <translation type="vanished">Ctrl+S</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="87"/>
+ <location filename="stats_tree_dialog.cpp" line="69"/>
<source>Configuration not found</source>
<translation>配置未找到</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="88"/>
+ <location filename="stats_tree_dialog.cpp" line="70"/>
<source>Unable to find configuration for %1.</source>
<translation>不能为 %1找到配置。</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="156"/>
+ <location filename="stats_tree_dialog.cpp" line="149"/>
<source>%1 failed to attach to tap</source>
<translation>%1 附加到tap失败</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="268"/>
<source>Save Statistics As</source>
- <translation>保存统计为</translation>
+ <translation type="vanished">保存统计为</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="270"/>
<source>Plain text file (*.txt);;Comma separated values (*.csv);;XML document (*.xml);;YAML document (*.yaml)</source>
- <translation>纯文本文件 (*.txt);;逗号分隔值 (*.csv);;XML 文档 (*.xml);;YAML 文档 (*.yaml)</translation>
+ <translation type="vanished">纯文本文件 (*.txt);;逗号分隔值 (*.csv);;XML 文档 (*.xml);;YAML 文档 (*.yaml)</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="274"/>
<source>Plain text file (*.txt)</source>
- <translation>纯文本文件 (*.txt)</translation>
+ <translation type="vanished">纯文本文件 (*.txt)</translation>
</message>
<message>
- <location filename="stats_tree_dialog.cpp" line="318"/>
<source>Error saving file %1</source>
- <translation>错误保存文件 %1</translation>
+ <translation type="vanished">错误保存文件 %1</translation>
</message>
</context>
<context>
@@ -10518,6 +10527,81 @@ Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</so
</message>
</context>
<context>
+ <name>TapParameterDialog</name>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="14"/>
+ <source>Dialog</source>
+ <translation type="unfinished">对话框</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="31"/>
+ <source>Display filter:</source>
+ <translation type="unfinished">显示筛选器：</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="41"/>
+ <source>Regenerate statistics using this display filter</source>
+ <translation type="unfinished">使用显示筛选器重新生成统计</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="44"/>
+ <source>Apply</source>
+ <translation type="unfinished">应用</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="63"/>
+ <location filename="tap_parameter_dialog.cpp" line="73"/>
+ <source>Copy</source>
+ <translation type="unfinished">复制</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="66"/>
+ <source>Copy a text representation of the tree to the clipboard</source>
+ <translation type="unfinished">复制代表树的文本到剪贴板</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="69"/>
+ <source>Ctrl+C</source>
+ <translation type="unfinished">Ctrl+C</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="74"/>
+ <location filename="tap_parameter_dialog.cpp" line="76"/>
+ <source>Save as...</source>
+ <translation type="unfinished">保存为...</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="77"/>
+ <source>Save the displayed data in various formats</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.ui" line="80"/>
+ <source>Ctrl+S</source>
+ <translation type="unfinished">Ctrl+S</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="147"/>
+ <source>Save Statistics As</source>
+ <translation type="unfinished">保存统计为</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="149"/>
+ <source>Plain text file (*.txt);;Comma separated values (*.csv);;XML document (*.xml);;YAML document (*.yaml)</source>
+ <translation type="unfinished">纯文本文件 (*.txt);;逗号分隔值 (*.csv);;XML 文档 (*.xml);;YAML 文档 (*.yaml)</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="153"/>
+ <source>Plain text file (*.txt)</source>
+ <translation type="unfinished">纯文本文件 (*.txt)</translation>
+ </message>
+ <message>
+ <location filename="tap_parameter_dialog.cpp" line="195"/>
+ <source>Error saving file %1</source>
+ <translation type="unfinished">错误保存文件 %1</translation>
+ </message>
+</context>
+<context>
<name>TimeShiftDialog</name>
<message>
<location filename="time_shift_dialog.ui" line="25"/>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 12:07:13 +0000