summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-07-03 08:07:30 -0700
committerGerald Combs <gerald@wireshark.org>2016-07-03 15:08:00 +0000
commit79fb9fdb4139045db728746feceb841ea33933df (patch)
tree91ff1d986b83164ff4f5f6068f081d3276e17a86
parentce52309e8bd7f651606f25fe0aa926fddf4dce0e (diff)
downloadwireshark-79fb9fdb4139045db728746feceb841ea33933df.tar.gz
[Automatic update for 2016-07-03]
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ie8e9bf51a9c25c6693597ba1109c221a111e3b58 Reviewed-on: https://code.wireshark.org/review/16264 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat
-rw-r--r--AUTHORS5
-rw-r--r--epan/dissectors/usb.c65
-rw-r--r--epan/enterprise-numbers142
-rw-r--r--epan/sminmpec.c35
-rw-r--r--manuf71
-rw-r--r--services9
-rw-r--r--ui/qt/wireshark_de.ts174
-rw-r--r--ui/qt/wireshark_en.ts182
-rw-r--r--ui/qt/wireshark_fr.ts174
-rw-r--r--ui/qt/wireshark_it.ts174
-rw-r--r--ui/qt/wireshark_ja_JP.ts174
-rw-r--r--ui/qt/wireshark_pl.ts174
-rw-r--r--ui/qt/wireshark_zh_CN.ts174
13 files changed, 949 insertions, 604 deletions
diff --git a/AUTHORS b/AUTHORS
index 1448b04ee7..c970c8e88c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3962,6 +3962,7 @@ Anthony Coddington <anthony.coddington[AT]endace.com>
Anton Thomasson <anton.thomasson[AT]ericsson.com>
Arnd Hannemann <arnd[AT]arndnet.de>
Artur Nowosielski <artnowo[AT]gmail.com>
+Ashish Shukla <shukla.a[AT]gmail.com>
Aurelien Aptel <aaptel[AT]suse.com>
Basil <addremover[AT]gmail.com>
Bastien Bailly <babassbailly[AT]free.fr>
@@ -3977,6 +3978,7 @@ Birol Capa <birol.capa[AT]siemens.com>
Bradford Boyle <bradford.d.boyle[AT]gmail.com>
Branislav Makan <branislav.makan1994[AT]gmail.com>
Britt McKinley <bmckinley[AT]sonusnet.com>
+Bruno Verstuyft <bruno.verstuyft[AT]excentis.com>
Carlos Velasco <carlos.velasco[AT]nimastelecom.com>
Cathy Yang <cathy.y.yang[AT]ericsson.com>
Cedric Izoard <cedric.izoard[AT]ceva-dsp.com>
@@ -4047,6 +4049,7 @@ Gregor Miernik <gregor.miernik[AT]hytec.de>
Guy Davies <aguydavies[AT]gmail.com>
Hanspeter Portner <dev[AT]open-music-kontrollers.ch>
Herwin Weststrate <herwin[AT]quarantainenet.nl>
+Hessam Jalali <hessam.jalali[AT]gmail.com>
Hiroaki KAWAI <hiroaki.kawai[AT]gmail.com>
IWASE Yusuke <iwase.yusuke0[AT]gmail.com>
Ignacio Martínez <ignacio.martinez.rivera[AT]gmail.com>
@@ -4254,9 +4257,11 @@ Zdeněk Žamberský <zzdevel[AT]seznam.cz>
anilkumar911 <anilkumar911[AT]gmail.com>
anonsvn <anonsvn[AT]localhost>
cff339 <cff339[AT]gmail.com>
+clairvoyant <joserubiovidales[AT]gmail.com>
dsrsupport <eugene.exarevsky[AT]dsr-company.com>
kardam <netkardam[AT]gmail.com>
kkoizumi <kkoizumi46[AT]gmail.com>
+sjha3 <sjha3[AT]ncsu.edu>
Øyvind Rønningstad <ronningstad[AT]gmail.com>
Дмитрий Цветцих <dmitrycvet[AT]gmail.com>
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 405e5c8879..80ff8b8b80 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -149,6 +149,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x0445, "Lucent Technologies, Inc." },
{ 0x0446, "NMB Technologies Corp." },
{ 0x0447, "Momentum Microsystems" },
+ { 0x0449, "Duta Multi Robotik" },
{ 0x044a, "Shamrock Tech. Co., Ltd" },
{ 0x044b, "WSI" },
{ 0x044c, "CCL/ITRI" },
@@ -3067,14 +3068,24 @@ static const value_string usb_products_vals[] = {
{ 0x03eb2109, "STK541 ZigBee Development Board" },
{ 0x03eb210d, "XPLAIN evaluation kit (CDC ACM)" },
{ 0x03eb2110, "AVR JTAGICE3 Debugger and Programmer" },
+ { 0x03eb2111, "Xplained Pro board debugger and programmer" },
{ 0x03eb2122, "XMEGA-A1 Explained evaluation kit" },
+ { 0x03eb2140, "AVR JTAGICE3 (v3.x) Debugger and Programmer" },
{ 0x03eb2141, "ICE debugger" },
{ 0x03eb2310, "EVK11xx evaluation board" },
{ 0x03eb2fe4, "ATxmega32A4U DFU bootloader" },
{ 0x03eb2fe6, "Cactus V6 (DFU)" },
{ 0x03eb2fea, "Cactus RF60 (DFU)" },
+ { 0x03eb2fee, "atmega8u2 DFU bootloader" },
+ { 0x03eb2fef, "atmega16u2 DFU bootloader" },
{ 0x03eb2ff0, "atmega32u2 DFU bootloader" },
+ { 0x03eb2ff1, "at32uc3a3 DFU bootloader" },
+ { 0x03eb2ff3, "atmega16u4 DFU bootloader" },
{ 0x03eb2ff4, "atmega32u4 DFU bootloader" },
+ { 0x03eb2ff6, "at32uc3b0/1 DFU bootloader" },
+ { 0x03eb2ff7, "at90usb82 DFU bootloader" },
+ { 0x03eb2ff8, "at32uc3a0/1 DFU bootloader" },
+ { 0x03eb2ff9, "at90usb646/647 DFU bootloader" },
{ 0x03eb2ffa, "at90usb162 DFU bootloader" },
{ 0x03eb2ffb, "at90usb AVR DFU bootloader" },
{ 0x03eb2ffd, "at89c5130/c5131 DFU bootloader" },
@@ -3203,6 +3214,7 @@ static const value_string usb_products_vals[] = {
{ 0x03f00c24, "Bluetooth Dongle" },
{ 0x03f00d12, "OfficeJet 9100 series" },
{ 0x03f00d17, "LaserJet 1012" },
+ { 0x03f00d4a, "SK-2025 Keyboard" },
{ 0x03f00e17, "LaserJet 1015" },
{ 0x03f00f0c, "Wireless Keyboard and Optical Mouse receiver" },
{ 0x03f00f11, "OfficeJet V40" },
@@ -3218,6 +3230,7 @@ static const value_string usb_products_vals[] = {
{ 0x03f01017, "LaserJet 1300" },
{ 0x03f01024, "Smart Card Keyboard" },
{ 0x03f01027, "Virtual keyboard and mouse" },
+ { 0x03f0102a, "LaserJet Professional P 1102w" },
{ 0x03f01102, "PhotoSmart 240 series" },
{ 0x03f01104, "DeskJet 959c" },
{ 0x03f01105, "ScanJet 5470c/5490c" },
@@ -3363,7 +3376,7 @@ static const value_string usb_products_vals[] = {
{ 0x03f02e17, "LaserJet 2600n" },
{ 0x03f02e24, "LP2275w Monitor Hub" },
{ 0x03f02f11, "PSC 1200" },
- { 0x03f02f17, "EWS 2605dn" },
+ { 0x03f02f17, "Color LaserJet 2605dn" },
{ 0x03f02f24, "LP2475w Monitor Hub" },
{ 0x03f03002, "PhotoSmart P1000" },
{ 0x03f03004, "DeskJet 980c" },
@@ -3381,6 +3394,7 @@ static const value_string usb_products_vals[] = {
{ 0x03f03217, "LaserJet 3050" },
{ 0x03f03302, "PhotoSmart 1218" },
{ 0x03f03304, "DeskJet 990c" },
+ { 0x03f03307, "v125w Stick" },
{ 0x03f03312, "OfficeJet J6410" },
{ 0x03f03317, "LaserJet 3052" },
{ 0x03f03402, "PhotoSmart 1115" },
@@ -3470,6 +3484,7 @@ static const value_string usb_products_vals[] = {
{ 0x03f05717, "LaserJet M1120n MFP" },
{ 0x03f05811, "PhotoSmart C5100 series" },
{ 0x03f05817, "LaserJet M1319f MFP" },
+ { 0x03f0581d, "lt4112 Gobi 4G Module Network Device" },
{ 0x03f05911, "PhotoSmart C6180" },
{ 0x03f05912, "Officejet Pro 8600" },
{ 0x03f05a11, "PhotoSmart C7100 series" },
@@ -4207,6 +4222,7 @@ static const value_string usb_products_vals[] = {
{ 0x041e3060, "Sound Blaster Audigy 2 ZS External" },
{ 0x041e3061, "SoundBlaster Audigy 2 ZS Video Editor" },
{ 0x041e3090, "Sound Blaster Digital Music SX" },
+ { 0x041e30d0, "Xmod" },
{ 0x041e30d3, "Sound Blaster Play!" },
{ 0x041e3100, "IR Receiver (SB0540)" },
{ 0x041e3121, "WoW tap chat" },
@@ -4215,6 +4231,7 @@ static const value_string usb_products_vals[] = {
{ 0x041e3f02, "E-Mu 0202" },
{ 0x041e3f04, "E-Mu 0404" },
{ 0x041e3f07, "E-Mu Xmidi 1x1" },
+ { 0x041e3f0e, "Xmidi 1x1 Tab" },
{ 0x041e4003, "VideoBlaster Webcam Go Plus [W9967CF]" },
{ 0x041e4004, "Nomad II MG" },
{ 0x041e4005, "Webcam Blaster Go ES" },
@@ -4275,6 +4292,7 @@ static const value_string usb_products_vals[] = {
{ 0x041e4087, "Live! Cam Socialize HD 1080 [VF0680]" },
{ 0x041e4088, "Live! Cam Chat HD [VF0700]" },
{ 0x041e4095, "Live! Cam Sync HD [VF0770]" },
+ { 0x041e4097, "Live! Cam Chat HD [VF0700]" },
{ 0x041e4100, "Nomad Jukebox 2" },
{ 0x041e4101, "Nomad Jukebox 3" },
{ 0x041e4102, "NOMAD MuVo^2" },
@@ -4498,6 +4516,7 @@ static const value_string usb_products_vals[] = {
{ 0x04210610, "CS-15 (Internet Stick 3G modem)" },
{ 0x04210661, "Lumia 620/920" },
{ 0x0421069a, "130 [RM-1035] (Charging only)" },
+ { 0x042106fc, "Lumia 640 Phone" },
{ 0x04210720, "X (RM-980)" },
{ 0x04210800, "Connectivity Cable DKU-5" },
{ 0x04210801, "Data Cable DKU-6" },
@@ -4514,6 +4533,7 @@ static const value_string usb_products_vals[] = {
{ 0x0423030a, "PETracer x1" },
{ 0x04231237, "Andromeda Hub" },
{ 0x04240001, "Integrated Hub" },
+ { 0x04240140, "LPC47M14x hub" },
{ 0x04240acd, "Sitecom Internal Multi Memory reader/writer MD-005" },
{ 0x04240fdc, "Floppy" },
{ 0x042410cd, "Sitecom Internal Multi Memory reader/writer MD-005" },
@@ -4541,6 +4561,7 @@ static const value_string usb_products_vals[] = {
{ 0x04247500, "LAN7500 Ethernet 10/100/1000 Adapter" },
{ 0x04249512, "SMC9512/9514 USB Hub" },
{ 0x04249514, "SMC9514 Hub" },
+ { 0x04249904, "LAN9512/LAN9514 Ethernet 10/100 Adapter (SAL10)" },
{ 0x0424a700, "2 Port Hub" },
{ 0x0424ec00, "SMSC9512/9514 Fast Ethernet Adapter" },
{ 0x04250101, "G-Tech Wireless Mouse & Keyboard" },
@@ -4565,6 +4586,7 @@ static const value_string usb_products_vals[] = {
{ 0x0430a4a2, "Ethernet (RNDIS and CDC ethernet)" },
{ 0x0430cdab, "Raritan KVM dongle" },
{ 0x04310100, "Mouse-Trak 3-button Track Ball" },
+ { 0x04320031, "Document Processor" },
{ 0x04331101, "IBM Game Controller" },
{ 0x0433abab, "Keyboard" },
{ 0x04360005, "CameraMate (DPCM_USB)" },
@@ -4737,6 +4759,9 @@ static const value_string usb_products_vals[] = {
{ 0x0443002e, "Millennium Keyboard" },
{ 0x04466781, "Keyboard with PS/2 Mouse Port" },
{ 0x04466782, "Keyboard" },
+ { 0x04490128, "Menengah" },
+ { 0x04490210, "Dasar" },
+ { 0x04490612, "Lanjutan" },
{ 0x044e1104, "Japanese Keyboard" },
{ 0x044e2002, "MD-5500 Printer" },
{ 0x044e2014, "Bluetooth Device" },
@@ -4794,7 +4819,9 @@ static const value_string usb_products_vals[] = {
{ 0x04516060, "RNDIS/BeWAN ADSL2+" },
{ 0x04516070, "RNDIS/BeWAN ADSL2+" },
{ 0x0451625f, "TUSB6250 ATA Bridge" },
+ { 0x04518041, "Hub" },
{ 0x04518042, "Hub" },
+ { 0x04518043, "Hub" },
{ 0x04518142, "TUSB8041 4-Port Hub" },
{ 0x0451926b, "TUSB9260 Boot Loader" },
{ 0x0451dbc0, "Device Bay Controller" },
@@ -5030,7 +5057,7 @@ static const value_string usb_products_vals[] = {
{ 0x045e00f8, "LifeCam NX-6000" },
{ 0x045e00f9, "Wireless Desktop Receiver 3.1" },
{ 0x045e0202, "Xbox Controller" },
- { 0x045e0280, "XBox Device" },
+ { 0x045e0280, "Xbox Memory Unit (8MB)" },
{ 0x045e0283, "Xbox Communicator" },
{ 0x045e0284, "Xbox DVD Playback Kit" },
{ 0x045e0285, "Xbox Controller S" },
@@ -5052,12 +5079,13 @@ static const value_string usb_products_vals[] = {
{ 0x045e02ad, "Xbox NUI Audio" },
{ 0x045e02ae, "Xbox NUI Camera" },
{ 0x045e02b0, "Xbox NUI Motor" },
- { 0x045e02b6, "Xbox 360 / Bluetooth Wireless Headset" },
+ { 0x045e02b6, "Xbox360 Bluetooth Wireless Headset" },
{ 0x045e02be, "Kinect for Windows NUI Audio" },
{ 0x045e02bf, "Kinect for Windows NUI Camera" },
{ 0x045e02c2, "Kinect for Windows NUI Motor" },
- { 0x045e02d1, "XBOX One Controller for Windows" },
+ { 0x045e02d1, "Xbox One Controller" },
{ 0x045e02d5, "Xbox One Digital TV Tuner" },
+ { 0x045e02dd, "Xbox One Controller (Covert Forces/Firmware 2015)" },
{ 0x045e0400, "Windows Powered Pocket PC 2002" },
{ 0x045e0401, "Windows Powered Pocket PC 2002" },
{ 0x045e0402, "Windows Powered Pocket PC 2002" },
@@ -5441,6 +5469,8 @@ static const value_string usb_products_vals[] = {
{ 0x046d0a0b, "ClearChat Pro USB" },
{ 0x046d0a0c, "Clear Chat Comfort USB Headset" },
{ 0x046d0a13, "Z-5 Speakers" },
+ { 0x046d0a14, "USB Headset" },
+ { 0x046d0a15, "G35 Headset" },
{ 0x046d0a17, "G330 Headset" },
{ 0x046d0a1f, "G930" },
{ 0x046d0a29, "H600 [Wireless Headset]" },
@@ -5520,8 +5550,10 @@ static const value_string usb_products_vals[] = {
{ 0x046dc06c, "Optical Mouse" },
{ 0x046dc077, "M105 Optical Mouse" },
{ 0x046dc07c, "M-R0017 [G700s Rechargeable Gaming Mouse]" },
+ { 0x046dc07d, "G502 Mouse" },
+ { 0x046dc07e, "G402 Gaming Mouse" },
{ 0x046dc101, "UltraX Media Remote" },
- { 0x046dc110, "Harmony 785/885 Remote" },
+ { 0x046dc110, "Harmony 785/880/885 Remote" },
{ 0x046dc111, "Harmony 525 Remote" },
{ 0x046dc112, "Harmony 890 Remote" },
{ 0x046dc11f, "Harmony 900/1100 Remote" },
@@ -5951,13 +5983,16 @@ static const value_string usb_products_vals[] = {
{ 0x0480a007, "External Disk USB 3.0" },
{ 0x0480a009, "Stor.E Basics" },
{ 0x0480a00d, "STOR.E BASICS 500GB" },
+ { 0x0480a100, "Canvio Alu 2TB 2.5\" Black External Disk Model HDTH320EK3CA" },
{ 0x0480a202, "Canvio Basics HDD" },
+ { 0x0480a208, "Canvio Basics 2TB USB 3.0 Portable Hard Drive" },
{ 0x0480b001, "Stor.E Partner" },
{ 0x0480d000, "External Disk 2TB Model DT01ABA200" },
{ 0x0480d010, "External Disk 3TB" },
{ 0x0480d011, "Canvio Desk" },
{ 0x0482000e, "FS-1020D Printer" },
{ 0x0482000f, "FS-1920 Mono Printer" },
+ { 0x04820015, "FS-1030D printer" },
{ 0x04820100, "Finecam S3x" },
{ 0x04820101, "Finecam S4" },
{ 0x04820103, "Finecam S5" },
@@ -5976,11 +6011,10 @@ static const value_string usb_products_vals[] = {
{ 0x04832017, "Biometric Smart Card Reader" },
{ 0x04832018, "BioSimKey" },
{ 0x04832302, "Portable Flash Device (PFD)" },
- { 0x0483347b, "ST-LINK/V2-1" },
- { 0x04833744, "STLINK Pseudo disk" },
+ { 0x04833744, "ST-LINK/V1" },
{ 0x04833747, "ST Micro Connect Lite" },
{ 0x04833748, "ST-LINK/V2" },
- { 0x0483374b, "ST-LINK/V2.1 (Nucleo-F103RB)" },
+ { 0x0483374b, "ST-LINK/V2.1" },
{ 0x04834810, "ISDN adapter" },
{ 0x0483481d, "BT Digital Access adapter" },
{ 0x04835000, "ST Micro/Ergenic ERG BT-002 Bluetooth Adapter" },
@@ -6321,6 +6355,7 @@ static const value_string usb_products_vals[] = {
{ 0x04a910b6, "PIXMA iP4300 Printer" },
{ 0x04a910c2, "PIXMA iP1800 Printer" },
{ 0x04a910c4, "Pixma iP4500 Printer" },
+ { 0x04a910c9, "PIXIMA iP4600 Printer" },
{ 0x04a91404, "W6400PG" },
{ 0x04a91405, "W8400PG" },
{ 0x04a9150f, "BIJ2350 PCL" },
@@ -6379,6 +6414,7 @@ static const value_string usb_products_vals[] = {
{ 0x04a9190a, "CanoScan LiDE 210" },
{ 0x04a9190d, "CanoScan 9000F Mark II" },
{ 0x04a9190e, "CanoScan LiDE 120" },
+ { 0x04a9190f, "CanoScan LiDE 220" },
{ 0x04a92200, "CanoScan LiDE 25" },
{ 0x04a92201, "CanoScan FB320U" },
{ 0x04a92202, "CanoScan FB620U" },
@@ -6447,6 +6483,7 @@ static const value_string usb_products_vals[] = {
{ 0x04a92650, "iR 6800C EUR" },
{ 0x04a92651, "iR 3100C EUR" },
{ 0x04a92655, "FP-L170/MF350/L380/L398" },
+ { 0x04a92656, "iR1510-1670 CAPT Printer" },
{ 0x04a92659, "MF8100" },
{ 0x04a9265b, "CAPT Printer" },
{ 0x04a9265c, "iR C3220" },
@@ -6794,10 +6831,13 @@ static const value_string usb_products_vals[] = {
{ 0x04a9329a, "PowerShot SX60 HS" },
{ 0x04a9329b, "PowerShot SX520 HS" },
{ 0x04a9329c, "PowerShot SX400 IS" },
+ { 0x04a9329d, "PowerShot G7 X" },
{ 0x04a9329f, "PowerShot SX530 HS" },
{ 0x04a932a6, "PowerShot SX710 HS" },
{ 0x04a932aa, "Powershot ELPH 160 / IXUS 160" },
{ 0x04a932ac, "PowerShot ELPH 170 IS / IXUS 170" },
+ { 0x04a932ad, "PowerShot SX410 IS" },
+ { 0x04a932c1, "PowerShot ELPH 180 / IXUS 175" },
{ 0x04ad2501, "Bluetooth Device" },
{ 0x04b00102, "Coolpix 990" },
{ 0x04b00103, "Coolpix 880" },
@@ -7008,6 +7048,7 @@ static const value_string usb_products_vals[] = {
{ 0x04b4f000, "CY30700 Licorice evaluation board" },
{ 0x04b4f111, "CY8CKIT-002 PSoC MiniProg3 Rev A Program and debug kit" },
{ 0x04b4f115, "PSoC FirstTouch Programmer" },
+ { 0x04b4f232, "Mono embedded computer" },
{ 0x04b4fd13, "Programmable power socket" },
{ 0x04b53064, "Hantek DSO-3064" },
{ 0x04b80001, "Stylus Color 740 / Photo 750" },
@@ -7301,10 +7342,11 @@ static const value_string usb_products_vals[] = {
{ 0x04ca1766, "HID Monitor Controls" },
{ 0x04ca2004, "Bluetooth 4.0 [Broadcom BCM20702A0]" },
{ 0x04ca2006, "Broadcom BCM43142A0 Bluetooth Device" },
+ { 0x04ca3005, "Atheros Bluetooth" },
{ 0x04ca300b, "Atheros AR3012 Bluetooth" },
{ 0x04ca300d, "Atheros AR3012 Bluetooth" },
{ 0x04ca300f, "Atheros AR3012 Bluetooth" },
- { 0x04ca3014, "Qualcoom Atheros Bluetooth" },
+ { 0x04ca3014, "Qualcomm Atheros Bluetooth" },
{ 0x04ca7025, "HP HD Webcam" },
{ 0x04ca7046, "TOSHIBA Web Camera - HD" },
{ 0x04ca9304, "Hub" },
@@ -7490,6 +7532,7 @@ static const value_string usb_products_vals[] = {
{ 0x04d91503, "Keyboard" },
{ 0x04d91603, "Keyboard" },
{ 0x04d91702, "Keyboard LKS02" },
+ { 0x04d91818, "Keyboard [Diatec Filco Majestouch 2]" },
{ 0x04d92011, "Keyboard [Diatec Filco Majestouch 1]" },
{ 0x04d92013, "Keyboard [Das Keyboard]" },
{ 0x04d92221, "Keyboard" },
@@ -7497,6 +7540,7 @@ static const value_string usb_products_vals[] = {
{ 0x04d92519, "Shenzhen LogoTech 2.4GHz receiver" },
{ 0x04d92832, "HT82A832R Audio MCU" },
{ 0x04d92834, "HT82A834R Audio MCU" },
+ { 0x04d9a01c, "wireless multimedia keyboard with trackball [Trust ADURA 17911]" },
{ 0x04d9a055, "Keyboard" },
{ 0x04da0901, "LS-120 Camera" },
{ 0x04da0912, "SDR-S10" },
@@ -7835,6 +7879,7 @@ static const value_string usb_products_vals[] = {
{ 0x04e86125, "D3 Station External Hard Drive" },
{ 0x04e861b5, "M3 Portable Hard Drive 2TB" },
{ 0x04e861b6, "M3 Portable Hard Drive 1TB" },
+ { 0x04e861f3, "MU-PT500B [T3 500GB USB SSD]" },
{ 0x04e86601, "Mobile Phone" },
{ 0x04e86602, "Galaxy" },
{ 0x04e86603, "Galaxy" },
@@ -8539,6 +8584,7 @@ static const value_string usb_products_vals[] = {
{ 0x04fc0538, "Wireless Optical Mouse 2.4G [Bright]" },
{ 0x04fc0561, "Flexcam 100" },
{ 0x04fc05d8, "Wireless keyboard/mouse" },
+ { 0x04fc05da, "SPEEDLINK SNAPPY Wireless Mouse Nano" },
{ 0x04fc0c15, "SPIF215A SATA bridge" },
{ 0x04fc0c25, "SATALink SPIF225A" },
{ 0x04fc1528, "SPCA1527A/SPCA1528 SD card camera (webcam mode)" },
@@ -16569,7 +16615,6 @@ static const value_string usb_products_vals[] = {
{ 0x15180001, "HDReye High Dynamic Range Camera" },
{ 0x15180002, "HDReye (before firmware loads)" },
{ 0x15190020, "HSIC Device" },
- { 0x15190443, "Telit LN930" },
{ 0x15246680, "UTS 6680" },
{ 0x15270200, "YAP Phone (no firmware)" },
{ 0x15270201, "YAP Phone" },
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 2c1d39f298..8c50974cc7 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2016-06-24)
+(last updated 2016-07-03)
SMI Network Management Private Enterprise Codes:
@@ -21166,9 +21166,9 @@ Decimal
Lousseief Abdelwahab
aloussei&transtec.de
5299
- AUDEMAT
+ WorldCast Systems (formerly 'AUDEMAT")
Frederick Pannier
- technic&audemat.com
+ ciracq&worldcastsystems.com
5300
Jetstream Communications
Gene Yao
@@ -161022,7 +161022,7 @@ Decentralization / Helenic Public Administra
40360
IP Total Software S.A
Andrés Ortiz
- julian.ortiz&iptotal.com
+ infraestructura&iptotal.com
40361
Xenya d.o.o.
Peter Reinhardt
@@ -169109,7 +169109,7 @@ Decentralization / Helenic Public Administra
bbp.administrator&epfl.ch
42382
iSystems e.U.
- Peter Danzmayr
+ Jenny Danzmayr
iana&isystems.at
42383
Horizon Fuel Cell Technologies
@@ -191907,6 +191907,138 @@ Decentralization / Helenic Public Administra
Max Planck Institute for Plant Breeding Research
Andreas Hoffmann
iana&mpipz.mpg.de
+48082
+ Stromnetz Hamburg GmbH
+ Matthias Brasch
+ Matthias.Brasch&stromnetz-hamburg.de
+48083
+ AIRESERVICES
+ Bruno LE TUAL
+ technique&aireservices.com
+48084
+ Stewart Investors
+ Peter Lyttle
+ peter.lyttle&firststate.co.uk
+48085
+ RCCA COMMUNITY HEMATOLOGY ONOCOLGY
+ BETH SHAW
+ BSHAW&CHOP-MD.COM
+48086
+ Helicon Opleidingen
+ Alex Peeters
+ aut.bb&helicon.nl
+48087
+ Troup County School System
+ Gary Stansbury
+ admin&troup.org
+48088
+ Instituto Superior de Economia e Gestão
+ Raul Bras
+ rbras&iseg.ulisboa.pt
+48089
+ Rådgivende Ingeniør Per Dypvik AS
+ Per Dypvik
+ per&energea.no
+48090
+ Nord/LB Luxembourg S.A. Covered Bond Bank
+ Juergen Koehnen
+ juergen.koehnen&nordlb.lu
+48091
+ Sicss Society
+ Haochen Xie
+ haochenx&acm.org
+48092
+ qi2
+ Laurent Cambou
+ qi2.info&free.fr
+48093
+ Aptomar AS
+ Morten Espeland
+ morten.espeland&aptomar.com
+48094
+ White Star Petroleum
+ Joshua Shackeford
+ Joshua.Shackelford&wstr.com
+48095
+ Stadler Pankow GmbH
+ André Orpel
+ Andre.Orpel&stadlerrail.de
+48096
+ jedernet GmbH
+ Pete Inhofer
+ ldap&jedernet.de
+48097
+ RAYAPHONE
+ Mahdi Mohammad Hossaini
+ info&rayaphone.com
+48098
+ EBPI BV
+ Martijn van Buijtene
+ martijn.van.buijtene&ebpi.nl
+48099
+ Redgate Software
+ Ben Emmett
+ ben.emmett&red-gate.com
+48100
+ Orca Technologies
+ Gary Geil
+ sales&orcatechnologies.com
+48101
+ Systech International
+ Robert Phillips
+ bob.phillips&systechone.com
+48102
+ DARTY
+ Jonas BARROZO
+ jonas.barrozo&darty.fr
+48103
+ Executive Weather Corporation
+ Amy M. Fincher
+ amy&executiveweather.com
+48104
+ example.cz
+ Alice Vixie
+ example&email.cz
+48105
+ Sky Puzzle Ltd.
+ Zdenko Marincic
+ info&sky-puzzle.com
+48106
+ Skami Programming
+ Karn Kallio
+ kkallio&skami.org
+48107
+ Equidome
+ Turpin Olivier
+ turpin_olivier&orange.fr
+48108
+ 9DOT
+ Alessandro Campanella
+ a.campanella&9dot.it
+48109
+ WishCert
+ HyunjaeYoo
+ y9769852&gmail.com
+48110
+ Universite de Rouen Normandie
+ Cedric HOUSSIER
+ cedric.houssier&univ-rouen.fr
+48111
+ AMD Distribution sp.z o.o.
+ Marcin Cichocki
+ m.cichocki&amdd.pl
+48112
+ AZCOM Technology s.r.l.
+ Stefano Gandini
+ stefano.gandini&azcom.it
+48113
+ Rabian Inc.
+ Adrien Rabian
+ admin&rabian.fr
+48114
+ Solutionbase Ltd
+ Kevin Golding
+ kgolding&solutionbase.co.uk
End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index a73998152d..41c050f889 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -5319,7 +5319,7 @@ const value_string sminmpec_values[] = {
{ 5296, "IPCell Technologies, Inc." },
{ 5297, "Baxworks, Inc." },
{ 5298, "xputer.com" },
- { 5299, "AUDEMAT" },
+ { 5299, "WorldCast Systems (formerly 'AUDEMAT\")" },
{ 5300, "Jetstream Communications" },
{ 5301, "PentaSafe, Inc." },
{ 5302, "Advanced Health Technologies" },
@@ -48102,6 +48102,39 @@ const value_string sminmpec_values[] = {
{ 48079, "NEC Enterprise Communication Technologies" },
{ 48080, "Mimetrix Design Group" },
{ 48081, "Max Planck Institute for Plant Breeding Research" },
+ { 48082, "Stromnetz Hamburg GmbH" },
+ { 48083, "AIRESERVICES" },
+ { 48084, "Stewart Investors" },
+ { 48085, "RCCA COMMUNITY HEMATOLOGY ONOCOLGY" },
+ { 48086, "Helicon Opleidingen" },
+ { 48087, "Troup County School System" },
+ { 48088, "Instituto Superior de Economia e Gest\0303\0243o" },
+ { 48089, "R\0303\0245dgivende Ingeni\0303\0270r Per Dypvik AS" },
+ { 48090, "Nord/LB Luxembourg S.A. Covered Bond Bank" },
+ { 48091, "Sicss Society" },
+ { 48092, "qi2" },
+ { 48093, "Aptomar AS" },
+ { 48094, "White Star Petroleum" },
+ { 48095, "Stadler Pankow GmbH" },
+ { 48096, "jedernet GmbH" },
+ { 48097, "RAYAPHONE" },
+ { 48098, "EBPI BV" },
+ { 48099, "Redgate Software" },
+ { 48100, "Orca Technologies" },
+ { 48101, "Systech International" },
+ { 48102, "DARTY" },
+ { 48103, "Executive Weather Corporation" },
+ { 48104, "example.cz" },
+ { 48105, "Sky Puzzle Ltd." },
+ { 48106, "Skami Programming" },
+ { 48107, "Equidome" },
+ { 48108, "9DOT" },
+ { 48109, "WishCert" },
+ { 48110, "Universite de Rouen Normandie" },
+ { 48111, "AMD Distribution sp.z o.o." },
+ { 48112, "AZCOM Technology s.r.l." },
+ { 48113, "Rabian Inc." },
+ { 48114, "Solutionbase Ltd" },
{ 0, NULL}
};
diff --git a/manuf b/manuf
index 7c96681a08..9bc9cf5444 100644
--- a/manuf
+++ b/manuf
@@ -1127,7 +1127,7 @@
00:04:32 VoyetraT # Voyetra Turtle Beach, Inc.
00:04:33 Cyberboa # Cyberboard A/S
00:04:34 Accelent # Accelent Systems, Inc.
-00:04:35 ComptekI # Comptek International, Inc.
+00:04:35 InfinetL # InfiNet LLC
00:04:36 ElansatT # ELANsat Technologies, Inc.
00:04:37 PowinInf # Powin Information Technology, Inc.
00:04:38 NortelNe # Nortel Networks
@@ -8077,7 +8077,7 @@
00:1E:AB Telewell # TeleWell Oy
00:1E:AC Armadeus # Armadeus Systems
00:1E:AD Wingtech # Wingtech Group Limited
-00:1E:AE Continen # Continental Automotive Systems
+00:1E:AE Continen # Continental Automotive Systems Inc.
00:1E:AF OphirOpt # Ophir Optronics Ltd
00:1E:B0 ImesdEle # ImesD Electronica S.L.
00:1E:B1 Cryptsof # Cryptsoft Pty Ltd
@@ -15695,6 +15695,7 @@
00:81:C4 CiscoInc # Cisco Systems, Inc
00:84:ED Private # Private
00:86:A0 Private # Private
+00:87:01 SamsungE # Samsung Electronics Co.,Ltd
00:87:31 CiscoInc # Cisco Systems, Inc
00:88:65 Apple # Apple, Inc.
00:8A:96 CiscoInc # Cisco Systems, Inc
@@ -16273,7 +16274,7 @@
00:B0:B3 Xstreami # XSTREAMIS PLC
00:B0:C2 CiscoInc # Cisco Systems, Inc
00:B0:C7 TellabsO # Tellabs Operations, Inc.
-00:B0:CE Technolo # TECHNOLOGY RESCUE
+00:B0:CE ViverisT # Viveris Technologies
00:B0:D0 Dell # Dell Inc.
00:B0:DB Nextcell # Nextcell, Inc.
00:B0:DF Starboar # Starboard Storage Systems
@@ -17718,7 +17719,7 @@
0C:EE:E6 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
0C:EF:7C AnacomIn # AnaCom Inc
0C:EF:AF IeeeRegi # IEEE Registration Authority
-0C:EF:AF:00:00:00/28 Assureli # Assurelink
+0C:EF:AF:00:00:00/28 Kenmore # Kenmore
0C:EF:AF:10:00:00/28 Goerlitz # Goerlitz AG
0C:EF:AF:20:00:00/28 LumelSA # LUMEL S.A.
0C:EF:AF:30:00:00/28 Engineer # Engineering Center ENERGOSERVICE
@@ -18192,6 +18193,7 @@
18:D6:CF KurthEle # Kurth Electronic GmbH
18:D9:49 QvisLabs # Qvis Labs, LLC
18:DC:56 YulongCo # Yulong Computer Telecommunication Scientific (Shenzhen) Co.,Ltd
+18:DE:D7 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
18:E2:88 SttCondi # STT Condigi
18:E2:C2 SamsungE # Samsung Electronics Co.,Ltd
18:E3:BC TctMobil # TCT mobile ltd
@@ -18246,6 +18248,7 @@
1C:21:D1:D0:00:00/28 Liscotec # Liscotech System Co., Ltd.
1C:21:D1:E0:00:00/28 P2-Plus # p2-plus inc.
1C:21:D1:F0:00:00/28 Private # Private
+1C:23:2C SamsungE # Samsung Electronics Co.,Ltd
1C:23:4F EdmiEuro # EDMI Europe Ltd
1C:25:E1 ChinaMob # China Mobile IOT Company Limited
1C:33:0E Pernixda # PernixData
@@ -18651,6 +18654,7 @@
24:4F:1D IruleLlc # iRule LLC
24:59:0B WhiteSky # White Sky Inc. Limited
24:5B:F0 Liteon # Liteon, Inc.
+24:5C:BF Ncse # NCSE
24:5E:BE Qnap # QNAP Systems, Inc.
24:5F:DF KyoceraC # KYOCERA Corporation
24:60:81 RazberiT # razberi technologies
@@ -18678,7 +18682,9 @@
24:82:8A ProwaveT # Prowave Technologies Ltd.
24:86:F4 Ctek # Ctek, Inc.
24:87:07 SenergyC # SEnergy Corporation
+24:88:94 Shenzhen # shenzhen lensun Communication Technology LTD
24:8A:07 Mellanox # Mellanox Technologies, Inc.
+24:92:0E SamsungE # Samsung Electronics Co.,Ltd
24:93:CA Voxtroni # Voxtronic Technology Computer-Systeme GmbH
24:94:42 OpenRoad # OPEN ROAD SOLUTIONS , INC.
24:95:04 Sfr # SFR
@@ -19073,6 +19079,7 @@
2C:B4:3A Apple # Apple, Inc.
2C:B6:93 Radware # Radware
2C:B6:9D RedDigit # RED Digital Cinema
+2C:BA:BA SamsungE # Samsung Electronics Co.,Ltd
2C:BE:08 Apple # Apple, Inc.
2C:BE:97 Ingenieu # Ingenieurbuero Bickele und Buehler GmbH
2C:C2:60 RavelloS # Ravello Systems
@@ -19105,6 +19112,7 @@
2C:D2:E7 NokiaCor # Nokia Corporation
2C:D4:44 FujitsuL # FUJITSU LIMITED
2C:DD:0C Discover # Discovergy GmbH
+2C:DD:95 TaicangT # Taicang T&W Electronics
2C:DD:A3 PointGre # Point Grey Research Inc.
2C:E2:A8 Devicede # DeviceDesign
2C:E4:12 Sagemcom # Sagemcom Broadband SAS
@@ -19195,6 +19203,7 @@
30:7E:CB Sfr # SFR
30:85:A9 AsustekC # ASUSTek COMPUTER INC.
30:87:30 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
+30:87:D9 RuckusWi # Ruckus Wireless
30:89:99 Guangdon # Guangdong East Power Co.,
30:89:D3 Hongkong # HONGKONG UCLOUDLINK NETWORK TECHNOLOGY LIMITED
30:8C:FB Dropcam # Dropcam
@@ -19452,9 +19461,18 @@
38:3A:21 IeeeRegi # IEEE Registration Authority
38:3A:21:00:00:00/28 R3cInfor # R3C Information(Shenzhen) Co.，Ltd.
38:3A:21:10:00:00/28 HobartGm # HOBART GmbH
+38:3A:21:20:00:00/28 Shenzhen # Shenzhen HS Fiber Communication Equipment CO., LTD
+38:3A:21:30:00:00/28 Shanghai # Shanghai Greatwall Safety System Co.,Ltd
38:3A:21:40:00:00/28 Dongguan # Dongguan Innovation Technology Co Ltd
38:3A:21:50:00:00/28 OooNppUr # OOO NPP Uraltechnologiya
+38:3A:21:60:00:00/28 Shenzhen # Shenzhen Smart-core Technology co., Ltd.
+38:3A:21:70:00:00/28 ChengduK # Chengdu Krosslan Technology Inc.
+38:3A:21:80:00:00/28 AlicatSc # Alicat Scientific
+38:3A:21:90:00:00/28 SkylarkW # Skylark Wireless LLC
+38:3A:21:A0:00:00/28 Foresigh # Foresight Sports
38:3A:21:B0:00:00/28 Pactron # Pactron
+38:3A:21:C0:00:00/28 MissionE # Mission Embedded GmbH
+38:3A:21:D0:00:00/28 ColoocAb # Colooc AB
38:3B:C8 2wireInc # 2Wire Inc
38:3F:10 DblTechn # DBL Technology Ltd.
38:42:33 Wildeboe # Wildeboer Bauteile GmbH
@@ -19502,6 +19520,7 @@
38:98:D8 Meritech # MERITECH CO.,LTD
38:9F:83 OtnNV # OTN Systems N.V.
38:A2:8C Shenzhen # SHENZHEN RF-LINK TECHNOLOGY CO.,LTD.
+38:A4:ED XiaomiCo # Xiaomi Communications Co Ltd
38:A5:3C ComecerN # COMECER Netherlands
38:A5:B6 Shenzhen # SHENZHEN MEGMEET ELECTRICAL CO.,LTD
38:A8:51 MoogIng # Moog, Ing
@@ -19692,6 +19711,7 @@
3C:89:A6 Kapelse # KAPELSE
3C:8A:B0 JuniperN # Juniper Networks
3C:8A:E5 TensunIn # Tensun Information Technology(Hangzhou) Co.,LTD
+3C:8B:CD Alcatel- # Alcatel-Lucent Shanghai Bell Co., Ltd
3C:8B:FE SamsungE # Samsung Electronics Co.,Ltd
3C:8C:40 Hangzhou # Hangzhou H3C Technologies Co., Limited
3C:8C:F8 Trendnet # TRENDnet, Inc.
@@ -19909,6 +19929,7 @@
40:D2:8A Nintendo # Nintendo Co., Ltd.
40:D3:2D Apple # Apple, Inc.
40:D3:57 IsonTech # Ison Technology Co., Ltd.
+40:D3:AE SamsungE # Samsung Electronics Co.,Ltd
40:D4:0E BiodataL # Biodata Ltd
40:D5:59 MicroSER # MICRO S.E.R.I.
40:D8:55 IeeeRegi # IEEE Registration Authority
@@ -20623,7 +20644,9 @@
48:71:19 SgbGroup # SGB GROUP LTD.
48:74:6E Apple # Apple, Inc.
48:76:04 Private # Private
+48:7A:55 AleInter # ALE International
48:7A:DA Hangzhou # Hangzhou H3C Technologies Co., Limited
+48:7B:6B HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
48:82:44 LifeFitn # Life Fitness / Div. of Brunswick
48:82:F2 AppelEle # Appel Elektronik GmbH
48:83:C7 Sagemcom # Sagemcom Broadband SAS
@@ -20823,6 +20846,7 @@
4C:F4:5B BlueClov # Blue Clover Devices
4C:F5:A0 Scalable # Scalable Network Technologies Inc
4C:F7:37 SamjiEle # SamJi Electronics Co., Ltd
+4C:F9:5D HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
4C:FA:CA Cambridg # Cambridge Industries(Group) Co.,Ltd.
4C:FB:45 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
4C:FF:12 FuzeEnte # Fuze Entertainment Co., ltd
@@ -21389,6 +21413,7 @@
5C:96:6A Rtnet # RTNET
5C:96:9D Apple # Apple, Inc.
5C:97:F3 Apple # Apple, Inc.
+5C:99:60 SamsungE # Samsung Electronics Co.,Ltd
5C:9A:D8 FujitsuL # FUJITSU LIMITED
5C:A1:78 Tabletop # TableTop Media (dba Ziosk)
5C:A3:9D SamsungE # SAMSUNG ELECTRO MECHANICS CO., LTD.
@@ -21564,6 +21589,7 @@
60:A1:0A SamsungE # Samsung Electronics Co.,Ltd
60:A3:7D Apple # Apple, Inc.
60:A4:4C AsustekC # ASUSTek COMPUTER INC.
+60:A4:D0 SamsungE # Samsung Electronics Co.,Ltd
60:A8:FE Nokia # Nokia
60:A9:B0 Merchand # Merchandising Technologies, Inc
60:AC:C8 Kunteng # KunTeng Inc.
@@ -22176,6 +22202,7 @@
70:76:FF Kerlink # KERLINK
70:77:81 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
70:79:38 WuxiZhan # Wuxi Zhanrui Electronic Technology Co.,LTD
+70:79:90 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
70:7B:E8 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
70:7C:18 AdataTec # ADATA Technology Co., Ltd
70:7E:43 ArrisGro # ARRIS Group, Inc.
@@ -22404,6 +22431,7 @@
70:B3:D5:21:40:00/36 Signalpa # signalparser
70:B3:D5:21:60:00/36 Flextron # FLEXTRONICS
70:B3:D5:21:70:00/36 TecnintH # Tecnint HTE SRL
+70:B3:D5:21:E0:00/36 Hildebra # Hildebrand Technology Limited
70:B3:D5:22:00:00/36 Private # Private
70:B3:D5:22:60:00/36 Yaviar # Yaviar
70:B3:D5:22:B0:00/36 Vitec # VITEC
@@ -22605,8 +22633,10 @@
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:48:F0:00/36 SeiwaGik # Seiwa Giken
70:B3:D5:49:30:00/36 ImpulseN # Impulse Networks Pte Ltd
70:B3:D5:49:40:00/36 Schildkn # Schildknecht AG
+70:B3:D5:49:90:00/36 PycomLtd # Pycom Ltd
70:B3:D5:49:E0:00/36 CaptempL # CAPTEMP, Lda
70:B3:D5:49:F0:00/36 BPASrl # B.P.A. SRL
70:B3:D5:4A:10:00/36 Herholdt # Herholdt Controls srl
@@ -22805,6 +22835,7 @@
70:B3:D5:71:00:00/36 Guardian # Guardian Controls International Ltd
70:B3:D5:71:20:00/36 ApgCashD # APG Cash Drawer, LLC
70:B3:D5:71:40:00/36 AlturnaN # Alturna Networks
+70:B3:D5:71:B0:00/36 Elsys # elsys
70:B3:D5:71:E0:00/36 MotecPty # Motec Pty Ltd
70:B3:D5:72:00:00/36 Private # Private
70:B3:D5:72:10:00/36 ZoeMedic # Zoe Medical
@@ -22918,8 +22949,10 @@
70:B3:D5:84:E0:00/36 Chromalo # Chromalox, Inc.
70:B3:D5:85:20:00/36 Netboxsc # NetBoxSC, LLC
70:B3:D5:85:40:00/36 AdimecAd # Adimec Advanced Image Systems
+70:B3:D5:85:50:00/36 Crde # CRDE
70:B3:D5:85:B0:00/36 Tsubakim # TSUBAKIMOTO CHAIN CO.
70:B3:D5:85:C0:00/36 RobotPub # Robot Pub Group
+70:B3:D5:85:D0:00/36 AthreyaI # ATHREYA INC
70:B3:D5:86:60:00/36 MepsReal # MEPS Realtime
70:B3:D5:86:D0:00/36 CensusDi # Census Digital Incorporated
70:B3:D5:87:00:00/36 BentrupI # bentrup Industriesteuerungen
@@ -23009,6 +23042,7 @@
70:B3:D5:99:A0:00/36 Kevic # KEVIC. inc,
70:B3:D5:99:F0:00/36 ConfedBV # Confed Holding B.V.
70:B3:D5:9A:70:00/36 Honeywel # Honeywell
+70:B3:D5:9B:10:00/36 AplexTec # Aplex Technology Inc.
70:B3:D5:9B:30:00/36 K&JSchmi # K&J Schmittschneider AG
70:B3:D5:9B:A0:00/36 AtimRadi # ATIM Radiocommunication
70:B3:D5:9B:D0:00/36 SignalPr # Signal Processing Devices Sweden AB
@@ -23094,6 +23128,7 @@
70:B3:D5:AA:70:00/36 Ateme # ATEME
70:B3:D5:AA:80:00/36 West-Com # West-Com Nurse Call Systems, Inc.
70:B3:D5:AA:C0:00/36 Sensotec # SensoTec GmbH
+70:B3:D5:AA:D0:00/36 BartecGm # Bartec GmbH
70:B3:D5:AA:E0:00/36 NuvizOy # Nuviz Oy
70:B3:D5:AB:40:00/36 SysTecEl # SYS TEC electronic GmbH
70:B3:D5:AB:50:00/36 Broadsof # BroadSoft Inc
@@ -23137,6 +23172,7 @@
70:B3:D5:B1:50:00/36 EtaBetaS # Eta Beta Srl
70:B3:D5:B1:60:00/36 XiAnShen # XI'AN SHENMING ELECTRON TECHNOLOGY CO.,LTD
70:B3:D5:B1:D0:00/36 SafeletB # Safelet BV
+70:B3:D5:B2:30:00/36 Supervis # Supervision Test et Pilotage
70:B3:D5:B2:40:00/36 DatasatD # Datasat Digital Entertainment
70:B3:D5:B2:60:00/36 IntecInt # INTEC International GmbH
70:B3:D5:B2:80:00/36 HustyMSt # HUSTY M.Styczen J.Hupert sp.j.
@@ -23179,6 +23215,7 @@
70:B3:D5:B9:30:00/36 Internet # INTERNET PROTOCOLO LOGICA SL
70:B3:D5:B9:90:00/36 Domosafe # DomoSafety S.A.
70:B3:D5:B9:B0:00/36 Elektron # Elektronik Art
+70:B3:D5:B9:E0:00/36 Polsyste # POLSYSTEM SI SP. Z O.O., S.K.A.
70:B3:D5:BA:10:00/36 Cathwell # Cathwell AS
70:B3:D5:BA:40:00/36 EiwaGike # EIWA GIKEN INC.
70:B3:D5:BA:70:00/36 DigitalY # Digital Yacht Ltd
@@ -23197,6 +23234,7 @@
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 FeconGmb # FeCon GmbH
+70:B3:D5:BE:30:00/36 SaratovE # Saratov Electrounit Production Plant named after Sergo Ordzhonikidze, OJSC
70:B3:D5:BE:50:00/36 PantecEn # Pantec Engineering AG
70:B3:D5:BE:60:00/36 CciiPtyL # CCII Systems (Pty) Ltd
70:B3:D5:BE:C0:00/36 TokyoCom # Tokyo Communication Equipment MFG Co.,ltd.
@@ -23254,8 +23292,10 @@
70:B3:D5:C9:B0:00/36 TietoSwe # Tieto Sweden AB
70:B3:D5:C9:D0:00/36 ApgCashD # APG Cash Drawer
70:B3:D5:C9:F0:00/36 TriaxA/S # Triax A/S
+70:B3:D5:CA:40:00/36 Netemera # Netemera Sp. z o.o.
70:B3:D5:CA:80:00/36 GrupoEpe # Grupo Epelsa S.L.
70:B3:D5:CA:90:00/36 Nxcontro # Nxcontrol system Co., Ltd.
+70:B3:D5:CA:A0:00/36 BelPower # Bel Power Solutions GmbH
70:B3:D5:CA:C0:00/36 Crde # CRDE
70:B3:D5:CB:20:00/36 Seclab # SECLAB
70:B3:D5:CB:60:00/36 Kuebrich # Kuebrich Ingeniergesellschaft mbh & Co. KG
@@ -23267,6 +23307,7 @@
70:B3:D5:CC:A0:00/36 SiemensA # SIEMENS AS
70:B3:D5:CC:C0:00/36 AecSRL # AEC s.r.l.
70:B3:D5:CC:E0:00/36 Proconex # Proconex 2010 Inc.
+70:B3:D5:CD:20:00/36 HbhMicro # HBH Microwave GmbH
70:B3:D5:CD:60:00/36 Videoray # VideoRay LLC
70:B3:D5:CD:E0:00/36 Multipur # Multipure International
70:B3:D5:CE:30:00/36 DalcnetS # Dalcnet srl
@@ -23312,6 +23353,7 @@
70:B3:D5:D6:30:00/36 Crde # CRDE
70:B3:D5:D6:50:00/36 Crde # CRDE
70:B3:D5:D6:60:00/36 Ascenden # Ascendent Technology Group
+70:B3:D5:D6:70:00/36 AlphaCor # ALPHA　Corporation
70:B3:D5:D7:00:00/36 Rational # Rational Production srl Unipersonale
70:B3:D5:D7:30:00/36 ErmineCo # ERMINE Corporation
70:B3:D5:D7:40:00/36 SandiaNa # Sandia National Laboratories
@@ -23402,6 +23444,7 @@
70:B3:D5:E7:A0:00/36 ArtSpa # ART SPA
70:B3:D5:E7:C0:00/36 AplexTec # Aplex Technology Inc.
70:B3:D5:E7:E0:00/36 GroupeCi # Groupe Citypassenger Inc
+70:B3:D5:E8:20:00/36 RfTrack # RF Track
70:B3:D5:E8:50:00/36 Explorer # Explorer Inc.
70:B3:D5:E9:00:00/36 GeteinBi # Getein Biotechnology Co.,ltd
70:B3:D5:E9:20:00/36 FujiData # FUJI DATA SYSTEM CO.,LTD.
@@ -23485,6 +23528,7 @@
70:B3:D5:F7:E0:00/36 AlphaEle # Alpha Elettronica s.r.l.
70:B3:D5:F8:50:00/36 Solystic # Solystic
70:B3:D5:F8:C0:00/36 European # EUROPEAN ADVANCED TECHNOLOGIES
+70:B3:D5:F8:D0:00/36 Flextron # Flextronics Canafa Design Services
70:B3:D5:F8:E0:00/36 Isabelle # Isabellenhütte Heusler Gmbh &Co KG
70:B3:D5:F9:20:00/36 Techone # TechOne
70:B3:D5:F9:30:00/36 HellaGut # Hella Gutmann Solutions GmbH
@@ -23851,6 +23895,7 @@
78:81:8F ServerRa # Server Racks Australia Pty Ltd
78:84:3C SonyCorp # Sony Corporation
78:84:EE IndraEsp # INDRA ESPACIO S.A.
+78:88:8A CdrSpZOO # CDR Sp. z o.o. Sp. k.
78:89:73 Cmc # CMC
78:8B:77 StandarT # Standar Telecom
78:8C:54 EltekTec # Eltek Technologies LTD
@@ -24380,6 +24425,7 @@
84:1B:5E Netgear # NETGEAR
84:1E:26 Kernel-I # KERNEL-I Co.,LTD
84:21:41 Shenzhen # Shenzhen Ginwave Technologies Ltd.
+84:21:F1 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
84:24:8D ZebraTec # Zebra Technologies Inc
84:25:19 SamsungE # Samsung Electronics
84:25:3F SilexTec # Silex Technology, Inc
@@ -24507,6 +24553,7 @@
84:C7:EA SonyMobi # Sony Mobile Communications AB
84:C8:B1 Incognit # Incognito Software Systems Inc.
84:C9:B2 D-LinkIn # D-Link International
+84:CD:62 Shenzhen # ShenZhen IDWELL Technology CO.,Ltd
84:CF:BF Fairphon # Fairphone
84:D3:2A Ieee1905 # IEEE 1905.1
84:D4:7E ArubaNet # Aruba Networks
@@ -24586,6 +24633,7 @@
88:35:4C Transics # Transics
88:36:12 SrcCompu # SRC Computers, LLC
88:3B:8B Cheering # Cheering Connection Co. Ltd.
+88:3F:D3 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
88:41:57 Shenzhen # Shenzhen Atsmart Technology Co.,Ltd.
88:41:C1 OrbisatD # ORBISAT DA AMAZONIA IND E AEROL SA
88:41:FC AirtiesW # AirTies Wireless Networks
@@ -25406,6 +25454,7 @@
9C:5E:73 CalibreU # Calibre UK LTD
9C:61:1D Omni-IdU # Omni-ID USA, Inc.
9C:61:21 SichuanT # SICHUAN TIANYI COMHEART TELECOMCO.,LTD
+9C:62:AB Sumavisi # Sumavision Technologies Co.,Ltd
9C:64:5E HarmanCo # Harman Consumer Group
9C:65:B0 SamsungE # Samsung Electronics Co.,Ltd
9C:65:F9 AcsipTec # AcSiP Technology Corp.
@@ -25419,6 +25468,7 @@
9C:79:AC SuntecSo # Suntec Software(Shanghai) Co., Ltd.
9C:7A:03 CienaCor # Ciena Corporation
9C:7B:D2 NeolabCo # NEOLAB Convergence
+9C:7D:A3 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
9C:80:7D Syscable # SYSCABLE Korea Inc.
9C:80:DF Arcadyan # Arcadyan Technology Corporation
9C:86:DA PhoenixG # Phoenix Geophysics Ltd.
@@ -25508,6 +25558,7 @@ A0:09:ED AvayaInc # Avaya Inc
A0:0A:BF WiesonTe # Wieson Technologies Co., Ltd.
A0:0B:BA SamsungE # SAMSUNG ELECTRO MECHANICS CO., LTD.
A0:0C:A1 SktbSkit # SKTB SKiT
+A0:10:81 SamsungE # Samsung Electronics Co.,Ltd
A0:12:90 AvayaInc # Avaya Inc
A0:12:DB TabuchiE # TABUCHI ELECTRIC CO.,LTD
A0:13:3B HitiDigi # HiTi Digital, Inc.
@@ -25559,6 +25610,7 @@ A0:42:3F TyanComp # Tyan Computer Corp
A0:43:DB SitaelSP # Sitael S.p.A.
A0:48:1C HewlettP # Hewlett Packard
A0:4C:C1 Helixtec # Helixtech Corp.
+A0:4E:01 CentralE # CENTRAL ENGINEERING co.,ltd.
A0:4E:04 NokiaCor # Nokia Corporation
A0:4F:D4 AdbBroad # ADB Broadband Italia
A0:51:C6 AvayaInc # Avaya Inc
@@ -25847,6 +25899,7 @@ A4:C1:38 TelinkSe # Telink Semiconductor (Taipei) Co. Ltd.
A4:C2:AB Hangzhou # Hangzhou LEAD-IT Information & Technology Co.,Ltd
A4:C3:61 Apple # Apple, Inc.
A4:C4:94 IntelCor # Intel Corporate
+A4:C6:4F HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
A4:C7:DE Cambridg # Cambridge Industries(Group) Co.,Ltd.
A4:CA:A0 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
A4:CC:32 Inficomm # Inficomm Co., Ltd
@@ -25998,6 +26051,7 @@ A8:D8:8A Wyconn # Wyconn
A8:E0:18 NokiaCor # Nokia Corporation
A8:E3:EE SonyInte # Sony Interactive Entertainment Inc.
A8:E5:39 Moimston # Moimstone Co.,Ltd
+A8:E7:05 Fiberhom # Fiberhome Telecommunication Technologies Co.,LTD
A8:EF:26 Tritonwa # Tritonwave
A8:F0:38 ShenZhen # SHEN ZHEN SHI JIN HUA TAI ELECTRONICS CO.,LTD
A8:F2:74 SamsungE # Samsung Electronics Co.,Ltd
@@ -27195,6 +27249,7 @@ C8:38:70 SamsungE # Samsung Electronics Co.,Ltd
C8:3A:35 TendaTec # Tenda Technology Co., Ltd.
C8:3B:45 Jri-Maxa # JRI-Maxant
C8:3D:97 NokiaCor # Nokia Corporation
+C8:3D:D4 Cybertan # CyberTAN Technology Inc.
C8:3D:FC PioneerD # Pioneer DJ Corporation
C8:3E:99 TexasIns # Texas Instruments
C8:3E:A7 KunbusGm # KUNBUS GmbH
@@ -27509,6 +27564,7 @@ CC:FA:00 LgElectr # LG Electronics (Mobile Communications)
CC:FB:65 Nintendo # Nintendo Co., Ltd.
CC:FC:6D RizTrans # RIZ TRANSMITTERS
CC:FC:B1 Wireless # Wireless Technology, Inc.
+CC:FD:17 TctMobil # TCT mobile ltd
CC:FE:3C SamsungE # Samsung Electronics Co.,Ltd
D0:03:4B Apple # Apple, Inc.
D0:04:92 Fiberhom # Fiberhome Telecommunication Technologies Co.,LTD
@@ -28183,7 +28239,7 @@ E0:06:E6 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
E0:07:1B HewlettP # Hewlett Packard Enterprise
E0:0B:28 Inovonic # Inovonics
E0:0C:7F Nintendo # Nintendo Co., Ltd.
-E0:0D:B9 Private # Private
+E0:0D:B9 Cree # Cree, Inc.
E0:0E:DA CiscoInc # Cisco Systems, Inc
E0:10:7F RuckusWi # Ruckus Wireless
E0:14:3E Modoosis # Modoosis Inc.
@@ -28381,6 +28437,7 @@ E4:35:C8 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
E4:35:FB SabreTec # Sabre Technology (Hull) Ltd
E4:37:D7 HenriDep # HENRI DEPAEPE S.A.S.
E4:38:F2 Advantag # Advantage Controls
+E4:3E:D7 Arcadyan # Arcadyan Corporation
E4:3F:A2 WuxiDspT # Wuxi DSP Technologies Inc.
E4:40:E2 SamsungE # Samsung Electronics Co.,Ltd
E4:41:E6 OttecTec # Ottec Technology GmbH
@@ -28670,6 +28727,7 @@ EC:08:6B Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD.
EC:0E:C4 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
EC:0E:D6 ItechIns # ITECH INSTRUMENTS SAS
EC:10:00 EnanceSo # Enance Source Co., Ltd. PC clones(?)
+EC:10:7B SamsungE # Samsung Electronics Co.,Ltd
EC:11:20 Flodesig # FloDesign Wind Turbine Corporation
EC:11:27 TexasIns # Texas Instruments
EC:13:B2 Netonix # Netonix
@@ -28829,6 +28887,7 @@ F0:27:65 MurataMa # Murata Manufacturing Co., Ltd.
F0:29:29 CiscoInc # Cisco Systems, Inc
F0:2A:23 Creative # Creative Next Design
F0:2A:61 WaldoNet # Waldo Networks, Inc.
+F0:2F:A7 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
F0:2F:D8 Bi2-Visi # Bi2-Vision
F0:32:1A Mita-Tek # Mita-Teknik A/S
F0:34:04 TctMobil # TCT mobile ltd
@@ -28883,6 +28942,7 @@ F0:8E:DB Veloclou # VeloCloud Networks
F0:92:1C HewlettP # Hewlett Packard
F0:93:3A Nxtconec # NxtConect
F0:93:C5 GarlandT # Garland Technology
+F0:98:38 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
F0:99:BF Apple # Apple, Inc.
F0:9A:51 Shanghai # Shanghai Viroyal Electronic Technology Company Limited
F0:9C:BB Raonthin # RaonThink Inc.
@@ -29359,6 +29419,7 @@ FC:3D:93 Longchee # LONGCHEER TELECOMMUNICATION LIMITED
FC:3F:7C HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
FC:3F:AB HenanLan # Henan Lanxin Technology Co., Ltd
FC:3F:DB HewlettP # Hewlett Packard
+FC:42:03 SamsungE # Samsung Electronics Co.,Ltd
FC:44:63 Universa # Universal Audio, Inc
FC:44:99 SwarcoLe # Swarco LEA d.o.o.
FC:45:5F JiangxiS # JIANGXI SHANSHUI OPTOELECTRONIC TECHNOLOGY CO.,LTD
diff --git a/services b/services
index fcfcb94fc2..df59684b51 100644
--- a/services
+++ b/services
@@ -7943,6 +7943,7 @@ nvm-express 4420/tcp # NVM Express over Fabrics storage access [NVM_Express
nvm-express 4420/udp # NVM Express over Fabrics storage access [NVM_Express_Workgroup] [Amber_Huffman] 2016-03-31
scaleft 4421/tcp # Multi-Platform Remote Management for Cloud Infrastructure [ScaleFT_Inc] [Paul_Querna] 2016-04-07
tsepisp 4422/tcp # TSEP Installation Service Protocol [Technical_Software_Engineering_Plazotta] [Peter_Plazotta] 2016-06-22
+thingkit 4423/tcp # thingkit secure mesh [thingkit_inc.] [Chris_Bell] 2016-06-27
netrockey6 4425/tcp # NetROCKEY6 SMART Plus Service [Feitian_Technologies] [Feitian_Technologies] 2010-09-15
netrockey6 4425/udp # NetROCKEY6 SMART Plus Service [Feitian_Technologies] [Feitian_Technologies] 2010-09-15
beacon-port-2 4426/tcp # SMARTS Beacon Port [Eyal_Yardeni] [Eyal_Yardeni] 2003-11
@@ -10202,10 +10203,10 @@ nod-provider 8980/udp # Network of Devices Provider [David_Muller] [David_Mu
nod-client 8981/udp # Network of Devices Client [David_Muller] [David_Muller] 2015-02-22
sunwebadmins 8989/tcp # Sun Web Server SSL Admin Service [Jyri_J_Virkki] [Jyri_J_Virkki] 2005-12
sunwebadmins 8989/udp # Sun Web Server SSL Admin Service [Jyri_J_Virkki] [Jyri_J_Virkki] 2005-12
-http-wmap 8990/tcp # webmail HTTP service [Fred_Batty] [Fred_Batty] 2007-12-03
-http-wmap 8990/udp # webmail HTTP service [Fred_Batty] [Fred_Batty] 2007-12-03
-https-wmap 8991/tcp # webmail HTTPS service [Fred_Batty] [Fred_Batty] 2007-12-03
-https-wmap 8991/udp # webmail HTTPS service [Fred_Batty] [Fred_Batty] 2007-12-03
+http-wmap 8990/tcp # webmail HTTP service [Chris_Newman] [Chris_Newman] 2007-12-03
+http-wmap 8990/udp # webmail HTTP service [Chris_Newman] [Chris_Newman] 2007-12-03
+https-wmap 8991/tcp # webmail HTTPS service [Chris_Newman] [Chris_Newman] 2007-12-03
+https-wmap 8991/udp # webmail HTTPS service [Chris_Newman] [Chris_Newman] 2007-12-03
oracle-ms-ens 8997/tcp # Oracle Messaging Server Event Notification Service [Oracle_6] [Hubert_Vijay_Arokiasamy] 2014-10-28
canto-roboflow 8998/tcp # Canto RoboFlow Control [Canto] [Thomas_Schleu_2] 2014-02-26
bctp 8999/tcp # Brodos Crypto Trade Protocol [Alexander_Sahler] [Alexander_Sahler] 2002-02
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 69219cc44f..9ba467440b 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -698,22 +698,21 @@
<context>
<name>ByteViewText</name>
<message>
- <location filename="byte_view_text.cpp" line="69"/>
+ <location filename="byte_view_text.cpp" line="73"/>
<source>Show bytes as hexadecimal</source>
<translation>Bytes in Hexadezimal anzeigen</translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="75"/>
<source>Show bytes as bits</source>
- <translation>Bytes in Bits anzeigen</translation>
+ <translation type="vanished">Bytes in Bits anzeigen</translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="268"/>
+ <location filename="byte_view_text.cpp" line="282"/>
<source>Byte %1</source>
<translation>Bytes %1</translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="271"/>
+ <location filename="byte_view_text.cpp" line="285"/>
<source>Bytes %1-%2</source>
<translation>Bytes %1-%2</translation>
</message>
@@ -6883,12 +6882,12 @@ text-decoration: underline;
<translation>Automatische Aktualisierung ist deaktiviert.</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="376"/>
+ <location filename="main_welcome.cpp" line="383"/>
<source>not found</source>
<translation>nicht gefunden</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="458"/>
+ <location filename="main_welcome.cpp" line="465"/>
<source>Copy file path</source>
<translation>Dateipfad kopieren</translation>
</message>
@@ -9104,213 +9103,213 @@ text-decoration: underline;
<translation>Einzelne Protokolle aktivieren/deaktivieren</translation>
</message>
<message>
- <location filename="main_window.cpp" line="431"/>
+ <location filename="main_window.cpp" line="436"/>
<source>Check for Updates</source>
<oldsource>Check for Updates...</oldsource>
<translation>Nach Aktualisierungen suchen</translation>
</message>
<message>
- <location filename="main_window.cpp" line="813"/>
+ <location filename="main_window.cpp" line="818"/>
<source> before quitting</source>
<translation>vor dem Schließen</translation>
</message>
<message>
- <location filename="main_window.cpp" line="998"/>
+ <location filename="main_window.cpp" line="1003"/>
<source>Save packets before merging?</source>
<translation>Pakete vor dem Zusammenführen speichern?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="999"/>
+ <location filename="main_window.cpp" line="1004"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation>Eine temporäre Mitschnittdatei kann nicht zusammengeführt werden.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1005"/>
+ <location filename="main_window.cpp" line="1010"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation>Vor der Zusammenführung Änderungen in &quot;%1&quot; speichern?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1007"/>
+ <location filename="main_window.cpp" line="1012"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>Änderungen müssen vor dem Zusammenführen gespeichert werden.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="210"/>
+ <location filename="main_window_slots.cpp" line="212"/>
<source>Invalid Display Filter</source>
<translation>Ungültiger Anzeigefilter</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1044"/>
+ <location filename="main_window.cpp" line="1049"/>
<source>Invalid Read Filter</source>
<translation>Ungültiger Lesefilter</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1045"/>
+ <location filename="main_window.cpp" line="1050"/>
<source>The filter expression %1 isn&apos;t a valid read filter. (%2).</source>
<translation>Der Filterausdruck %1 ist kein gültiger Lesefilter. (%2).</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1135"/>
+ <location filename="main_window.cpp" line="1140"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
<translation>vor dem Importieren einer Aufzeichnung</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1409"/>
+ <location filename="main_window.cpp" line="1414"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation>Kann nicht nach &quot;%1&quot; exportieren.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1410"/>
+ <location filename="main_window.cpp" line="1415"/>
<source>You cannot export packets to the current capture file.</source>
<translation>Pakete können nicht in die aktuelle Mitschnittdatei exportiert werden.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1497"/>
- <location filename="main_window.cpp" line="1522"/>
+ <location filename="main_window.cpp" line="1502"/>
+ <location filename="main_window.cpp" line="1527"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1569"/>
+ <location filename="main_window.cpp" line="1574"/>
<source>Do you want to save the changes you&apos;ve made%1?</source>
<oldsource>Do you want to save the captured packets</oldsource>
<translation>Wollen Sie die durchgeführten Änderungen speichern%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1565"/>
- <location filename="main_window.cpp" line="1573"/>
+ <location filename="main_window.cpp" line="1570"/>
+ <location filename="main_window.cpp" line="1578"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation>Die aufgezeichneten Pakete gehen verloren wenn sie nicht gespeichert werden.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1578"/>
+ <location filename="main_window.cpp" line="1583"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation>Sollen die Änderungen an der Mitschnittdatei &quot;%1&quot;%2 gespeichert werden?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1570"/>
- <location filename="main_window.cpp" line="1579"/>
+ <location filename="main_window.cpp" line="1575"/>
+ <location filename="main_window.cpp" line="1584"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>Änderungen gehen verloren, wenn sie nicht gesichert werden.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1564"/>
+ <location filename="main_window.cpp" line="1569"/>
<source>Do you want to stop the capture and save the captured packets%1?</source>
<translation>Wollen Sie die Aufzeichnung stoppen und die aufgezeichneten Pakete speichern%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1572"/>
+ <location filename="main_window.cpp" line="1577"/>
<source>Do you want to save the captured packets%1?</source>
<translation>Wollen Sie die aufgezeichneten Pakete speichern%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1596"/>
+ <location filename="main_window.cpp" line="1601"/>
<source>Save before Continue</source>
<translation>Vor dem Fortsetzen speichern</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1598"/>
+ <location filename="main_window.cpp" line="1603"/>
<source>Stop and Save</source>
<translation>Stoppen und speichern</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1610"/>
+ <location filename="main_window.cpp" line="1615"/>
<source>Stop and Quit &amp;without Saving</source>
<oldsource>Stop and Quit without Saving</oldsource>
<translation>Stoppen und beenden &amp;ohne zu speichern</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1622"/>
+ <location filename="main_window.cpp" line="1627"/>
<source>Quit &amp;without Saving</source>
<oldsource>Quit without Saving</oldsource>
<translation>&amp;Ohne speichern beenden</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1613"/>
- <location filename="main_window.cpp" line="1626"/>
+ <location filename="main_window.cpp" line="1618"/>
+ <location filename="main_window.cpp" line="1631"/>
<source>Continue &amp;without Saving</source>
<oldsource>Continue without Saving</oldsource>
<translation>Fortsetzen &amp;ohne zu Speichern</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1616"/>
+ <location filename="main_window.cpp" line="1621"/>
<source>Stop and Continue &amp;without Saving</source>
<oldsource>Stop and Continue without Saving</oldsource>
<translation>Stoppen und Fortsetzen &amp;ohne zu Speichern</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1948"/>
+ <location filename="main_window.cpp" line="1953"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>(Dateiname kann nicht auf UTF-8 angewendet werden)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1969"/>
+ <location filename="main_window.cpp" line="1974"/>
<source>The Wireshark Network Analyzer</source>
<translation>Die Wireshark Netzwerk Analysesoftware</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1994"/>
+ <location filename="main_window.cpp" line="1999"/>
<source>Capturing from %1</source>
<translation>Aufzeichnen von %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="198"/>
+ <location filename="main_window_slots.cpp" line="200"/>
<source> before opening another file</source>
<translation>vor dem Öffnen einer anderen Datei</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="699"/>
+ <location filename="main_window_slots.cpp" line="704"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="791"/>
+ <location filename="main_window_slots.cpp" line="798"/>
<source>Saving %1</source>
<translation>Speichere %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="831"/>
+ <location filename="main_window_slots.cpp" line="838"/>
<source>No interface selected</source>
<translation>Keine Schnittstelle ausgewählt</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="841"/>
+ <location filename="main_window_slots.cpp" line="848"/>
<source>Invalid capture filter</source>
<translation>Ungültiger Mitschnittfilter</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1087"/>
+ <location filename="main_window_slots.cpp" line="1094"/>
<source>Clear Menu</source>
<translation>Menüeinträge löschen</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1553"/>
+ <location filename="main_window_slots.cpp" line="1574"/>
<source>Please wait while Wireshark is initializing</source>
<translation>Bitte Warten während Wireshark initialisiert wird</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1643"/>
+ <location filename="main_window_slots.cpp" line="1664"/>
<source> before closing the file</source>
<translation>vor dem Schließen der Datei</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1731"/>
+ <location filename="main_window_slots.cpp" line="1752"/>
<source>Export Selected Packet Bytes</source>
<translation>Ausgewählte Paketbytes exportieren</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1797"/>
+ <location filename="main_window_slots.cpp" line="1818"/>
<source>No Keys</source>
<translation>Keine Schlüssel</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1798"/>
+ <location filename="main_window_slots.cpp" line="1819"/>
<source>There are no SSL Session Keys to save.</source>
<translation>Es sind keine SSL Sitzungsschlüssel zum Speichern vorhanden.</translation>
</message>
<message numerus="yes">
- <location filename="main_window_slots.cpp" line="1804"/>
+ <location filename="main_window_slots.cpp" line="1825"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation>
@@ -9319,69 +9318,69 @@ text-decoration: underline;
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1733"/>
+ <location filename="main_window_slots.cpp" line="1754"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation>Rohdaten (*.bin *.dat *.raw);; Alle Dateien (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1808"/>
+ <location filename="main_window_slots.cpp" line="1829"/>
<source>SSL Session Keys (*.keys *.txt);;All Files (</source>
<translation>SSL Sitzungsschlüssel (*.keys *.txt);; Alle Dateien (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1946"/>
+ <location filename="main_window_slots.cpp" line="1967"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation>Text konnte nicht kopiert werden. Probieren sie einen anderen Eintrag.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2356"/>
- <location filename="main_window_slots.cpp" line="3458"/>
+ <location filename="main_window_slots.cpp" line="2377"/>
+ <location filename="main_window_slots.cpp" line="3479"/>
<source>Unable to build conversation filter.</source>
<translation>Verbindungsfilter kann nicht erstellt werden.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2506"/>
- <location filename="main_window_slots.cpp" line="2519"/>
+ <location filename="main_window_slots.cpp" line="2527"/>
+ <location filename="main_window_slots.cpp" line="2540"/>
<source> before reloading the file</source>
<translation>vor dem Neuladen der Datei</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2553"/>
+ <location filename="main_window_slots.cpp" line="2574"/>
<source>No filter available. Try another </source>
<translation>Kein Filter verfügbar. Probieren Sie einen anderen.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3465"/>
+ <location filename="main_window_slots.cpp" line="3486"/>
<source>Error compiling filter for this conversation.</source>
<translation>Fehler beim Erstellen eines Filters für diese Verbindung.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3474"/>
+ <location filename="main_window_slots.cpp" line="3495"/>
<source>No previous/next packet in conversation.</source>
<translation>Kein vorheriges/nächstes Paket in dieser Verbindung.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3551"/>
+ <location filename="main_window_slots.cpp" line="3572"/>
<source>No Interface Selected</source>
<translation>Keine Schnittstelle ausgewählt</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3558"/>
+ <location filename="main_window_slots.cpp" line="3579"/>
<source> before starting a new capture</source>
<translation>vor dem Starten einer neuen Aufzeichnung</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3576"/>
+ <location filename="main_window_slots.cpp" line="3597"/>
<source> before restarting the capture</source>
<translation>vor dem Neustart der Aufzeichnung</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3779"/>
+ <location filename="main_window_slots.cpp" line="3800"/>
<source>Wiki Page for %1</source>
<translation>Wikiseite für &amp;1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3780"/>
+ <location filename="main_window_slots.cpp" line="3801"/>
<source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
<translation>&lt;p&gt;Das Wireshark Wiki wird durch die Community gepflegt.&lt;/p&gt;&lt;p&gt;Die Seite, die aufgerufen werden soll, kann wundervoll, unvollständig, falsch oder gar nicht vorhanden sein.&lt;/p&gt;&lt;p&gt;Zum Wiki gehen?&lt;/p&gt;</translation>
</message>
@@ -9928,7 +9927,7 @@ text-decoration: underline;
<translation>Paket %1</translation>
</message>
<message>
- <location filename="packet_dialog.cpp" line="119"/>
+ <location filename="packet_dialog.cpp" line="120"/>
<source>[%1 closed] </source>
<translation>[%1 geschlossen] </translation>
</message>
@@ -10250,24 +10249,21 @@ text-decoration: underline;
<translation>Wert</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="271"/>
+ <location filename="preferences_dialog.cpp" line="440"/>
<source>Preferences</source>
<translation>Einstellungen</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="494"/>
<source>Unknown</source>
- <translation>Unbekannt</translation>
+ <translation type="vanished">Unbekannt</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="496"/>
<source>Default</source>
- <translation>Standard</translation>
+ <translation type="vanished">Standard</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="498"/>
<source>Changed</source>
- <translation>Geändert</translation>
+ <translation type="vanished">Geändert</translation>
</message>
</context>
<context>
@@ -10566,12 +10562,22 @@ text-decoration: underline;
<context>
<name>QObject</name>
<message>
- <location filename="preferences_dialog.cpp" line="101"/>
+ <location filename="preferences_dialog.cpp" line="109"/>
+ <source>Default</source>
+ <translation type="unfinished">Standard</translation>
+ </message>
+ <message>
+ <location filename="preferences_dialog.cpp" line="111"/>
+ <source>Changed</source>
+ <translation type="unfinished">Geändert</translation>
+ </message>
+ <message>
+ <location filename="preferences_dialog.cpp" line="129"/>
<source>Has this preference been changed?</source>
<translation>Wurde diese Einstellung geändert?</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="105"/>
+ <location filename="preferences_dialog.cpp" line="139"/>
<source>Default value is empty</source>
<translation>Standardwert ist leer</translation>
</message>
@@ -10798,7 +10804,7 @@ text-decoration: underline;
<translation>Alle</translation>
</message>
<message>
- <location filename="main_window.cpp" line="229"/>
+ <location filename="main_window.cpp" line="231"/>
<source>Don&apos;t show this message again.</source>
<translation>Diese Mitteilung nicht mehr anzeigen.</translation>
</message>
@@ -11099,6 +11105,7 @@ text-decoration: underline;
</message>
<message>
<location filename="lte_rlc_statistics_dialog.cpp" line="176"/>
+ <location filename="preferences_dialog.cpp" line="107"/>
<source>Unknown</source>
<translation>Unbekannt</translation>
</message>
@@ -11123,12 +11130,12 @@ text-decoration: underline;
<translation>Priorität</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="441"/>
+ <location filename="main_welcome.cpp" line="448"/>
<source>Show in Finder</source>
<translation>Im Finder anzeigen</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="443"/>
+ <location filename="main_welcome.cpp" line="450"/>
<source>Show in Folder</source>
<translation>Im Ordner anzeigen</translation>
</message>
@@ -11148,12 +11155,12 @@ text-decoration: underline;
<translation>DLT %1</translation>
</message>
<message>
- <location filename="../../wireshark-qt.cpp" line="806"/>
+ <location filename="../../wireshark-qt.cpp" line="800"/>
<source>Invalid Display Filter</source>
<translation type="unfinished">Ungültiger Anzeigefilter</translation>
</message>
<message>
- <location filename="../../wireshark-qt.cpp" line="807"/>
+ <location filename="../../wireshark-qt.cpp" line="801"/>
<source>The filter expression %1 isn&apos;t a valid display filter. (%2).</source>
<translation type="unfinished"></translation>
</message>
@@ -14237,6 +14244,11 @@ text-decoration: underline;
<translation>Moduleinstellungen laden</translation>
</message>
<message>
+ <location filename="splash_overlay.cpp" line="163"/>
+ <source>Finding local interfaces</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="splash_overlay.cpp" line="166"/>
<source>Loading configuration files</source>
<translation>Konfigurationsdateien laden</translation>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index 1ad782eefd..caf8256252 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -698,22 +698,17 @@
<context>
<name>ByteViewText</name>
<message>
- <location filename="byte_view_text.cpp" line="69"/>
+ <location filename="byte_view_text.cpp" line="73"/>
<source>Show bytes as hexadecimal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="75"/>
- <source>Show bytes as bits</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="byte_view_text.cpp" line="268"/>
+ <location filename="byte_view_text.cpp" line="282"/>
<source>Byte %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="271"/>
+ <location filename="byte_view_text.cpp" line="285"/>
<source>Bytes %1-%2</source>
<translation type="unfinished"></translation>
</message>
@@ -6763,12 +6758,12 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="376"/>
+ <location filename="main_welcome.cpp" line="383"/>
<source>not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="458"/>
+ <location filename="main_welcome.cpp" line="465"/>
<source>Copy file path</source>
<translation type="unfinished"></translation>
</message>
@@ -8984,213 +8979,213 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="431"/>
+ <location filename="main_window.cpp" line="436"/>
<source>Check for Updates</source>
<oldsource>Check for Updates...</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="813"/>
+ <location filename="main_window.cpp" line="818"/>
<source> before quitting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="998"/>
+ <location filename="main_window.cpp" line="1003"/>
<source>Save packets before merging?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="999"/>
+ <location filename="main_window.cpp" line="1004"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1005"/>
+ <location filename="main_window.cpp" line="1010"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1007"/>
+ <location filename="main_window.cpp" line="1012"/>
<source>Changes must be saved before the files can be merged.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="210"/>
+ <location filename="main_window_slots.cpp" line="212"/>
<source>Invalid Display Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1044"/>
+ <location filename="main_window.cpp" line="1049"/>
<source>Invalid Read Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1045"/>
+ <location filename="main_window.cpp" line="1050"/>
<source>The filter expression %1 isn&apos;t a valid read filter. (%2).</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1135"/>
+ <location filename="main_window.cpp" line="1140"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1409"/>
+ <location filename="main_window.cpp" line="1414"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1410"/>
+ <location filename="main_window.cpp" line="1415"/>
<source>You cannot export packets to the current capture file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1497"/>
- <location filename="main_window.cpp" line="1522"/>
+ <location filename="main_window.cpp" line="1502"/>
+ <location filename="main_window.cpp" line="1527"/>
<source>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1569"/>
+ <location filename="main_window.cpp" line="1574"/>
<source>Do you want to save the changes you&apos;ve made%1?</source>
<oldsource>Do you want to save the captured packets</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1565"/>
- <location filename="main_window.cpp" line="1573"/>
+ <location filename="main_window.cpp" line="1570"/>
+ <location filename="main_window.cpp" line="1578"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1578"/>
+ <location filename="main_window.cpp" line="1583"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1570"/>
- <location filename="main_window.cpp" line="1579"/>
+ <location filename="main_window.cpp" line="1575"/>
+ <location filename="main_window.cpp" line="1584"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1564"/>
+ <location filename="main_window.cpp" line="1569"/>
<source>Do you want to stop the capture and save the captured packets%1?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1572"/>
+ <location filename="main_window.cpp" line="1577"/>
<source>Do you want to save the captured packets%1?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1596"/>
+ <location filename="main_window.cpp" line="1601"/>
<source>Save before Continue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1598"/>
+ <location filename="main_window.cpp" line="1603"/>
<source>Stop and Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1610"/>
+ <location filename="main_window.cpp" line="1615"/>
<source>Stop and Quit &amp;without Saving</source>
<oldsource>Stop and Quit without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1622"/>
+ <location filename="main_window.cpp" line="1627"/>
<source>Quit &amp;without Saving</source>
<oldsource>Quit without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1613"/>
- <location filename="main_window.cpp" line="1626"/>
+ <location filename="main_window.cpp" line="1618"/>
+ <location filename="main_window.cpp" line="1631"/>
<source>Continue &amp;without Saving</source>
<oldsource>Continue without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1616"/>
+ <location filename="main_window.cpp" line="1621"/>
<source>Stop and Continue &amp;without Saving</source>
<oldsource>Stop and Continue without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1948"/>
+ <location filename="main_window.cpp" line="1953"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1969"/>
+ <location filename="main_window.cpp" line="1974"/>
<source>The Wireshark Network Analyzer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1994"/>
+ <location filename="main_window.cpp" line="1999"/>
<source>Capturing from %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="198"/>
+ <location filename="main_window_slots.cpp" line="200"/>
<source> before opening another file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="699"/>
+ <location filename="main_window_slots.cpp" line="704"/>
<source>%1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="791"/>
+ <location filename="main_window_slots.cpp" line="798"/>
<source>Saving %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="831"/>
+ <location filename="main_window_slots.cpp" line="838"/>
<source>No interface selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="841"/>
+ <location filename="main_window_slots.cpp" line="848"/>
<source>Invalid capture filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1087"/>
+ <location filename="main_window_slots.cpp" line="1094"/>
<source>Clear Menu</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1553"/>
+ <location filename="main_window_slots.cpp" line="1574"/>
<source>Please wait while Wireshark is initializing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1643"/>
+ <location filename="main_window_slots.cpp" line="1664"/>
<source> before closing the file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1731"/>
+ <location filename="main_window_slots.cpp" line="1752"/>
<source>Export Selected Packet Bytes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1797"/>
+ <location filename="main_window_slots.cpp" line="1818"/>
<source>No Keys</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1798"/>
+ <location filename="main_window_slots.cpp" line="1819"/>
<source>There are no SSL Session Keys to save.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="main_window_slots.cpp" line="1804"/>
+ <location filename="main_window_slots.cpp" line="1825"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation>
@@ -9199,69 +9194,69 @@ a:hover {
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1733"/>
+ <location filename="main_window_slots.cpp" line="1754"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1808"/>
+ <location filename="main_window_slots.cpp" line="1829"/>
<source>SSL Session Keys (*.keys *.txt);;All Files (</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1946"/>
+ <location filename="main_window_slots.cpp" line="1967"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2356"/>
- <location filename="main_window_slots.cpp" line="3458"/>
+ <location filename="main_window_slots.cpp" line="2377"/>
+ <location filename="main_window_slots.cpp" line="3479"/>
<source>Unable to build conversation filter.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2506"/>
- <location filename="main_window_slots.cpp" line="2519"/>
+ <location filename="main_window_slots.cpp" line="2527"/>
+ <location filename="main_window_slots.cpp" line="2540"/>
<source> before reloading the file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2553"/>
+ <location filename="main_window_slots.cpp" line="2574"/>
<source>No filter available. Try another </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3465"/>
+ <location filename="main_window_slots.cpp" line="3486"/>
<source>Error compiling filter for this conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3474"/>
+ <location filename="main_window_slots.cpp" line="3495"/>
<source>No previous/next packet in conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3551"/>
+ <location filename="main_window_slots.cpp" line="3572"/>
<source>No Interface Selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3558"/>
+ <location filename="main_window_slots.cpp" line="3579"/>
<source> before starting a new capture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3576"/>
+ <location filename="main_window_slots.cpp" line="3597"/>
<source> before restarting the capture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3779"/>
+ <location filename="main_window_slots.cpp" line="3800"/>
<source>Wiki Page for %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3780"/>
+ <location filename="main_window_slots.cpp" line="3801"/>
<source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -9808,7 +9803,7 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_dialog.cpp" line="119"/>
+ <location filename="packet_dialog.cpp" line="120"/>
<source>[%1 closed] </source>
<translation type="unfinished"></translation>
</message>
@@ -10128,25 +10123,10 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="271"/>
+ <location filename="preferences_dialog.cpp" line="440"/>
<source>Preferences</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="preferences_dialog.cpp" line="494"/>
- <source>Unknown</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="preferences_dialog.cpp" line="496"/>
- <source>Default</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="preferences_dialog.cpp" line="498"/>
- <source>Changed</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>PrintDialog</name>
@@ -10444,12 +10424,22 @@ a:hover {
<context>
<name>QObject</name>
<message>
- <location filename="preferences_dialog.cpp" line="101"/>
+ <location filename="preferences_dialog.cpp" line="109"/>
+ <source>Default</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="preferences_dialog.cpp" line="111"/>
+ <source>Changed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="preferences_dialog.cpp" line="129"/>
<source>Has this preference been changed?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="105"/>
+ <location filename="preferences_dialog.cpp" line="139"/>
<source>Default value is empty</source>
<translation type="unfinished"></translation>
</message>
@@ -10668,7 +10658,7 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="229"/>
+ <location filename="main_window.cpp" line="231"/>
<source>Don&apos;t show this message again.</source>
<translation type="unfinished"></translation>
</message>
@@ -10969,6 +10959,7 @@ a:hover {
</message>
<message>
<location filename="lte_rlc_statistics_dialog.cpp" line="176"/>
+ <location filename="preferences_dialog.cpp" line="107"/>
<source>Unknown</source>
<translation type="unfinished"></translation>
</message>
@@ -10993,12 +10984,12 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="441"/>
+ <location filename="main_welcome.cpp" line="448"/>
<source>Show in Finder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="443"/>
+ <location filename="main_welcome.cpp" line="450"/>
<source>Show in Folder</source>
<translation type="unfinished"></translation>
</message>
@@ -11018,12 +11009,12 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../wireshark-qt.cpp" line="806"/>
+ <location filename="../../wireshark-qt.cpp" line="800"/>
<source>Invalid Display Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../wireshark-qt.cpp" line="807"/>
+ <location filename="../../wireshark-qt.cpp" line="801"/>
<source>The filter expression %1 isn&apos;t a valid display filter. (%2).</source>
<translation type="unfinished"></translation>
</message>
@@ -14041,6 +14032,11 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="splash_overlay.cpp" line="163"/>
+ <source>Finding local interfaces</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="splash_overlay.cpp" line="166"/>
<source>Loading configuration files</source>
<translation type="unfinished"></translation>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index f16a444275..60c70bc45e 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -698,22 +698,21 @@
<context>
<name>ByteViewText</name>
<message>
- <location filename="byte_view_text.cpp" line="69"/>
+ <location filename="byte_view_text.cpp" line="73"/>
<source>Show bytes as hexadecimal</source>
<translation>Afficher les octets en hexadécimal</translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="75"/>
<source>Show bytes as bits</source>
- <translation>Afficher les octets en bits</translation>
+ <translation type="vanished">Afficher les octets en bits</translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="268"/>
+ <location filename="byte_view_text.cpp" line="282"/>
<source>Byte %1</source>
<translation>Octets %1</translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="271"/>
+ <location filename="byte_view_text.cpp" line="285"/>
<source>Bytes %1-%2</source>
<translation>Octets %1-%2</translation>
</message>
@@ -6855,12 +6854,12 @@ a:hover {
<translation>Vous avez désactivé les mises à jour automatiques.</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="376"/>
+ <location filename="main_welcome.cpp" line="383"/>
<source>not found</source>
<translation>Non trouvé</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="458"/>
+ <location filename="main_welcome.cpp" line="465"/>
<source>Copy file path</source>
<translation>Copier le chemin du fichier</translation>
</message>
@@ -9076,213 +9075,213 @@ a:hover {
<translation>Active et désactive des protocoles spécifiques</translation>
</message>
<message>
- <location filename="main_window.cpp" line="431"/>
+ <location filename="main_window.cpp" line="436"/>
<source>Check for Updates</source>
<oldsource>Check for Updates...</oldsource>
<translation>Vérifier Mises à Jour</translation>
</message>
<message>
- <location filename="main_window.cpp" line="813"/>
+ <location filename="main_window.cpp" line="818"/>
<source> before quitting</source>
<translation>avant de quitter</translation>
</message>
<message>
- <location filename="main_window.cpp" line="998"/>
+ <location filename="main_window.cpp" line="1003"/>
<source>Save packets before merging?</source>
<translation>Sauvegarder les paquets avant la fusion?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="999"/>
+ <location filename="main_window.cpp" line="1004"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation>une capture temporaire ne peut pas etre fusionner.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1005"/>
+ <location filename="main_window.cpp" line="1010"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation>Sauvegarder les changements dans &quot;%1&quot; avant la fusion?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1007"/>
+ <location filename="main_window.cpp" line="1012"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>Les changements doivent etre sauvegarder avant la fusion de fichier.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="210"/>
+ <location filename="main_window_slots.cpp" line="212"/>
<source>Invalid Display Filter</source>
<translation>Filtre d&apos;affichage invalide</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1044"/>
+ <location filename="main_window.cpp" line="1049"/>
<source>Invalid Read Filter</source>
<translation>Filtre de Lecture Invalide</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1045"/>
+ <location filename="main_window.cpp" line="1050"/>
<source>The filter expression %1 isn&apos;t a valid read filter. (%2).</source>
<translation>L&apos;expression de filtre %1 n&apos;est pas un filtre de lecture valide. (%2).</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1135"/>
+ <location filename="main_window.cpp" line="1140"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1409"/>
+ <location filename="main_window.cpp" line="1414"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation>Impossible d&apos;exporter dans &quot;%1&quot;.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1410"/>
+ <location filename="main_window.cpp" line="1415"/>
<source>You cannot export packets to the current capture file.</source>
<translation>Vous ne pouvez pas exporter les paquets de la capture en cours.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1497"/>
- <location filename="main_window.cpp" line="1522"/>
+ <location filename="main_window.cpp" line="1502"/>
+ <location filename="main_window.cpp" line="1527"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1569"/>
+ <location filename="main_window.cpp" line="1574"/>
<source>Do you want to save the changes you&apos;ve made%1?</source>
<oldsource>Do you want to save the captured packets</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1565"/>
- <location filename="main_window.cpp" line="1573"/>
+ <location filename="main_window.cpp" line="1570"/>
+ <location filename="main_window.cpp" line="1578"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation>Votre capture de paquet sera perdu si vous ne les enregistrez pas.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1578"/>
+ <location filename="main_window.cpp" line="1583"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation>Voulez-vous enregistrer les modifications que vous avez apportées au fichier de capture &quot;%1&quot;%2?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1570"/>
- <location filename="main_window.cpp" line="1579"/>
+ <location filename="main_window.cpp" line="1575"/>
+ <location filename="main_window.cpp" line="1584"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>Vos changements seront perdus si vous ne les enregistrez pas.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1564"/>
+ <location filename="main_window.cpp" line="1569"/>
<source>Do you want to stop the capture and save the captured packets%1?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1572"/>
+ <location filename="main_window.cpp" line="1577"/>
<source>Do you want to save the captured packets%1?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1596"/>
+ <location filename="main_window.cpp" line="1601"/>
<source>Save before Continue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1598"/>
+ <location filename="main_window.cpp" line="1603"/>
<source>Stop and Save</source>
<translation>Arreter et Sauvegarder</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1610"/>
+ <location filename="main_window.cpp" line="1615"/>
<source>Stop and Quit &amp;without Saving</source>
<oldsource>Stop and Quit without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1622"/>
+ <location filename="main_window.cpp" line="1627"/>
<source>Quit &amp;without Saving</source>
<oldsource>Quit without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1613"/>
- <location filename="main_window.cpp" line="1626"/>
+ <location filename="main_window.cpp" line="1618"/>
+ <location filename="main_window.cpp" line="1631"/>
<source>Continue &amp;without Saving</source>
<oldsource>Continue without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1616"/>
+ <location filename="main_window.cpp" line="1621"/>
<source>Stop and Continue &amp;without Saving</source>
<oldsource>Stop and Continue without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1948"/>
+ <location filename="main_window.cpp" line="1953"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>(Nom du fichier ne peut pas être mappé à l&apos;UTF-8)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1969"/>
+ <location filename="main_window.cpp" line="1974"/>
<source>The Wireshark Network Analyzer</source>
<translation>L&apos;analyseur de réseau Wireshark</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1994"/>
+ <location filename="main_window.cpp" line="1999"/>
<source>Capturing from %1</source>
<translation>Capture en cours de %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="198"/>
+ <location filename="main_window_slots.cpp" line="200"/>
<source> before opening another file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="699"/>
+ <location filename="main_window_slots.cpp" line="704"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="791"/>
+ <location filename="main_window_slots.cpp" line="798"/>
<source>Saving %1</source>
<translation>Sauvegarde en cours %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="831"/>
+ <location filename="main_window_slots.cpp" line="838"/>
<source>No interface selected</source>
<translation>Aucune interface sélectionnée</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="841"/>
+ <location filename="main_window_slots.cpp" line="848"/>
<source>Invalid capture filter</source>
<translation>Filtre de capture invalide</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1087"/>
+ <location filename="main_window_slots.cpp" line="1094"/>
<source>Clear Menu</source>
<translation>Effacer les fichiers récemment ouverts</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1553"/>
+ <location filename="main_window_slots.cpp" line="1574"/>
<source>Please wait while Wireshark is initializing</source>
<translation>Veuillez patienter pendant que Wireshark s&apos;initialise. . .</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1643"/>
+ <location filename="main_window_slots.cpp" line="1664"/>
<source> before closing the file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1731"/>
+ <location filename="main_window_slots.cpp" line="1752"/>
<source>Export Selected Packet Bytes</source>
<translation>Exporter Octets de Paquets Sélectionnés</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1797"/>
+ <location filename="main_window_slots.cpp" line="1818"/>
<source>No Keys</source>
<translation>Aucune clés</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1798"/>
+ <location filename="main_window_slots.cpp" line="1819"/>
<source>There are no SSL Session Keys to save.</source>
<translation>Il y a aucune clé de Session SSL à sauvegarder.</translation>
</message>
<message numerus="yes">
- <location filename="main_window_slots.cpp" line="1804"/>
+ <location filename="main_window_slots.cpp" line="1825"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation type="unfinished">
@@ -9291,69 +9290,69 @@ a:hover {
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1733"/>
+ <location filename="main_window_slots.cpp" line="1754"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1808"/>
+ <location filename="main_window_slots.cpp" line="1829"/>
<source>SSL Session Keys (*.keys *.txt);;All Files (</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1946"/>
+ <location filename="main_window_slots.cpp" line="1967"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation>Impossible de copier le texte. Essayer un autre item.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2356"/>
- <location filename="main_window_slots.cpp" line="3458"/>
+ <location filename="main_window_slots.cpp" line="2377"/>
+ <location filename="main_window_slots.cpp" line="3479"/>
<source>Unable to build conversation filter.</source>
<translation>Impossible de construire un filtre de conversation.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2506"/>
- <location filename="main_window_slots.cpp" line="2519"/>
+ <location filename="main_window_slots.cpp" line="2527"/>
+ <location filename="main_window_slots.cpp" line="2540"/>
<source> before reloading the file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2553"/>
+ <location filename="main_window_slots.cpp" line="2574"/>
<source>No filter available. Try another </source>
<translation>Aucun filtre disponible. Essayer un autre</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3465"/>
+ <location filename="main_window_slots.cpp" line="3486"/>
<source>Error compiling filter for this conversation.</source>
<translation>Erreur dans la compilation du filtre pour cette conversation.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3474"/>
+ <location filename="main_window_slots.cpp" line="3495"/>
<source>No previous/next packet in conversation.</source>
<translation>Aucun paquet précédent/suivant dans la conversation</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3551"/>
+ <location filename="main_window_slots.cpp" line="3572"/>
<source>No Interface Selected</source>
<translation>Aucune Interface Sélectionnée</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3558"/>
+ <location filename="main_window_slots.cpp" line="3579"/>
<source> before starting a new capture</source>
<translation>avant de commencer une nouvelle capture</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3576"/>
+ <location filename="main_window_slots.cpp" line="3597"/>
<source> before restarting the capture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3779"/>
+ <location filename="main_window_slots.cpp" line="3800"/>
<source>Wiki Page for %1</source>
<translation>Page Wiki pour %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3780"/>
+ <location filename="main_window_slots.cpp" line="3801"/>
<source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
<translation>&lt;p&gt;Le Wiki Wireshark est maintenu par la communauté&lt;/p&gt;
&lt;p&gt;La page que vous vous apprêtez à charger peut être magnifique, incomplète, fausse ou inexistante&lt;/p&gt;
@@ -9902,7 +9901,7 @@ a:hover {
<translation>Paquet %1</translation>
</message>
<message>
- <location filename="packet_dialog.cpp" line="119"/>
+ <location filename="packet_dialog.cpp" line="120"/>
<source>[%1 closed] </source>
<translation>[%1 fermé]</translation>
</message>
@@ -10224,24 +10223,21 @@ a:hover {
<translation>Valeur</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="271"/>
+ <location filename="preferences_dialog.cpp" line="440"/>
<source>Preferences</source>
<translation>Préférences</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="494"/>
<source>Unknown</source>
- <translation>Inconnu</translation>
+ <translation type="vanished">Inconnu</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="496"/>
<source>Default</source>
- <translation>Défaut</translation>
+ <translation type="vanished">Défaut</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="498"/>
<source>Changed</source>
- <translation>Modifier</translation>
+ <translation type="vanished">Modifier</translation>
</message>
</context>
<context>
@@ -10540,12 +10536,22 @@ a:hover {
<context>
<name>QObject</name>
<message>
- <location filename="preferences_dialog.cpp" line="101"/>
+ <location filename="preferences_dialog.cpp" line="109"/>
+ <source>Default</source>
+ <translation type="unfinished">Défaut</translation>
+ </message>
+ <message>
+ <location filename="preferences_dialog.cpp" line="111"/>
+ <source>Changed</source>
+ <translation type="unfinished">Modifier</translation>
+ </message>
+ <message>
+ <location filename="preferences_dialog.cpp" line="129"/>
<source>Has this preference been changed?</source>
<translation>Cette préférence a été changé?</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="105"/>
+ <location filename="preferences_dialog.cpp" line="139"/>
<source>Default value is empty</source>
<translation>La valeur par défaut est vide</translation>
</message>
@@ -10772,7 +10778,7 @@ a:hover {
<translation>Tout</translation>
</message>
<message>
- <location filename="main_window.cpp" line="229"/>
+ <location filename="main_window.cpp" line="231"/>
<source>Don&apos;t show this message again.</source>
<translation>Ne plus afficher ce message.</translation>
</message>
@@ -11073,6 +11079,7 @@ a:hover {
</message>
<message>
<location filename="lte_rlc_statistics_dialog.cpp" line="176"/>
+ <location filename="preferences_dialog.cpp" line="107"/>
<source>Unknown</source>
<translation>Inconnu</translation>
</message>
@@ -11097,12 +11104,12 @@ a:hover {
<translation>Priorité</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="441"/>
+ <location filename="main_welcome.cpp" line="448"/>
<source>Show in Finder</source>
<translation>Voir dans Finder</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="443"/>
+ <location filename="main_welcome.cpp" line="450"/>
<source>Show in Folder</source>
<translation>Voir dans le Dossier</translation>
</message>
@@ -11122,12 +11129,12 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../wireshark-qt.cpp" line="806"/>
+ <location filename="../../wireshark-qt.cpp" line="800"/>
<source>Invalid Display Filter</source>
<translation type="unfinished">Filtre d&apos;affichage invalide</translation>
</message>
<message>
- <location filename="../../wireshark-qt.cpp" line="807"/>
+ <location filename="../../wireshark-qt.cpp" line="801"/>
<source>The filter expression %1 isn&apos;t a valid display filter. (%2).</source>
<translation type="unfinished"></translation>
</message>
@@ -14182,6 +14189,11 @@ a:hover {
<translation>Changement du module de Préferences</translation>
</message>
<message>
+ <location filename="splash_overlay.cpp" line="163"/>
+ <source>Finding local interfaces</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="splash_overlay.cpp" line="166"/>
<source>Loading configuration files</source>
<translation>Changement des fichiers de configuration</translation>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index 2f15f34a87..ff1ac4bc7d 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -698,22 +698,21 @@
<context>
<name>ByteViewText</name>
<message>
- <location filename="byte_view_text.cpp" line="69"/>
+ <location filename="byte_view_text.cpp" line="73"/>
<source>Show bytes as hexadecimal</source>
<translation>Mostra byte in esadecimale</translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="75"/>
<source>Show bytes as bits</source>
- <translation>Mostra byte come bit</translation>
+ <translation type="vanished">Mostra byte come bit</translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="268"/>
+ <location filename="byte_view_text.cpp" line="282"/>
<source>Byte %1</source>
<translation>Byte %1</translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="271"/>
+ <location filename="byte_view_text.cpp" line="285"/>
<source>Bytes %1-%2</source>
<translation>Byte %1-%2</translation>
</message>
@@ -6881,12 +6880,12 @@ a:hover {
<translation>Hai disabilitato gli aggiornamenti automatici.</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="376"/>
+ <location filename="main_welcome.cpp" line="383"/>
<source>not found</source>
<translation>non trovato</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="458"/>
+ <location filename="main_welcome.cpp" line="465"/>
<source>Copy file path</source>
<translation>Copia percorso del file</translation>
</message>
@@ -9102,213 +9101,213 @@ a:hover {
<translation>Abilita e disabilita protocolli specifici</translation>
</message>
<message>
- <location filename="main_window.cpp" line="431"/>
+ <location filename="main_window.cpp" line="436"/>
<source>Check for Updates</source>
<oldsource>Check for Updates...</oldsource>
<translation>Verifica aggiornamenti</translation>
</message>
<message>
- <location filename="main_window.cpp" line="813"/>
+ <location filename="main_window.cpp" line="818"/>
<source> before quitting</source>
<translation>prima di uscire</translation>
</message>
<message>
- <location filename="main_window.cpp" line="998"/>
+ <location filename="main_window.cpp" line="1003"/>
<source>Save packets before merging?</source>
<translation>Salvare i pacchetti prima di unire?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="999"/>
+ <location filename="main_window.cpp" line="1004"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation>Un file di cattura temporaneo non può essere unito.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1005"/>
+ <location filename="main_window.cpp" line="1010"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation>Salvare le modifiche a &quot;%1&quot; prima di unire?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1007"/>
+ <location filename="main_window.cpp" line="1012"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>Le modifiche devono essere salvate prima di unire.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="210"/>
+ <location filename="main_window_slots.cpp" line="212"/>
<source>Invalid Display Filter</source>
<translation>Filtro di visualizzazione non valido</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1044"/>
+ <location filename="main_window.cpp" line="1049"/>
<source>Invalid Read Filter</source>
<translation>Filtro di lettura non valido</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1045"/>
+ <location filename="main_window.cpp" line="1050"/>
<source>The filter expression %1 isn&apos;t a valid read filter. (%2).</source>
<translation>L&apos;espressione %1 non è un filtro di lettura valido. (%2).</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1135"/>
+ <location filename="main_window.cpp" line="1140"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
<translation>prima di importare una cattura</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1409"/>
+ <location filename="main_window.cpp" line="1414"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation>Impossibile esportare su &quot;%1&quot;.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1410"/>
+ <location filename="main_window.cpp" line="1415"/>
<source>You cannot export packets to the current capture file.</source>
<translation>Non puoi esportare pacchetti sul file di cattura attuale.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1497"/>
- <location filename="main_window.cpp" line="1522"/>
+ <location filename="main_window.cpp" line="1502"/>
+ <location filename="main_window.cpp" line="1527"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1569"/>
+ <location filename="main_window.cpp" line="1574"/>
<source>Do you want to save the changes you&apos;ve made%1?</source>
<oldsource>Do you want to save the captured packets</oldsource>
<translation>Vuoi salvare le modifiche che hai apportato%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1565"/>
- <location filename="main_window.cpp" line="1573"/>
+ <location filename="main_window.cpp" line="1570"/>
+ <location filename="main_window.cpp" line="1578"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation>I pacchetti catturati saranno persi se non li salvi.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1578"/>
+ <location filename="main_window.cpp" line="1583"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation>Vuoi salvare le modifiche che hai apportato al file di cattura &quot;%1&quot;%2?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1570"/>
- <location filename="main_window.cpp" line="1579"/>
+ <location filename="main_window.cpp" line="1575"/>
+ <location filename="main_window.cpp" line="1584"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>Le modifiche saranno perse se non le salvi.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1564"/>
+ <location filename="main_window.cpp" line="1569"/>
<source>Do you want to stop the capture and save the captured packets%1?</source>
<translation>Vuoi interrompere la cattura e salvare i pacchetti catturati%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1572"/>
+ <location filename="main_window.cpp" line="1577"/>
<source>Do you want to save the captured packets%1?</source>
<translation>Vuoi salvare i pacchetti catturati%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1596"/>
+ <location filename="main_window.cpp" line="1601"/>
<source>Save before Continue</source>
<translation>Salva prima di continuare</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1598"/>
+ <location filename="main_window.cpp" line="1603"/>
<source>Stop and Save</source>
<translation>Ferma e salva</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1610"/>
+ <location filename="main_window.cpp" line="1615"/>
<source>Stop and Quit &amp;without Saving</source>
<oldsource>Stop and Quit without Saving</oldsource>
<translation>Ferma ed esci senza sal&amp;vare</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1622"/>
+ <location filename="main_window.cpp" line="1627"/>
<source>Quit &amp;without Saving</source>
<oldsource>Quit without Saving</oldsource>
<translation>Esci senza sal&amp;vare</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1613"/>
- <location filename="main_window.cpp" line="1626"/>
+ <location filename="main_window.cpp" line="1618"/>
+ <location filename="main_window.cpp" line="1631"/>
<source>Continue &amp;without Saving</source>
<oldsource>Continue without Saving</oldsource>
<translation>Continua senza sal&amp;vare</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1616"/>
+ <location filename="main_window.cpp" line="1621"/>
<source>Stop and Continue &amp;without Saving</source>
<oldsource>Stop and Continue without Saving</oldsource>
<translation>Ferma e continua senza sal&amp;vare</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1948"/>
+ <location filename="main_window.cpp" line="1953"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>(Il nome del file non può essere associato in UTF-8)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1969"/>
+ <location filename="main_window.cpp" line="1974"/>
<source>The Wireshark Network Analyzer</source>
<translation>Wireshark l&apos;analizzatore di rete</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1994"/>
+ <location filename="main_window.cpp" line="1999"/>
<source>Capturing from %1</source>
<translation>Cattura da %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="198"/>
+ <location filename="main_window_slots.cpp" line="200"/>
<source> before opening another file</source>
<translation>errore durante l&apos;apertura di un altro file</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="699"/>
+ <location filename="main_window_slots.cpp" line="704"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="791"/>
+ <location filename="main_window_slots.cpp" line="798"/>
<source>Saving %1</source>
<translation>Salvataggio di %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="831"/>
+ <location filename="main_window_slots.cpp" line="838"/>
<source>No interface selected</source>
<translation>Nessuna interfaccia selezionata</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="841"/>
+ <location filename="main_window_slots.cpp" line="848"/>
<source>Invalid capture filter</source>
<translation>Filtro di cattura invalido</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1087"/>
+ <location filename="main_window_slots.cpp" line="1094"/>
<source>Clear Menu</source>
<translation>Pulisci menu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1553"/>
+ <location filename="main_window_slots.cpp" line="1574"/>
<source>Please wait while Wireshark is initializing</source>
<translation>Attendi l&apos;inizializzazione di Wireshark</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1643"/>
+ <location filename="main_window_slots.cpp" line="1664"/>
<source> before closing the file</source>
<translation>prima della chiusura del file</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1731"/>
+ <location filename="main_window_slots.cpp" line="1752"/>
<source>Export Selected Packet Bytes</source>
<translation>Esporta i byte del pacchetto selezionato</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1797"/>
+ <location filename="main_window_slots.cpp" line="1818"/>
<source>No Keys</source>
<translation>Nessuna chiave</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1798"/>
+ <location filename="main_window_slots.cpp" line="1819"/>
<source>There are no SSL Session Keys to save.</source>
<translation>Non ci sono chiavi di sessione SSL da salvare.</translation>
</message>
<message numerus="yes">
- <location filename="main_window_slots.cpp" line="1804"/>
+ <location filename="main_window_slots.cpp" line="1825"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation>
@@ -9317,69 +9316,69 @@ a:hover {
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1733"/>
+ <location filename="main_window_slots.cpp" line="1754"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation>Dati grezzi (*.bin *.dat *.raw);;Tutti i file (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1808"/>
+ <location filename="main_window_slots.cpp" line="1829"/>
<source>SSL Session Keys (*.keys *.txt);;All Files (</source>
<translation>Chiavi di sessione SSL (*.keys *.txt);;Any File (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1946"/>
+ <location filename="main_window_slots.cpp" line="1967"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation>Non riesco a copiare il testo. Prova un&apos;altra voce.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2356"/>
- <location filename="main_window_slots.cpp" line="3458"/>
+ <location filename="main_window_slots.cpp" line="2377"/>
+ <location filename="main_window_slots.cpp" line="3479"/>
<source>Unable to build conversation filter.</source>
<translation>Impossibile creare il filtro di conversazione.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2506"/>
- <location filename="main_window_slots.cpp" line="2519"/>
+ <location filename="main_window_slots.cpp" line="2527"/>
+ <location filename="main_window_slots.cpp" line="2540"/>
<source> before reloading the file</source>
<translation>prima di ricaricare il file</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2553"/>
+ <location filename="main_window_slots.cpp" line="2574"/>
<source>No filter available. Try another </source>
<translation>Nessun filtro disponibile. Provane un altro </translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3465"/>
+ <location filename="main_window_slots.cpp" line="3486"/>
<source>Error compiling filter for this conversation.</source>
<translation>Errore durante la compilazione del filtro per questa conversazione.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3474"/>
+ <location filename="main_window_slots.cpp" line="3495"/>
<source>No previous/next packet in conversation.</source>
<translation>Nessun pacchetto precedente/successivo in conversazione.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3551"/>
+ <location filename="main_window_slots.cpp" line="3572"/>
<source>No Interface Selected</source>
<translation>Nessuna interfaccia selezionata</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3558"/>
+ <location filename="main_window_slots.cpp" line="3579"/>
<source> before starting a new capture</source>
<translation>prima di iniziare una nuova cattura</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3576"/>
+ <location filename="main_window_slots.cpp" line="3597"/>
<source> before restarting the capture</source>
<translation>prima di riavviare la cattura</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3779"/>
+ <location filename="main_window_slots.cpp" line="3800"/>
<source>Wiki Page for %1</source>
<translation>Pagina wiki per %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3780"/>
+ <location filename="main_window_slots.cpp" line="3801"/>
<source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
<translation>&lt;p&gt;Il Wiki di Wireshark è gestito dalla comunità.&lt;/p&gt;&lt;p&gt;La pagina che stai per caricare potrebbe essere perfetta, incompleta, errata o inesistente.&lt;/p&gt;&lt;p&gt;Vuoi proseguire?&lt;/p&gt;</translation>
</message>
@@ -9926,7 +9925,7 @@ a:hover {
<translation>Pacchetto %1</translation>
</message>
<message>
- <location filename="packet_dialog.cpp" line="119"/>
+ <location filename="packet_dialog.cpp" line="120"/>
<source>[%1 closed] </source>
<translation> [%1 chiuso]</translation>
</message>
@@ -10248,24 +10247,21 @@ a:hover {
<translation>Valore</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="271"/>
+ <location filename="preferences_dialog.cpp" line="440"/>
<source>Preferences</source>
<translation>Preferenze</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="494"/>
<source>Unknown</source>
- <translation>Sconosciuto</translation>
+ <translation type="vanished">Sconosciuto</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="496"/>
<source>Default</source>
- <translation>Predefinito</translation>
+ <translation type="vanished">Predefinito</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="498"/>
<source>Changed</source>
- <translation>Modificato</translation>
+ <translation type="vanished">Modificato</translation>
</message>
</context>
<context>
@@ -10564,12 +10560,22 @@ a:hover {
<context>
<name>QObject</name>
<message>
- <location filename="preferences_dialog.cpp" line="101"/>
+ <location filename="preferences_dialog.cpp" line="109"/>
+ <source>Default</source>
+ <translation type="unfinished">Predefinito</translation>
+ </message>
+ <message>
+ <location filename="preferences_dialog.cpp" line="111"/>
+ <source>Changed</source>
+ <translation type="unfinished">Modificato</translation>
+ </message>
+ <message>
+ <location filename="preferences_dialog.cpp" line="129"/>
<source>Has this preference been changed?</source>
<translation>Questa impostazione è stata cambiata?</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="105"/>
+ <location filename="preferences_dialog.cpp" line="139"/>
<source>Default value is empty</source>
<translation>Il valore predefinito è vuoto</translation>
</message>
@@ -10796,7 +10802,7 @@ a:hover {
<translation>Tutti </translation>
</message>
<message>
- <location filename="main_window.cpp" line="229"/>
+ <location filename="main_window.cpp" line="231"/>
<source>Don&apos;t show this message again.</source>
<translation>Non mostrare più questo messaggio.</translation>
</message>
@@ -11097,6 +11103,7 @@ a:hover {
</message>
<message>
<location filename="lte_rlc_statistics_dialog.cpp" line="176"/>
+ <location filename="preferences_dialog.cpp" line="107"/>
<source>Unknown</source>
<translation>Sconosciuto</translation>
</message>
@@ -11121,12 +11128,12 @@ a:hover {
<translation>Priorità</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="441"/>
+ <location filename="main_welcome.cpp" line="448"/>
<source>Show in Finder</source>
<translation>Mostra in Finder</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="443"/>
+ <location filename="main_welcome.cpp" line="450"/>
<source>Show in Folder</source>
<translation>Mostra nella cartella</translation>
</message>
@@ -11146,12 +11153,12 @@ a:hover {
<translation>DLT %1</translation>
</message>
<message>
- <location filename="../../wireshark-qt.cpp" line="806"/>
+ <location filename="../../wireshark-qt.cpp" line="800"/>
<source>Invalid Display Filter</source>
<translation type="unfinished">Filtro di visualizzazione non valido</translation>
</message>
<message>
- <location filename="../../wireshark-qt.cpp" line="807"/>
+ <location filename="../../wireshark-qt.cpp" line="801"/>
<source>The filter expression %1 isn&apos;t a valid display filter. (%2).</source>
<translation type="unfinished"></translation>
</message>
@@ -14235,6 +14242,11 @@ a:hover {
<translation>Caricamento delle configurazioni dei moduli in corso</translation>
</message>
<message>
+ <location filename="splash_overlay.cpp" line="163"/>
+ <source>Finding local interfaces</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="splash_overlay.cpp" line="166"/>
<source>Loading configuration files</source>
<translation>Caricamento delle configurazioni dei file in corso</translation>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index 9afbef2d80..849d548ca8 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -698,22 +698,21 @@
<context>
<name>ByteViewText</name>
<message>
- <location filename="byte_view_text.cpp" line="69"/>
+ <location filename="byte_view_text.cpp" line="73"/>
<source>Show bytes as hexadecimal</source>
<translation>16進数でバイト列を表示</translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="75"/>
<source>Show bytes as bits</source>
- <translation>ビットでバイト列を表示</translation>
+ <translation type="vanished">ビットでバイト列を表示</translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="268"/>
+ <location filename="byte_view_text.cpp" line="282"/>
<source>Byte %1</source>
<translation>バイト %1</translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="271"/>
+ <location filename="byte_view_text.cpp" line="285"/>
<source>Bytes %1-%2</source>
<translation>バイト %1-%2</translation>
</message>
@@ -6838,12 +6837,12 @@ a:hover {
<translation>自動アップデートを無効にしました</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="376"/>
+ <location filename="main_welcome.cpp" line="383"/>
<source>not found</source>
<translation>見つかりません</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="458"/>
+ <location filename="main_welcome.cpp" line="465"/>
<source>Copy file path</source>
<translation>ファイルパスをコピー</translation>
</message>
@@ -9059,213 +9058,213 @@ a:hover {
<translation>指定プロトコルを有効および無効化します</translation>
</message>
<message>
- <location filename="main_window.cpp" line="431"/>
+ <location filename="main_window.cpp" line="436"/>
<source>Check for Updates</source>
<oldsource>Check for Updates...</oldsource>
<translation>更新を確認…</translation>
</message>
<message>
- <location filename="main_window.cpp" line="813"/>
+ <location filename="main_window.cpp" line="818"/>
<source> before quitting</source>
<translation>終了前</translation>
</message>
<message>
- <location filename="main_window.cpp" line="998"/>
+ <location filename="main_window.cpp" line="1003"/>
<source>Save packets before merging?</source>
<translation>結合する前にパケットを保存しますか？</translation>
</message>
<message>
- <location filename="main_window.cpp" line="999"/>
+ <location filename="main_window.cpp" line="1004"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation>一時的なキャプチャファイルは結合することができません</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1005"/>
+ <location filename="main_window.cpp" line="1010"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation>結合する前に &quot;%1&quot; に変更を保存しますか？</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1007"/>
+ <location filename="main_window.cpp" line="1012"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>ファイルを結合する前に変更を保存する必要があります</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="210"/>
+ <location filename="main_window_slots.cpp" line="212"/>
<source>Invalid Display Filter</source>
<translation>無効な表示フィルタ</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1044"/>
+ <location filename="main_window.cpp" line="1049"/>
<source>Invalid Read Filter</source>
<translation>無効な読込フィルタ</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1045"/>
+ <location filename="main_window.cpp" line="1050"/>
<source>The filter expression %1 isn&apos;t a valid read filter. (%2).</source>
<translation>フィルタ式 %1 は有効な読込みフィルタではありません(%2)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1135"/>
+ <location filename="main_window.cpp" line="1140"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
<translation>新しいキャプチャファイルをインポートする前に</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1409"/>
+ <location filename="main_window.cpp" line="1414"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation>&quot;%1&quot; をエクスポートすることができません</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1410"/>
+ <location filename="main_window.cpp" line="1415"/>
<source>You cannot export packets to the current capture file.</source>
<translation>現在のキャプチャファイルへパケットをエクスポートすることはできません</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1497"/>
- <location filename="main_window.cpp" line="1522"/>
+ <location filename="main_window.cpp" line="1502"/>
+ <location filename="main_window.cpp" line="1527"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1569"/>
+ <location filename="main_window.cpp" line="1574"/>
<source>Do you want to save the changes you&apos;ve made%1?</source>
<oldsource>Do you want to save the captured packets</oldsource>
<translation>%1 に作成した変更を保存したいですか？</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1565"/>
- <location filename="main_window.cpp" line="1573"/>
+ <location filename="main_window.cpp" line="1570"/>
+ <location filename="main_window.cpp" line="1578"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation>保存しない場合キャプチャしたパケットは失われます</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1578"/>
+ <location filename="main_window.cpp" line="1583"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation>キャプチャスタイルに行った変更を保存しますか</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1570"/>
- <location filename="main_window.cpp" line="1579"/>
+ <location filename="main_window.cpp" line="1575"/>
+ <location filename="main_window.cpp" line="1584"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>保存しない場合変更は失われます</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1564"/>
+ <location filename="main_window.cpp" line="1569"/>
<source>Do you want to stop the capture and save the captured packets%1?</source>
<translation>キャプチャを停止してキャプチャしたパケットを保存しますか？%1</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1572"/>
+ <location filename="main_window.cpp" line="1577"/>
<source>Do you want to save the captured packets%1?</source>
<translation>キャプチャしたパケットを保存しますか？%1</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1596"/>
+ <location filename="main_window.cpp" line="1601"/>
<source>Save before Continue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1598"/>
+ <location filename="main_window.cpp" line="1603"/>
<source>Stop and Save</source>
<translation>停止して保存</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1610"/>
+ <location filename="main_window.cpp" line="1615"/>
<source>Stop and Quit &amp;without Saving</source>
<oldsource>Stop and Quit without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1622"/>
+ <location filename="main_window.cpp" line="1627"/>
<source>Quit &amp;without Saving</source>
<oldsource>Quit without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1613"/>
- <location filename="main_window.cpp" line="1626"/>
+ <location filename="main_window.cpp" line="1618"/>
+ <location filename="main_window.cpp" line="1631"/>
<source>Continue &amp;without Saving</source>
<oldsource>Continue without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1616"/>
+ <location filename="main_window.cpp" line="1621"/>
<source>Stop and Continue &amp;without Saving</source>
<oldsource>Stop and Continue without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1948"/>
+ <location filename="main_window.cpp" line="1953"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>ファイル名をUTF-8形式に割り当てできません</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1969"/>
+ <location filename="main_window.cpp" line="1974"/>
<source>The Wireshark Network Analyzer</source>
<translation>ワイヤーシャークネットワークアナライザ</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1994"/>
+ <location filename="main_window.cpp" line="1999"/>
<source>Capturing from %1</source>
<translation>%1 からキャプチャ中</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="198"/>
+ <location filename="main_window_slots.cpp" line="200"/>
<source> before opening another file</source>
<translation>別のファイルを開く前に</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="699"/>
+ <location filename="main_window_slots.cpp" line="704"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="791"/>
+ <location filename="main_window_slots.cpp" line="798"/>
<source>Saving %1</source>
<translation>保存中 %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="831"/>
+ <location filename="main_window_slots.cpp" line="838"/>
<source>No interface selected</source>
<translation>インターフェースが選択されていません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="841"/>
+ <location filename="main_window_slots.cpp" line="848"/>
<source>Invalid capture filter</source>
<translation>無効なキャプチャフィルタ</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1087"/>
+ <location filename="main_window_slots.cpp" line="1094"/>
<source>Clear Menu</source>
<translation>メニューをクリア</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1553"/>
+ <location filename="main_window_slots.cpp" line="1574"/>
<source>Please wait while Wireshark is initializing</source>
<translation>Wiresharkが初期化している間お待ちください</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1643"/>
+ <location filename="main_window_slots.cpp" line="1664"/>
<source> before closing the file</source>
<translation>ファイルを閉じる前に</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1731"/>
+ <location filename="main_window_slots.cpp" line="1752"/>
<source>Export Selected Packet Bytes</source>
<translation>選択したパケットバイト列をエクスポート</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1797"/>
+ <location filename="main_window_slots.cpp" line="1818"/>
<source>No Keys</source>
<translation>キーはありません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1798"/>
+ <location filename="main_window_slots.cpp" line="1819"/>
<source>There are no SSL Session Keys to save.</source>
<translation>保存するSSLセッション鍵はありません</translation>
</message>
<message numerus="yes">
- <location filename="main_window_slots.cpp" line="1804"/>
+ <location filename="main_window_slots.cpp" line="1825"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation>
@@ -9273,69 +9272,69 @@ a:hover {
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1733"/>
+ <location filename="main_window_slots.cpp" line="1754"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation>Raw(無加工)データ形式 (*.bin *.dat *.raw);;すべてのファイル(</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1808"/>
+ <location filename="main_window_slots.cpp" line="1829"/>
<source>SSL Session Keys (*.keys *.txt);;All Files (</source>
<translation>SSLセッション鍵 (*.keys *.txt);;すべてのファイル (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1946"/>
+ <location filename="main_window_slots.cpp" line="1967"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation>テキストをコピーできません 別の項目を試してみてください</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2356"/>
- <location filename="main_window_slots.cpp" line="3458"/>
+ <location filename="main_window_slots.cpp" line="2377"/>
+ <location filename="main_window_slots.cpp" line="3479"/>
<source>Unable to build conversation filter.</source>
<translation>会話フィルタを作成できません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2506"/>
- <location filename="main_window_slots.cpp" line="2519"/>
+ <location filename="main_window_slots.cpp" line="2527"/>
+ <location filename="main_window_slots.cpp" line="2540"/>
<source> before reloading the file</source>
<translation>ファイルを再読み込みする前に</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2553"/>
+ <location filename="main_window_slots.cpp" line="2574"/>
<source>No filter available. Try another </source>
<translation>フィルタが利用できません 別のものを試してください</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3465"/>
+ <location filename="main_window_slots.cpp" line="3486"/>
<source>Error compiling filter for this conversation.</source>
<translation>この対話の間のフィルタ翻訳エラー</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3474"/>
+ <location filename="main_window_slots.cpp" line="3495"/>
<source>No previous/next packet in conversation.</source>
<translation>対話の前/次のパケットがありません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3551"/>
+ <location filename="main_window_slots.cpp" line="3572"/>
<source>No Interface Selected</source>
<translation>インターフェースが選択されていません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3558"/>
+ <location filename="main_window_slots.cpp" line="3579"/>
<source> before starting a new capture</source>
<translation>新規キャプチャを開始する前に</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3576"/>
+ <location filename="main_window_slots.cpp" line="3597"/>
<source> before restarting the capture</source>
<translation>キャプチャを再スタートする前に</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3779"/>
+ <location filename="main_window_slots.cpp" line="3800"/>
<source>Wiki Page for %1</source>
<translation>%1 の Wikiページ</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3780"/>
+ <location filename="main_window_slots.cpp" line="3801"/>
<source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
<translation>&lt;p&gt;ワイヤーシャークWikiはコミュニティによって運営されています &lt;/p&gt;&lt;p&gt;いま見ているページはすばらしかったり、不完全だったり、間違っていたり、存在しないかもしれません。&lt;/p&gt;&lt;p&gt;Wikiに移動しますか？&lt;/p&gt;</translation>
</message>
@@ -9882,7 +9881,7 @@ a:hover {
<translation>パケット %1</translation>
</message>
<message>
- <location filename="packet_dialog.cpp" line="119"/>
+ <location filename="packet_dialog.cpp" line="120"/>
<source>[%1 closed] </source>
<translation>[%1 を綴じました] </translation>
</message>
@@ -10204,24 +10203,21 @@ a:hover {
<translation>値</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="271"/>
+ <location filename="preferences_dialog.cpp" line="440"/>
<source>Preferences</source>
<translation>設定</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="494"/>
<source>Unknown</source>
- <translation>不明</translation>
+ <translation type="vanished">不明</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="496"/>
<source>Default</source>
- <translation>デフォルト</translation>
+ <translation type="vanished">デフォルト</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="498"/>
<source>Changed</source>
- <translation>変更された</translation>
+ <translation type="vanished">変更された</translation>
</message>
</context>
<context>
@@ -10520,12 +10516,22 @@ a:hover {
<context>
<name>QObject</name>
<message>
- <location filename="preferences_dialog.cpp" line="101"/>
+ <location filename="preferences_dialog.cpp" line="109"/>
+ <source>Default</source>
+ <translation type="unfinished">デフォルト</translation>
+ </message>
+ <message>
+ <location filename="preferences_dialog.cpp" line="111"/>
+ <source>Changed</source>
+ <translation type="unfinished">変更された</translation>
+ </message>
+ <message>
+ <location filename="preferences_dialog.cpp" line="129"/>
<source>Has this preference been changed?</source>
<translation>この設定を変更されましたか？</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="105"/>
+ <location filename="preferences_dialog.cpp" line="139"/>
<source>Default value is empty</source>
<translation>デフォルト値は空です</translation>
</message>
@@ -10752,7 +10758,7 @@ a:hover {
<translation>すべて </translation>
</message>
<message>
- <location filename="main_window.cpp" line="229"/>
+ <location filename="main_window.cpp" line="231"/>
<source>Don&apos;t show this message again.</source>
<translation>このメッセージは再度表示されません</translation>
</message>
@@ -11053,6 +11059,7 @@ a:hover {
</message>
<message>
<location filename="lte_rlc_statistics_dialog.cpp" line="176"/>
+ <location filename="preferences_dialog.cpp" line="107"/>
<source>Unknown</source>
<translation>不明</translation>
</message>
@@ -11077,12 +11084,12 @@ a:hover {
<translation>優先度</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="441"/>
+ <location filename="main_welcome.cpp" line="448"/>
<source>Show in Finder</source>
<translation>ファインダーで表示</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="443"/>
+ <location filename="main_welcome.cpp" line="450"/>
<source>Show in Folder</source>
<translation>フォルダで表示</translation>
</message>
@@ -11102,12 +11109,12 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../wireshark-qt.cpp" line="806"/>
+ <location filename="../../wireshark-qt.cpp" line="800"/>
<source>Invalid Display Filter</source>
<translation type="unfinished">無効な表示フィルタ</translation>
</message>
<message>
- <location filename="../../wireshark-qt.cpp" line="807"/>
+ <location filename="../../wireshark-qt.cpp" line="801"/>
<source>The filter expression %1 isn&apos;t a valid display filter. (%2).</source>
<translation type="unfinished"></translation>
</message>
@@ -14164,6 +14171,11 @@ a:hover {
<translation>モジュール設定を読込中</translation>
</message>
<message>
+ <location filename="splash_overlay.cpp" line="163"/>
+ <source>Finding local interfaces</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="splash_overlay.cpp" line="166"/>
<source>Loading configuration files</source>
<translation>設定ファイルを読込中</translation>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index f3748d8726..6d759ce695 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -698,22 +698,21 @@
<context>
<name>ByteViewText</name>
<message>
- <location filename="byte_view_text.cpp" line="69"/>
+ <location filename="byte_view_text.cpp" line="73"/>
<source>Show bytes as hexadecimal</source>
<translation>Pokaż szesnastkowo</translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="75"/>
<source>Show bytes as bits</source>
- <translation>Pokaż bitowo</translation>
+ <translation type="vanished">Pokaż bitowo</translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="268"/>
+ <location filename="byte_view_text.cpp" line="282"/>
<source>Byte %1</source>
<translation>Bajt %1</translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="271"/>
+ <location filename="byte_view_text.cpp" line="285"/>
<source>Bytes %1-%2</source>
<translation>Bajty %1-%2</translation>
</message>
@@ -6882,12 +6881,12 @@ text-decoration: underline;
<translation>Automatyczne aktualizacje są wyłączone.</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="376"/>
+ <location filename="main_welcome.cpp" line="383"/>
<source>not found</source>
<translation>nie znaleziono</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="458"/>
+ <location filename="main_welcome.cpp" line="465"/>
<source>Copy file path</source>
<translation>Kopiuj ścieżkę</translation>
</message>
@@ -9103,213 +9102,213 @@ text-decoration: underline;
<translation>Włącz lub wyłącz wybrane protokoły</translation>
</message>
<message>
- <location filename="main_window.cpp" line="431"/>
+ <location filename="main_window.cpp" line="436"/>
<source>Check for Updates</source>
<oldsource>Check for Updates...</oldsource>
<translation>Sprawdź aktualizacje</translation>
</message>
<message>
- <location filename="main_window.cpp" line="813"/>
+ <location filename="main_window.cpp" line="818"/>
<source> before quitting</source>
<translation>przed wyjściem</translation>
</message>
<message>
- <location filename="main_window.cpp" line="998"/>
+ <location filename="main_window.cpp" line="1003"/>
<source>Save packets before merging?</source>
<translation>Zapisać pakiety przed scaleniem?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="999"/>
+ <location filename="main_window.cpp" line="1004"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation>Tymczasowy plik przechwytywania nie może zostać scalony.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1005"/>
+ <location filename="main_window.cpp" line="1010"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation>Zapisać zmiany w &quot;%1&quot; przed scaleniem?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1007"/>
+ <location filename="main_window.cpp" line="1012"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>Zmiany muszą być zapisane przed próbą scalenia plików.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="210"/>
+ <location filename="main_window_slots.cpp" line="212"/>
<source>Invalid Display Filter</source>
<translation>Niepoprawny filtr</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1044"/>
+ <location filename="main_window.cpp" line="1049"/>
<source>Invalid Read Filter</source>
<translation>Niepoprawny filtr wczytywania</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1045"/>
+ <location filename="main_window.cpp" line="1050"/>
<source>The filter expression %1 isn&apos;t a valid read filter. (%2).</source>
<translation>Postać filtru wczytywania %1 nie jest poprawna. (%2).</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1135"/>
+ <location filename="main_window.cpp" line="1140"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
<translation>przed zaimportowaniem nowego pliku przechwytywania</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1409"/>
+ <location filename="main_window.cpp" line="1414"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation>Nie można wyeksportować do &quot;%1&quot;.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1410"/>
+ <location filename="main_window.cpp" line="1415"/>
<source>You cannot export packets to the current capture file.</source>
<translation>Nie można wyeksportować pakietów do aktualnego pliku.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1497"/>
- <location filename="main_window.cpp" line="1522"/>
+ <location filename="main_window.cpp" line="1502"/>
+ <location filename="main_window.cpp" line="1527"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1569"/>
+ <location filename="main_window.cpp" line="1574"/>
<source>Do you want to save the changes you&apos;ve made%1?</source>
<oldsource>Do you want to save the captured packets</oldsource>
<translation>Czy chcesz zapisać zrobione zmiany %1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1565"/>
- <location filename="main_window.cpp" line="1573"/>
+ <location filename="main_window.cpp" line="1570"/>
+ <location filename="main_window.cpp" line="1578"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation>Twoje przechwycone pakiety zostaną utracone jeśli nie zapiszesz ich.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1578"/>
+ <location filename="main_window.cpp" line="1583"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation>Czy chcesz zapisać zmiany, które zrobiłeś do pliku przechytywania &quot;%1&quot;%2?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1570"/>
- <location filename="main_window.cpp" line="1579"/>
+ <location filename="main_window.cpp" line="1575"/>
+ <location filename="main_window.cpp" line="1584"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>Twoje zmiany zostaną utracone jeśli nie zapiszesz ich.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1564"/>
+ <location filename="main_window.cpp" line="1569"/>
<source>Do you want to stop the capture and save the captured packets%1?</source>
<translation>Czy chcesz zatrzymać przechwytywanie i zapisać przechwycone pakiety%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1572"/>
+ <location filename="main_window.cpp" line="1577"/>
<source>Do you want to save the captured packets%1?</source>
<translation>Czy chcesz zapisać przechwycone pakiety%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1596"/>
+ <location filename="main_window.cpp" line="1601"/>
<source>Save before Continue</source>
<translation>Zapisz przed kontynuowaniem</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1598"/>
+ <location filename="main_window.cpp" line="1603"/>
<source>Stop and Save</source>
<translation>Zatrzymaj i zapisz</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1610"/>
+ <location filename="main_window.cpp" line="1615"/>
<source>Stop and Quit &amp;without Saving</source>
<oldsource>Stop and Quit without Saving</oldsource>
<translation>Zatrzymaj i wyjdź bez zapisy&amp;wania</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1622"/>
+ <location filename="main_window.cpp" line="1627"/>
<source>Quit &amp;without Saving</source>
<oldsource>Quit without Saving</oldsource>
<translation>Wyjdź bez zapisy&amp;wania</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1613"/>
- <location filename="main_window.cpp" line="1626"/>
+ <location filename="main_window.cpp" line="1618"/>
+ <location filename="main_window.cpp" line="1631"/>
<source>Continue &amp;without Saving</source>
<oldsource>Continue without Saving</oldsource>
<translation>Kontynuuj bez zapisy&amp;wania</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1616"/>
+ <location filename="main_window.cpp" line="1621"/>
<source>Stop and Continue &amp;without Saving</source>
<oldsource>Stop and Continue without Saving</oldsource>
<translation>Zatrzymaj i kontynuuj bez zapisy&amp;wania</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1948"/>
+ <location filename="main_window.cpp" line="1953"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>(Nazwa pliku nie może być przekonwertowana do formatu UTF-8)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1969"/>
+ <location filename="main_window.cpp" line="1974"/>
<source>The Wireshark Network Analyzer</source>
<translation>Analizator Wireshark</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1994"/>
+ <location filename="main_window.cpp" line="1999"/>
<source>Capturing from %1</source>
<translation>Przechwytywanie z %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="198"/>
+ <location filename="main_window_slots.cpp" line="200"/>
<source> before opening another file</source>
<translation>przed otwarciem nowego pliku</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="699"/>
+ <location filename="main_window_slots.cpp" line="704"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="791"/>
+ <location filename="main_window_slots.cpp" line="798"/>
<source>Saving %1</source>
<translation>Zapisywanie %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="831"/>
+ <location filename="main_window_slots.cpp" line="838"/>
<source>No interface selected</source>
<translation>Nie wybrano interfejsu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="841"/>
+ <location filename="main_window_slots.cpp" line="848"/>
<source>Invalid capture filter</source>
<translation>Niepoprawny filtr przechwytywania</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1087"/>
+ <location filename="main_window_slots.cpp" line="1094"/>
<source>Clear Menu</source>
<translation>Wyczyść Menu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1553"/>
+ <location filename="main_window_slots.cpp" line="1574"/>
<source>Please wait while Wireshark is initializing</source>
<translation>Proszę czekać, trwa uruchamianie Wiresharka</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1643"/>
+ <location filename="main_window_slots.cpp" line="1664"/>
<source> before closing the file</source>
<translation>przed zapisaniem pliku</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1731"/>
+ <location filename="main_window_slots.cpp" line="1752"/>
<source>Export Selected Packet Bytes</source>
<translation>Eksportuj zaznaczony bajty pakietu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1797"/>
+ <location filename="main_window_slots.cpp" line="1818"/>
<source>No Keys</source>
<translation>Brak kluczy</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1798"/>
+ <location filename="main_window_slots.cpp" line="1819"/>
<source>There are no SSL Session Keys to save.</source>
<translation>Nie ma żadnych kluczy sesji SSL do zapisu.</translation>
</message>
<message numerus="yes">
- <location filename="main_window_slots.cpp" line="1804"/>
+ <location filename="main_window_slots.cpp" line="1825"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation>
@@ -9319,69 +9318,69 @@ text-decoration: underline;
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1733"/>
+ <location filename="main_window_slots.cpp" line="1754"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation>Surowe dane (*.bin *.dat *.raw);;Dowolny plik (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1808"/>
+ <location filename="main_window_slots.cpp" line="1829"/>
<source>SSL Session Keys (*.keys *.txt);;All Files (</source>
<translation>Klucze sesji SSL (*.keys *.txt);; Dowolny plik (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1946"/>
+ <location filename="main_window_slots.cpp" line="1967"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation>Nie można skopiować tekstu. Spróbuj inną pozycję.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2356"/>
- <location filename="main_window_slots.cpp" line="3458"/>
+ <location filename="main_window_slots.cpp" line="2377"/>
+ <location filename="main_window_slots.cpp" line="3479"/>
<source>Unable to build conversation filter.</source>
<translation>Nie można stworzyć filtru konwersacji.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2506"/>
- <location filename="main_window_slots.cpp" line="2519"/>
+ <location filename="main_window_slots.cpp" line="2527"/>
+ <location filename="main_window_slots.cpp" line="2540"/>
<source> before reloading the file</source>
<translation>przed przeładowaniem pliku</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2553"/>
+ <location filename="main_window_slots.cpp" line="2574"/>
<source>No filter available. Try another </source>
<translation>Brak dostępnych filtrów. Spróbuj ponownie</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3465"/>
+ <location filename="main_window_slots.cpp" line="3486"/>
<source>Error compiling filter for this conversation.</source>
<translation>Błąd kompilacji filtru dla tej konwersacji.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3474"/>
+ <location filename="main_window_slots.cpp" line="3495"/>
<source>No previous/next packet in conversation.</source>
<translation>Brak poprzedniego i następnego pakietu w konwersacji.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3551"/>
+ <location filename="main_window_slots.cpp" line="3572"/>
<source>No Interface Selected</source>
<translation>Nie wybrano interfejsu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3558"/>
+ <location filename="main_window_slots.cpp" line="3579"/>
<source> before starting a new capture</source>
<translation>przed wystartowaniem nowego przechwytywania</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3576"/>
+ <location filename="main_window_slots.cpp" line="3597"/>
<source> before restarting the capture</source>
<translation>przed restartem przechwytywania</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3779"/>
+ <location filename="main_window_slots.cpp" line="3800"/>
<source>Wiki Page for %1</source>
<translation>Strona Wiki dla %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3780"/>
+ <location filename="main_window_slots.cpp" line="3801"/>
<source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
<translation>&lt;p&gt;Strona Wiki Wiresharka jest zarządzania przez społeczność.&lt;/p&gt;&lt;p&gt;Strona którą chcesz wczytać może być wspaniała, niekompletna, błędna lub nie istnieć.&lt;/p&gt;&lt;p&gt;Kontynuować wczytywanie strony Wiki?&lt;/p&gt;</translation>
</message>
@@ -9928,7 +9927,7 @@ text-decoration: underline;
<translation>Pakiet %1</translation>
</message>
<message>
- <location filename="packet_dialog.cpp" line="119"/>
+ <location filename="packet_dialog.cpp" line="120"/>
<source>[%1 closed] </source>
<translation>[%1 zamknięty]</translation>
</message>
@@ -10249,24 +10248,21 @@ text-decoration: underline;
<translation>Wartość</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="271"/>
+ <location filename="preferences_dialog.cpp" line="440"/>
<source>Preferences</source>
<translation>Preferencje</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="494"/>
<source>Unknown</source>
- <translation>Nieznane</translation>
+ <translation type="vanished">Nieznane</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="496"/>
<source>Default</source>
- <translation>Domyślne</translation>
+ <translation type="vanished">Domyślne</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="498"/>
<source>Changed</source>
- <translation>Zmienione</translation>
+ <translation type="vanished">Zmienione</translation>
</message>
</context>
<context>
@@ -10565,12 +10561,22 @@ text-decoration: underline;
<context>
<name>QObject</name>
<message>
- <location filename="preferences_dialog.cpp" line="101"/>
+ <location filename="preferences_dialog.cpp" line="109"/>
+ <source>Default</source>
+ <translation type="unfinished">Domyślne</translation>
+ </message>
+ <message>
+ <location filename="preferences_dialog.cpp" line="111"/>
+ <source>Changed</source>
+ <translation type="unfinished">Zmienione</translation>
+ </message>
+ <message>
+ <location filename="preferences_dialog.cpp" line="129"/>
<source>Has this preference been changed?</source>
<translation>Czy to ustawienie zostało zmienione?</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="105"/>
+ <location filename="preferences_dialog.cpp" line="139"/>
<source>Default value is empty</source>
<translation>Domyślna wartość jest pusta</translation>
</message>
@@ -10797,7 +10803,7 @@ text-decoration: underline;
<translation>Każdy</translation>
</message>
<message>
- <location filename="main_window.cpp" line="229"/>
+ <location filename="main_window.cpp" line="231"/>
<source>Don&apos;t show this message again.</source>
<translation>Nie pokazuj więcej tego komunikatu.</translation>
</message>
@@ -11098,6 +11104,7 @@ text-decoration: underline;
</message>
<message>
<location filename="lte_rlc_statistics_dialog.cpp" line="176"/>
+ <location filename="preferences_dialog.cpp" line="107"/>
<source>Unknown</source>
<translation>Nienany</translation>
</message>
@@ -11122,12 +11129,12 @@ text-decoration: underline;
<translation>Priorytet</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="441"/>
+ <location filename="main_welcome.cpp" line="448"/>
<source>Show in Finder</source>
<translation>Otwórz w wyszukiwajce</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="443"/>
+ <location filename="main_welcome.cpp" line="450"/>
<source>Show in Folder</source>
<translation>Otwórz w folderze</translation>
</message>
@@ -11147,12 +11154,12 @@ text-decoration: underline;
<translation>DLT %1</translation>
</message>
<message>
- <location filename="../../wireshark-qt.cpp" line="806"/>
+ <location filename="../../wireshark-qt.cpp" line="800"/>
<source>Invalid Display Filter</source>
<translation type="unfinished">Niepoprawny filtr</translation>
</message>
<message>
- <location filename="../../wireshark-qt.cpp" line="807"/>
+ <location filename="../../wireshark-qt.cpp" line="801"/>
<source>The filter expression %1 isn&apos;t a valid display filter. (%2).</source>
<translation type="unfinished"></translation>
</message>
@@ -14240,6 +14247,11 @@ text-decoration: underline;
<translation>Ładowanie preferencji modułów</translation>
</message>
<message>
+ <location filename="splash_overlay.cpp" line="163"/>
+ <source>Finding local interfaces</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="splash_overlay.cpp" line="166"/>
<source>Loading configuration files</source>
<translation>Ładowanie plików konfiguracyjnych</translation>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 1aa1219333..a302ce297c 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -698,22 +698,21 @@
<context>
<name>ByteViewText</name>
<message>
- <location filename="byte_view_text.cpp" line="69"/>
+ <location filename="byte_view_text.cpp" line="73"/>
<source>Show bytes as hexadecimal</source>
<translation>以十六进制显示字节</translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="75"/>
<source>Show bytes as bits</source>
- <translation>以二进制显示字节</translation>
+ <translation type="vanished">以二进制显示字节</translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="268"/>
+ <location filename="byte_view_text.cpp" line="282"/>
<source>Byte %1</source>
<translation>字节 %1</translation>
</message>
<message>
- <location filename="byte_view_text.cpp" line="271"/>
+ <location filename="byte_view_text.cpp" line="285"/>
<source>Bytes %1-%2</source>
<translation>字节 %1-%2</translation>
</message>
@@ -6871,12 +6870,12 @@ text-decoration: underline;
<translation>禁止自动更新。</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="376"/>
+ <location filename="main_welcome.cpp" line="383"/>
<source>not found</source>
<translation>未找到</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="458"/>
+ <location filename="main_welcome.cpp" line="465"/>
<source>Copy file path</source>
<translation>复制文件路径</translation>
</message>
@@ -9092,213 +9091,213 @@ text-decoration: underline;
<translation>启用和禁用特定的协议</translation>
</message>
<message>
- <location filename="main_window.cpp" line="431"/>
+ <location filename="main_window.cpp" line="436"/>
<source>Check for Updates</source>
<oldsource>Check for Updates...</oldsource>
<translation>检查更新</translation>
</message>
<message>
- <location filename="main_window.cpp" line="813"/>
+ <location filename="main_window.cpp" line="818"/>
<source> before quitting</source>
<translation>在退出前</translation>
</message>
<message>
- <location filename="main_window.cpp" line="998"/>
+ <location filename="main_window.cpp" line="1003"/>
<source>Save packets before merging?</source>
<translation>是否在合并之前保存分组？</translation>
</message>
<message>
- <location filename="main_window.cpp" line="999"/>
+ <location filename="main_window.cpp" line="1004"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation>无法合并临时捕获文件。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1005"/>
+ <location filename="main_window.cpp" line="1010"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation>是否在合并前保存对“%1”的更改？</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1007"/>
+ <location filename="main_window.cpp" line="1012"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>在文件合并之前，其更改必须先保存。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="210"/>
+ <location filename="main_window_slots.cpp" line="212"/>
<source>Invalid Display Filter</source>
<translation>无效显示过滤器</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1044"/>
+ <location filename="main_window.cpp" line="1049"/>
<source>Invalid Read Filter</source>
<translation>无效读取过滤器</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1045"/>
+ <location filename="main_window.cpp" line="1050"/>
<source>The filter expression %1 isn&apos;t a valid read filter. (%2).</source>
<translation>过滤器表达式 %1 不是有效的读取过滤器 (%2)。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1135"/>
+ <location filename="main_window.cpp" line="1140"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
<translation> 导入新捕获前</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1409"/>
+ <location filename="main_window.cpp" line="1414"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation>无法导出“%1”。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1410"/>
+ <location filename="main_window.cpp" line="1415"/>
<source>You cannot export packets to the current capture file.</source>
<translation>您不能将分组导出到当前捕获文件。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1497"/>
- <location filename="main_window.cpp" line="1522"/>
+ <location filename="main_window.cpp" line="1502"/>
+ <location filename="main_window.cpp" line="1527"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1569"/>
+ <location filename="main_window.cpp" line="1574"/>
<source>Do you want to save the changes you&apos;ve made%1?</source>
<oldsource>Do you want to save the captured packets</oldsource>
<translation>您是否要保存已做出的更改%1？</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1565"/>
- <location filename="main_window.cpp" line="1573"/>
+ <location filename="main_window.cpp" line="1570"/>
+ <location filename="main_window.cpp" line="1578"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation>若不保存，您已经捕获的分组将会丢失。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1578"/>
+ <location filename="main_window.cpp" line="1583"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation>是否希望保存对捕获文件“%1”%2 的更改？</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1570"/>
- <location filename="main_window.cpp" line="1579"/>
+ <location filename="main_window.cpp" line="1575"/>
+ <location filename="main_window.cpp" line="1584"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>若不保存，您的更改将会丢失。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1564"/>
+ <location filename="main_window.cpp" line="1569"/>
<source>Do you want to stop the capture and save the captured packets%1?</source>
<translation>您是否要停止捕获，并保存已捕获的分组%1？</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1572"/>
+ <location filename="main_window.cpp" line="1577"/>
<source>Do you want to save the captured packets%1?</source>
<translation>您是否要保存已捕获的分组%1？</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1596"/>
+ <location filename="main_window.cpp" line="1601"/>
<source>Save before Continue</source>
<translation>继续前保存</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1598"/>
+ <location filename="main_window.cpp" line="1603"/>
<source>Stop and Save</source>
<translation>停止并保存</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1610"/>
+ <location filename="main_window.cpp" line="1615"/>
<source>Stop and Quit &amp;without Saving</source>
<oldsource>Stop and Quit without Saving</oldsource>
<translation>停止并退出，不保存(&amp;W)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1622"/>
+ <location filename="main_window.cpp" line="1627"/>
<source>Quit &amp;without Saving</source>
<oldsource>Quit without Saving</oldsource>
<translation>直接退出，不保存(&amp;W)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1613"/>
- <location filename="main_window.cpp" line="1626"/>
+ <location filename="main_window.cpp" line="1618"/>
+ <location filename="main_window.cpp" line="1631"/>
<source>Continue &amp;without Saving</source>
<oldsource>Continue without Saving</oldsource>
<translation>继续，不保存(&amp;W)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1616"/>
+ <location filename="main_window.cpp" line="1621"/>
<source>Stop and Continue &amp;without Saving</source>
<oldsource>Stop and Continue without Saving</oldsource>
<translation>停止并继续，不保存(&amp;W)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1948"/>
+ <location filename="main_window.cpp" line="1953"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>文件名不能映射到UTF-8</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1969"/>
+ <location filename="main_window.cpp" line="1974"/>
<source>The Wireshark Network Analyzer</source>
<translation>Wireshark 网络分析器</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1994"/>
+ <location filename="main_window.cpp" line="1999"/>
<source>Capturing from %1</source>
<translation>正在捕获 %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="198"/>
+ <location filename="main_window_slots.cpp" line="200"/>
<source> before opening another file</source>
<translation>打开另一个文件前</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="699"/>
+ <location filename="main_window_slots.cpp" line="704"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="791"/>
+ <location filename="main_window_slots.cpp" line="798"/>
<source>Saving %1</source>
<translation>正在保存 %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="831"/>
+ <location filename="main_window_slots.cpp" line="838"/>
<source>No interface selected</source>
<translation>未选中接口</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="841"/>
+ <location filename="main_window_slots.cpp" line="848"/>
<source>Invalid capture filter</source>
<translation>无效捕获过滤器</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1087"/>
+ <location filename="main_window_slots.cpp" line="1094"/>
<source>Clear Menu</source>
<translation>清除菜单</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1553"/>
+ <location filename="main_window_slots.cpp" line="1574"/>
<source>Please wait while Wireshark is initializing</source>
<translation>Wireshark 正在初始化，请稍候</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1643"/>
+ <location filename="main_window_slots.cpp" line="1664"/>
<source> before closing the file</source>
<translation>关闭文件前</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1731"/>
+ <location filename="main_window_slots.cpp" line="1752"/>
<source>Export Selected Packet Bytes</source>
<translation>导出选择分组字节流</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1797"/>
+ <location filename="main_window_slots.cpp" line="1818"/>
<source>No Keys</source>
<translation>无密钥</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1798"/>
+ <location filename="main_window_slots.cpp" line="1819"/>
<source>There are no SSL Session Keys to save.</source>
<translation>没有可以保存的 SSL 会话密钥。</translation>
</message>
<message numerus="yes">
- <location filename="main_window_slots.cpp" line="1804"/>
+ <location filename="main_window_slots.cpp" line="1825"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation>
@@ -9306,69 +9305,69 @@ text-decoration: underline;
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1733"/>
+ <location filename="main_window_slots.cpp" line="1754"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation>原始数据 (*.bin *.dat *.raw);;所有文件 (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1808"/>
+ <location filename="main_window_slots.cpp" line="1829"/>
<source>SSL Session Keys (*.keys *.txt);;All Files (</source>
<translation>SSL 会话密钥 (*.keys *.txt);;所有文件 (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1946"/>
+ <location filename="main_window_slots.cpp" line="1967"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation>无法复制文本。请尝试其他对象。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2356"/>
- <location filename="main_window_slots.cpp" line="3458"/>
+ <location filename="main_window_slots.cpp" line="2377"/>
+ <location filename="main_window_slots.cpp" line="3479"/>
<source>Unable to build conversation filter.</source>
<translation>无法建立对话过滤器。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2506"/>
- <location filename="main_window_slots.cpp" line="2519"/>
+ <location filename="main_window_slots.cpp" line="2527"/>
+ <location filename="main_window_slots.cpp" line="2540"/>
<source> before reloading the file</source>
<translation>重新载入文件前</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2553"/>
+ <location filename="main_window_slots.cpp" line="2574"/>
<source>No filter available. Try another </source>
<translation>无过滤器可用。请尝试其他 </translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3465"/>
+ <location filename="main_window_slots.cpp" line="3486"/>
<source>Error compiling filter for this conversation.</source>
<translation>为此对话编译过滤器时出错。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3474"/>
+ <location filename="main_window_slots.cpp" line="3495"/>
<source>No previous/next packet in conversation.</source>
<translation>此对话中没有上一个/下一个分组。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3551"/>
+ <location filename="main_window_slots.cpp" line="3572"/>
<source>No Interface Selected</source>
<translation>未选中接口</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3558"/>
+ <location filename="main_window_slots.cpp" line="3579"/>
<source> before starting a new capture</source>
<translation>在开始新捕获前</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3576"/>
+ <location filename="main_window_slots.cpp" line="3597"/>
<source> before restarting the capture</source>
<translation>重新开始捕获前</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3779"/>
+ <location filename="main_window_slots.cpp" line="3800"/>
<source>Wiki Page for %1</source>
<translation>%1 的 Wiki 页面</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3780"/>
+ <location filename="main_window_slots.cpp" line="3801"/>
<source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
<translation>&lt;p&gt;Wireshark Wiki 由社区进行维护。&lt;/p&gt;&lt;p&gt;您即将加载的页面可能是良好的、不完整的、有错误的，甚至不存在的。&lt;/p&gt;&lt;p&gt;继续访问该 Wiki？&lt;/p&gt;</translation>
</message>
@@ -9915,7 +9914,7 @@ text-decoration: underline;
<translation>分组 %1</translation>
</message>
<message>
- <location filename="packet_dialog.cpp" line="119"/>
+ <location filename="packet_dialog.cpp" line="120"/>
<source>[%1 closed] </source>
<translation>[%1 已关闭] </translation>
</message>
@@ -10236,24 +10235,21 @@ text-decoration: underline;
<translation>值</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="271"/>
+ <location filename="preferences_dialog.cpp" line="440"/>
<source>Preferences</source>
<translation>首选项</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="494"/>
<source>Unknown</source>
- <translation>未知</translation>
+ <translation type="vanished">未知</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="496"/>
<source>Default</source>
- <translation>默认</translation>
+ <translation type="vanished">默认</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="498"/>
<source>Changed</source>
- <translation>已更改</translation>
+ <translation type="vanished">已更改</translation>
</message>
</context>
<context>
@@ -10552,12 +10548,22 @@ text-decoration: underline;
<context>
<name>QObject</name>
<message>
- <location filename="preferences_dialog.cpp" line="101"/>
+ <location filename="preferences_dialog.cpp" line="109"/>
+ <source>Default</source>
+ <translation type="unfinished">默认</translation>
+ </message>
+ <message>
+ <location filename="preferences_dialog.cpp" line="111"/>
+ <source>Changed</source>
+ <translation type="unfinished">已更改</translation>
+ </message>
+ <message>
+ <location filename="preferences_dialog.cpp" line="129"/>
<source>Has this preference been changed?</source>
<translation>此首选项已被更改？</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="105"/>
+ <location filename="preferences_dialog.cpp" line="139"/>
<source>Default value is empty</source>
<translation>默认值为空</translation>
</message>
@@ -10784,7 +10790,7 @@ text-decoration: underline;
<translation>任何</translation>
</message>
<message>
- <location filename="main_window.cpp" line="229"/>
+ <location filename="main_window.cpp" line="231"/>
<source>Don&apos;t show this message again.</source>
<translation>不再显示此消息。</translation>
</message>
@@ -11085,6 +11091,7 @@ text-decoration: underline;
</message>
<message>
<location filename="lte_rlc_statistics_dialog.cpp" line="176"/>
+ <location filename="preferences_dialog.cpp" line="107"/>
<source>Unknown</source>
<translation>未知</translation>
</message>
@@ -11109,12 +11116,12 @@ text-decoration: underline;
<translation>优先级</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="441"/>
+ <location filename="main_welcome.cpp" line="448"/>
<source>Show in Finder</source>
<translation>在 Finder 中显示</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="443"/>
+ <location filename="main_welcome.cpp" line="450"/>
<source>Show in Folder</source>
<translation>在 Finder 中显示</translation>
</message>
@@ -11134,12 +11141,12 @@ text-decoration: underline;
<translation>DLT %1</translation>
</message>
<message>
- <location filename="../../wireshark-qt.cpp" line="806"/>
+ <location filename="../../wireshark-qt.cpp" line="800"/>
<source>Invalid Display Filter</source>
<translation type="unfinished">无效显示过滤器</translation>
</message>
<message>
- <location filename="../../wireshark-qt.cpp" line="807"/>
+ <location filename="../../wireshark-qt.cpp" line="801"/>
<source>The filter expression %1 isn&apos;t a valid display filter. (%2).</source>
<translation type="unfinished"></translation>
</message>
@@ -14196,6 +14203,11 @@ text-decoration: underline;
<translation>正在加载模块首选项</translation>
</message>
<message>
+ <location filename="splash_overlay.cpp" line="163"/>
+ <source>Finding local interfaces</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="splash_overlay.cpp" line="166"/>
<source>Loading configuration files</source>
<translation>正在加载配置文件</translation>
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-16 20:35:52 +0000