aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS2
-rw-r--r--epan/enterprise-numbers290
-rw-r--r--epan/sminmpec.c71
-rw-r--r--manuf51
-rw-r--r--services10
-rw-r--r--ui/qt/wireshark_de.ts147
-rw-r--r--ui/qt/wireshark_en.ts147
-rw-r--r--ui/qt/wireshark_fr.ts147
-rw-r--r--ui/qt/wireshark_it.ts147
-rw-r--r--ui/qt/wireshark_ja_JP.ts147
-rw-r--r--ui/qt/wireshark_pl.ts147
-rw-r--r--ui/qt/wireshark_zh_CN.ts147
12 files changed, 955 insertions, 498 deletions
diff --git a/AUTHORS b/AUTHORS
index 2d369ca677..7569de215f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3954,6 +3954,7 @@ Benoît Canet <benoit[AT]scylladb.com>
From git log
---------------
Adam Goldman <adam.goldman[AT]intel.com>
+Adam Mitz <mitza[AT]ociweb.com>
Adam Pridgen <adam.pridgen[AT]thecoverofnight.com>
Adam Schwalm <adam.schwalm[AT]dynetics.com>
Aditya Jain <aditya.jain[AT]samsung.com>
@@ -4139,6 +4140,7 @@ John Miner <optommp[AT]gmail.com>
Jonas Falkevik <jonas.falkevik[AT]gmail.com>
Jonathan Brucker <jonathan.brucke[AT]gmail.com>
Jonathan Muñoz <jonathan.munoz[AT]inria.fr>
+Jordan Keister <grokspawn[AT]gmail.com>
Jorge Power <jpower[AT]rsscorp.org>
Jose Rubio <joserubiovidales[AT]gmail.com>
Josef Baumgartner <josef.baumgartner[AT]br-automation.com>
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 78610d97cc..018640a511 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2017-01-21)
+(last updated 2017-01-28)
SMI Network Management Private Enterprise Codes:
@@ -172516,7 +172516,7 @@ Decentralization / Helenic Public Administra
Dieter Scheinkönig
service&scheinkoenig.com
43234
- LLC Enistek
+ Enistek LLC
Andrey Tolstoy
andrey&enistek.com
43235
@@ -176318,7 +176318,7 @@ Decentralization / Helenic Public Administra
44184
Ma-Ya IT Consult, e.U.
Albin Mayer
- albinm&mayaitc.com
+ office&mayaitc.com
44185
Horizon Medical Group, Inc
Michelle Hamm
@@ -176753,8 +176753,8 @@ Decentralization / Helenic Public Administra
stan.liu&senao.com
44293
Unwired Networks GmbH
- Gregor Glashuettner
- gregor.glashuettner&unwired.at
+ Alexander Szlezak
+ devops&unwired.at
44294
Quanta-Computing
Matthieu ROSINSKI
@@ -196585,8 +196585,8 @@ Decentralization / Helenic Public Administra
adebroise&robiquity.com
49251
Blue Grass Airport
- IT Director
- gatekeeper&bluegrassairport.com
+ David Roux
+ helpdesk&bluegrassairport.com
49252
Cincinnati Bell
Dan Trees
@@ -196771,6 +196771,282 @@ Decentralization / Helenic Public Administra
Avicenna Health Group Inc
Mohammadreza Hemmati
hemmati&avicennapp.com
+49298
+ The Port Authority of NY & NJ
+ Steven Choy
+ schoy&panynj.gov
+49299
+ Truecom Telesoft Private Limited
+ Chirayu Patel
+ sales&truecomtelesoft.com
+49300
+ The New Tricks
+ Taylor Trimble
+ taylor&thenewtricks.com
+49301
+ BCS Information Systems Pte Ltd
+ Choo Tian Fook
+ chootianfook&bcsis.com
+49302
+ Dart Container
+ Michael Watters
+ michael.watters&dart.biz
+49303
+ Flexmedia Ind. e Com. de Tecnologia Ltda.
+ Gustavo Yamasaki Martins Vieira
+ gvieira&flexmedia.com.br
+49304
+ Tapoustry
+ David Roux
+ hello&tapoustry.com
+49305
+ Neural Technologies
+ Adrian C Harris
+ adrian.harris&neuralt.com
+49306
+ AUM Cardiovascular Inc
+ Marie Johnson
+ info&aumcardiovascular.com
+49307
+ Secturion Systems Inc.
+ Richard Jorgensen
+ rjorgensen&secturion.com
+49308
+ Airwave Brasil Tecnologia
+ Younes Maia
+ ymaia&abt.tv.br
+49309
+ VIDA AB
+ Magnus Linner
+ magnus.linner&vida.se
+49310
+ CELLULAR GmbH
+ Daniel Storozhev
+ dstorozhev&cellular.de
+49311
+ Asteas Technologies GmbH & Co KG
+ SNMP MiB Management
+ office&asteas.com
+49312
+ MichaelSchneiderKoeln
+ Michael Schneider
+ schneider.michael.cgn&web.de
+49313
+ Isaac Johnson Organization
+ Isaac Johnson
+ isaacmjohnson&gmail.com
+49314
+ ADFweb.com
+ Piero Sartor
+ p.sartor&adfweb.com
+49315
+ Sealite PTY LTD
+ Jens Ohle
+ j.ohle&sealite.com
+49316
+ SixGor
+ Zanz Abteilung
+ ZanzAbteilung&protonmail.ch
+49317
+ ICT Star Group Myanmar Co., Ltd.
+ San Lin Naing
+ sanlin&isgm2.com
+49318
+ Desert Water Agency
+ Mohammed S Abbazih
+ isguys&dwa.org
+49319
+ Credit Bank of Moscow PJSC
+ Andrey Lopatin
+ crt&mkb.ru
+49320
+ Wallnäs AB
+ Carl johan Örmander
+ carl-johan.ormander&wallnas.se
+49321
+ Vevy Europe S.p.A.
+ Raffaele Rialdi
+ atd&vevy.com
+49322
+ Haaglanden Medisch Centrum
+ Michel Vissers
+ tib&haaglandenmc.nl
+49323
+ Dynamic Consulting International Telecommunications Spain, S. L.
+ Seila Garcia
+ admdci&dci.es
+49324
+ mobex communication GmbH
+ Markus Urban
+ m.urban&mobex.de
+49325
+ EVER SMART TECHNOLOGIES SL
+ Jesus Martínez
+ jesus&eversmart.io
+49326
+ Clyde Bergemann Power Group International Ltd
+ Stephan Bovet
+ stephan.bovet&de.cbpg.com
+49327
+ Frivillighetshuset
+ Karl Fredrik Haugland
+ kf&frivillighetshuset.no
+49328
+ Praim srl
+ Andres Kaswalder
+ sysadmin&praim.com
+49329
+ SysEleven GmbH
+ SysEleven GmbH Security
+ security&syseleven.de
+49330
+ A.B.G Systems Ltd Israel
+ Yuval Ofer
+ yuval&abgsystems.com
+49331
+ Johannishus godsflrvaltning AB
+ Magnus Roth
+ magnus.rooth&johannishus.com
+49332
+ AppWorks
+ Juliana Lin
+ appworksales&gmail.com
+49333
+ Brighthouse Financial Inc.
+ Stefan Kelber
+ skelber&metlife.com
+49334
+ Axon-Ar
+ Diego Bellver
+ diego.bellver&gmail.com
+49335
+ ROTOK
+ Robert Klein
+ rtwk72&yahoo.com
+49336
+ Schreiber Systems
+ Dennis Schreiber
+ oid.iana&schreiber.systems
+49337
+ KommunalBIT AöR
+ Team Systeme und Netze
+ systemeundnetze&kommunalbit.de
+49338
+ ASTEN
+ Philippe LEMAZURIER
+ philippe.lemazurier&groupe-asten.fr
+49339
+ GAYA
+ Julien Liebert
+ tech&gaya.fr
+49340
+ Beijing Fusion Co., Ltd
+ Gao, Bo
+ gaobo&senlime.com
+49341
+ Ayuntamiento de Cartagena
+ Alejandro Delgado-Gomez
+ alejandro.delgado&ayto-cartagena.es
+49342
+ Unser Heimatbäcker GmbH
+ Mathias Krämer
+ m.kraemer&unserheimatbaecker.de
+49343
+ HaloDoc.com
+ Pandu POLUAN
+ pandu.poluan&halodoc.com
+49344
+ IX Layers, Inc.
+ KIKUCHI Yutaka
+ admin&ix-layers.com
+49345
+ KVaibhav Personal CA
+ Vaibhav Kurde
+ sslca&kvaibhav.in
+49346
+ Samvardhana Motherson Innovative Autosystems B.V. & Co. KG
+ Juergen Baule
+ juergen.baule&smia-automotive.com
+49347
+ Healthjump
+ Clifford Cavanaugh
+ oid&healthjump.com
+49348
+ Yapku Limited
+ Darren Breeze
+ darren&yapku.com
+49349
+ BCDVideo
+ tom larson
+ tlarson&bcdvideo.com
+49350
+ VGCIT, Inc.
+ Vartan Chukhadarian
+ vartanc&vgcit.com
+49351
+ STIVCX
+ Ivan Athanazio
+ ivan.athanazio&gmail.com
+49352
+ Hines Network
+ Jason Hines
+ jason&hinesnetwork.com
+49353
+ Certificate Authority for Presidential Office of Information and Communication Technologies of the Dominican Republic
+ BENITO GALAN
+ BGALAN&VIAFIRMA.COM
+49354
+ ARGYROU MINAS
+ ARGYROU MINAS
+ minasargyrou&outlook.com
+49355
+ Fiskarhedens Trävaru AB
+ Ulf Gustavsson
+ ulf.gustavsson&fiskarheden.se
+49356
+ DQE Communications
+ Mike Kelly
+ mkelly&dqe.com
+49357
+ Hoptroff London Limited
+ Lasse Johnsen
+ admin&hoptroff.com
+49358
+ Tri-State Digital Services
+ Jim Wickenhiser
+ jim&tristatetheatre.com
+49359
+ Enterstrata
+ Isaac Johnson
+ isaacmjohnson&gmail.com
+49360
+ Cord3 Innovations
+ Dennis Momy
+ dennis.momy&cord3inc.com
+49361
+ Pridok AS
+ Dag Christensen
+ dag&pridok.no
+49362
+ tabaracci.org
+ Al Tabaracci
+ oidadmin&tabaracci.org
+49363
+ Unior Hungary Ltd.
+ Balazs Tihanyi
+ balazs.tihanyi&unior.hu
+49364
+ ALFA SATCOM SYSTEMS LLC
+ Andrey Zinchenko
+ az&alfasatcom.ru
+49365
+ Phoenix Online Studios
+ Richard Flores
+ webmaster&postudios.com
+49366
+ visol digitale Dienstleistungen GmbH
+ Jonas Renggli
+ jonas.renggli&visol.ch
End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index 60d6eebc2a..17f305a95b 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -43254,7 +43254,7 @@ const value_string sminmpec_values[] = {
{ 43231, "GSI Helmholtzzentrum f\0303\0274r Schwerionenforschung GmbH" },
{ 43232, "Bank of Nova Scotia" },
{ 43233, "Scheink\0303\0266nig & Co." },
- { 43234, "LLC Enistek" },
+ { 43234, "Enistek LLC" },
{ 43235, "Stadt Chur" },
{ 43236, "Pilz GmbH & Co. KG" },
{ 43237, "AOC Oost" },
@@ -49318,6 +49318,75 @@ const value_string sminmpec_values[] = {
{ 49295, "Direction du numerique UPPA" },
{ 49296, "Fraunhofer MEVIS" },
{ 49297, "Avicenna Health Group Inc" },
+ { 49298, "The Port Authority of NY & NJ" },
+ { 49299, "Truecom Telesoft Private Limited" },
+ { 49300, "The New Tricks" },
+ { 49301, "BCS Information Systems Pte Ltd" },
+ { 49302, "Dart Container" },
+ { 49303, "Flexmedia Ind. e Com. de Tecnologia Ltda." },
+ { 49304, "Tapoustry" },
+ { 49305, "Neural Technologies" },
+ { 49306, "AUM Cardiovascular Inc" },
+ { 49307, "Secturion Systems Inc." },
+ { 49308, "Airwave Brasil Tecnologia" },
+ { 49309, "VIDA AB" },
+ { 49310, "CELLULAR GmbH" },
+ { 49311, "Asteas Technologies GmbH & Co KG" },
+ { 49312, "MichaelSchneiderKoeln" },
+ { 49313, "Isaac Johnson Organization" },
+ { 49314, "ADFweb.com" },
+ { 49315, "Sealite PTY LTD" },
+ { 49316, "SixGor" },
+ { 49317, "ICT Star Group Myanmar Co., Ltd." },
+ { 49318, "Desert Water Agency" },
+ { 49319, "Credit Bank of Moscow PJSC" },
+ { 49320, "Walln\0303\0244s AB" },
+ { 49321, "Vevy Europe S.p.A." },
+ { 49322, "Haaglanden Medisch Centrum" },
+ { 49323, "Dynamic Consulting International Telecommunications Spain, S. L." },
+ { 49324, "mobex communication GmbH" },
+ { 49325, "EVER SMART TECHNOLOGIES SL" },
+ { 49326, "Clyde Bergemann Power Group International Ltd" },
+ { 49327, "Frivillighetshuset" },
+ { 49328, "Praim srl" },
+ { 49329, "SysEleven GmbH" },
+ { 49330, "A.B.G Systems Ltd Israel" },
+ { 49331, "Johannishus godsflrvaltning AB" },
+ { 49332, "AppWorks" },
+ { 49333, "Brighthouse Financial Inc." },
+ { 49334, "Axon-Ar" },
+ { 49335, "ROTOK" },
+ { 49336, "Schreiber Systems" },
+ { 49337, "KommunalBIT A\0303\0266R" },
+ { 49338, "ASTEN" },
+ { 49339, "GAYA" },
+ { 49340, "Beijing Fusion Co., Ltd" },
+ { 49341, "Ayuntamiento de Cartagena" },
+ { 49342, "Unser Heimatb\0303\0244cker GmbH" },
+ { 49343, "HaloDoc.com" },
+ { 49344, "IX Layers, Inc." },
+ { 49345, "KVaibhav Personal CA" },
+ { 49346, "Samvardhana Motherson Innovative Autosystems B.V. & Co. KG" },
+ { 49347, "Healthjump" },
+ { 49348, "Yapku Limited" },
+ { 49349, "BCDVideo" },
+ { 49350, "VGCIT, Inc." },
+ { 49351, "STIVCX" },
+ { 49352, "Hines Network" },
+ { 49353, "Certificate Authority for Presidential Office of Information and Communication Technologies of the Dominican Republic" },
+ { 49354, "ARGYROU MINAS" },
+ { 49355, "Fiskarhedens Tr\0303\0244varu AB" },
+ { 49356, "DQE Communications" },
+ { 49357, "Hoptroff London Limited " },
+ { 49358, "Tri-State Digital Services" },
+ { 49359, "Enterstrata" },
+ { 49360, "Cord3 Innovations" },
+ { 49361, "Pridok AS" },
+ { 49362, "tabaracci.org" },
+ { 49363, "Unior Hungary Ltd." },
+ { 49364, "ALFA SATCOM SYSTEMS LLC" },
+ { 49365, "Phoenix Online Studios" },
+ { 49366, "visol digitale Dienstleistungen GmbH" },
{ 0, NULL}
};
diff --git a/manuf b/manuf
index 6dbb3d1d64..4e15c54e86 100644
--- a/manuf
+++ b/manuf
@@ -6180,7 +6180,7 @@
00:18:07 Fanstel # Fanstel Corp.
00:18:08 Sightlog # SightLogix, Inc.
00:18:09 Cresyn
-00:18:0A Meraki # Meraki, Inc.
+00:18:0A CiscoMer # Cisco Meraki
00:18:0B Brillian # Brilliant Telecommunications
00:18:0C Optelian # Optelian Access Networks
00:18:0D Terabyte # Terabytes Server Storage Tech Corp
@@ -17966,6 +17966,7 @@
10:CC:1B Liverock # Liverock technologies,INC
10:CC:DB AximumPr # AXIMUM PRODUITS ELECTRONIQUES
10:CD:AE Avaya # Avaya Inc
+10:D0:7A AmpakTec # AMPAK Technology, Inc.
10:D0:AB Zte # zte corporation
10:D1:DC InstarDe # INSTAR Deutschland GmbH
10:D3:8A SamsungE # Samsung Electronics Co.,Ltd
@@ -18774,6 +18775,7 @@
20:F1:7C HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
20:F3:A3 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
20:F4:1B Shenzhen # Shenzhen Bilian electronic CO.,LTD
+20:F4:52 Shanghai # Shanghai IUV Software Development Co. Ltd
20:F5:10 CodexDig # Codex Digital Limited
20:F5:43 HuiZhouG # Hui Zhou Gaoshengda Technology Co.,LTD
20:F8:5E DeltaEle # Delta Electronics
@@ -19308,6 +19310,7 @@
2C:AE:2B SamsungE # Samsung Electronics Co.,Ltd
2C:B0:5D Netgear
2C:B0:DF SolitonT # Soliton Technologies Pvt Ltd
+2C:B1:15 Integrat # Integrated Device Technology (Malaysia) Sdn. Bhd.
2C:B4:3A Apple # Apple, Inc.
2C:B6:93 Radware
2C:B6:9D RedDigit # RED Digital Cinema
@@ -20131,6 +20134,7 @@
40:56:0C InHomeDi # In Home Displays Ltd
40:56:2D Smartron # Smartron India Pvt ltd
40:5A:9B Anovo
+40:5C:FD Dell # Dell Inc.
40:5D:82 Netgear
40:5E:E1 Shenzhen # Shenzhen H&T Intelligent Control Co.,Ltd.
40:5F:BE Rim
@@ -21369,6 +21373,7 @@
50:97:72 Westingh # Westinghouse Digital
50:98:71 Inventum # Inventum Technologies Private Limited
50:98:F3 RheemAus # Rheem Australia Pty Ltd
+50:9A:4C Dell # Dell Inc.
50:9E:A7 SamsungE # Samsung Electronics Co.,Ltd
50:9F:27 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
50:9F:3B OiElectr # OI ELECTRIC CO.,LTD
@@ -21446,6 +21451,7 @@
50:FC:30 Treehous # Treehouse Labs
50:FC:9F SamsungE # Samsung Electronics Co.,Ltd
50:FE:F2 SifyTech # Sify Technologies Ltd
+50:FF:20 Keenetic # Keenetic Limited
50:FF:99 IeeeRegi # IEEE Registration Authority
50:FF:99:00:00:00/28 Simicon
50:FF:99:10:00:00/28 CoyoteSy # Coyote Sytem
@@ -22116,9 +22122,18 @@
60:D2:B9 RealandB # REALAND BIO CO., LTD.
60:D3:0A Quatius # Quatius Limited
60:D7:E3 IeeeRegi # IEEE Registration Authority
+60:D7:E3:00:00:00/28 Avalun
+60:D7:E3:20:00:00/28 NovoInno # Novo innovations Ltd
+60:D7:E3:30:00:00/28 SksAutom # SKS Automaatio oy
60:D7:E3:40:00:00/28 Hemisphe # Hemisphere GNSS
+60:D7:E3:50:00:00/28 RevolTec # Revol Technologies inc
+60:D7:E3:60:00:00/28 AmeliSRL # Ameli s.r.l.
60:D7:E3:70:00:00/28 PhaseOne # Phase One A/S
+60:D7:E3:80:00:00/28 Hindlepo # HindlePower, Inc
60:D7:E3:90:00:00/28 Longsung # LongSung Technology (Shanghai) Co.,Ltd.
+60:D7:E3:A0:00:00/28 Wilderne # Wilderness Labs Inc.
+60:D7:E3:B0:00:00/28 Nextivit # Nextivity
+60:D7:E3:C0:00:00/28 Zhejiang # Zhejiang Send Intelligent Technology,Ltd
60:D7:E3:D0:00:00/28 Quantron # Quantronix, Inc.
60:D8:19 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
60:D9:A0 LenovoMo # Lenovo Mobile Communication Technology Ltd.
@@ -22448,7 +22463,7 @@
68:A1:B7 HonghaoM # Honghao Mingchuan Technology (Beijing) CO.,Ltd.
68:A3:78 FreeboxS # FREEBOX SAS
68:A3:C4 LiteonTe # Liteon Technology Corporation
-68:A4:0E BshBosch # BSH Bosch and Siemens Home Appliances GmbH
+68:A4:0E BshHausg # BSH Hausgeräte GmbH
68:A8:28 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
68:A8:6D Apple # Apple, Inc.
68:AA:D2 Datecs # DATECS LTD.,
@@ -22945,6 +22960,7 @@
70:B3:D5:14:70:00/36 RomoWind # ROMO Wind A/S
70:B3:D5:14:80:00/36 PowerEle # Power Electronics Espana, S.L.
70:B3:D5:14:90:00/36 Eleven-X
+70:B3:D5:14:C0:00/36 Crde
70:B3:D5:14:D0:00/36 2-Observ # 2-Observe
70:B3:D5:14:E0:00/36 Innosoni # Innosonix GmbH
70:B3:D5:14:F0:00/36 MobileDe # Mobile Devices Unlimited
@@ -23002,7 +23018,6 @@
70:B3:D5:1C:50:00/36 Elsag
70:B3:D5:1C:70:00/36 HoshinEl # Hoshin Electronics Co., Ltd.
70:B3:D5:1C:80:00/36 LdaAudio # LDA audio video profesional S.L.
-70:B3:D5:1D:30:00/36 NovoInno # Novo innovations Ltd
70:B3:D5:1D:40:00/36 Brinkman # Brinkmann Audio GmbH
70:B3:D5:1D:70:00/36 Private
70:B3:D5:1D:A0:00/36 Promess # Promess Inc.
@@ -23025,6 +23040,7 @@
70:B3:D5:20:40:00/36 Twc
70:B3:D5:20:50:00/36 EsourceS # Esource Srl
70:B3:D5:20:80:00/36 DspDesig # DSP DESIGN LTD
+70:B3:D5:20:90:00/36 Smartnod # SmartNodes
70:B3:D5:20:A0:00/36 GoldenGr # Golden Grid Systems
70:B3:D5:20:C0:00/36 SiemensH # Siemens Healthcare Diagnostics
70:B3:D5:20:D0:00/36 EngageTe # Engage Technologies
@@ -23072,6 +23088,7 @@
70:B3:D5:28:30:00/36 Textninj # TextNinja Co.
70:B3:D5:28:50:00/36 BentecDr # Bentec GmbH Drilling & Oilfield Systems
70:B3:D5:28:60:00/36 PedaxDan # Pedax Danmark
+70:B3:D5:28:80:00/36 Bressler # Bresslergroup
70:B3:D5:28:90:00/36 Shenzhen # Shenzhen Rongda Computer Co.,Ltd
70:B3:D5:28:A0:00/36 TransitS # Transit Solutions, LLC.
70:B3:D5:28:B0:00/36 ArnouseD # Arnouse Digital Devices, Corp.
@@ -23202,6 +23219,7 @@
70:B3:D5:3B:B0:00/36 A-M # A-M Systems
70:B3:D5:3B:C0:00/36 Scitroni # SciTronix
70:B3:D5:3B:E0:00/36 Mydefenc # MyDefence Communication ApS
+70:B3:D5:3B:F0:00/36 StarElec # Star Electronics GmbH & Co. KG
70:B3:D5:3C:00:00/36 Dk-Techn # DK-Technologies A/S
70:B3:D5:3C:20:00/36 Cellular # Cellular Specialties, Inc.
70:B3:D5:3C:30:00/36 Aimco
@@ -23310,6 +23328,7 @@
70:B3:D5:4B:A0:00/36 Sinftech # Sinftech LLC
70:B3:D5:4B:B0:00/36 Plazma-T
70:B3:D5:4B:D0:00/36 BoulderA # Boulder Amplifiers, Inc.
+70:B3:D5:4B:E0:00/36 Gy-FxSas # GY-FX SAS
70:B3:D5:4C:10:00/36 QuercusT # QUERCUS TECHNOLOGIES, S. L.
70:B3:D5:4C:20:00/36 HeraLabo # hera Laborsysteme GmbH
70:B3:D5:4C:40:00/36 OooResea # OOO Research and Production Center Computer Technologies
@@ -23560,6 +23579,7 @@
70:B3:D5:73:E0:00/36 TridentR # Trident RFID Pty Ltd
70:B3:D5:74:00:00/36 PrismaTe # Prisma Telecom Testing Srl
70:B3:D5:74:20:00/36 YuyamaMf # YUYAMA MFG Co.,Ltd
+70:B3:D5:74:50:00/36 TmsiLlc # TMSI LLC
70:B3:D5:74:70:00/36 EvaAutom # Eva Automation
70:B3:D5:74:A0:00/36 MettlerT # Mettler Toledo Hi-Speed
70:B3:D5:74:C0:00/36 KwantCon # Kwant Controls BV
@@ -23802,6 +23822,7 @@
70:B3:D5:99:40:00/36 KeffNetw # KeFF Networks
70:B3:D5:99:50:00/36 Laytec # LayTec AG
70:B3:D5:99:60:00/36 Xpertsea # XpertSea Solutions inc.
+70:B3:D5:99:70:00/36 ProtomIn # ProTom International
70:B3:D5:99:A0:00/36 Kevic # KEVIC. inc,
70:B3:D5:99:E0:00/36 TrinityC # Trinity College Dublin
70:B3:D5:99:F0:00/36 ConfedBV # Confed Holding B.V.
@@ -23814,6 +23835,7 @@
70:B3:D5:9B:A0:00/36 AtimRadi # ATIM Radiocommunication
70:B3:D5:9B:D0:00/36 SignalPr # Signal Processing Devices Sweden AB
70:B3:D5:9C:00:00/36 Schneide # Schneider Displaytechnik GmbH
+70:B3:D5:9C:60:00/36 Overspee # Overspeed SARL
70:B3:D5:9C:70:00/36 YuyamaMf # YUYAMA MFG Co.,Ltd
70:B3:D5:9C:80:00/36 AppliedE # Applied Systems Engineering, Inc.
70:B3:D5:9C:90:00/36 PkSound # PK Sound
@@ -23927,6 +23949,7 @@
70:B3:D5:AB:40:00/36 SysTecEl # SYS TEC electronic GmbH
70:B3:D5:AB:50:00/36 Broadsof # BroadSoft Inc
70:B3:D5:AB:70:00/36 Siglead # SIGLEAD INC
+70:B3:D5:AB:80:00/36 HoribaMe # HORIBA MEDICAL
70:B3:D5:AB:90:00/36 DynamicC # Dynamic Controls
70:B3:D5:AB:A0:00/36 ClIntern # CL International
70:B3:D5:AB:C0:00/36 Bkm-Micr # BKM-Micronic Richtfunkanlagen GmbH
@@ -23972,6 +23995,7 @@
70:B3:D5:B1:10:00/36 CabSRL # CAB S.R.L.
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:A0:00/36 Aaronia # Aaronia AG
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
@@ -23979,6 +24003,7 @@
70:B3:D5:B2:80:00/36 HustyMSt # HUSTY M.Styczen J.Hupert sp.j.
70:B3:D5:B2:90:00/36 Wivicom # WiViCom Co., Ltd.
70:B3:D5:B2:A0:00/36 MyroCont # Myro Control, LLC
+70:B3:D5:B3:00:00/36 SystoléH # Systolé Hardware B.V.
70:B3:D5:B3:10:00/36 Qwave # Qwave Inc
70:B3:D5:B3:30:00/36 AplexTec # Aplex Technology Inc.
70:B3:D5:B3:40:00/36 Medtroni # Medtronic
@@ -24039,6 +24064,7 @@
70:B3:D5:BC:60:00/36 Hattelan # Hatteland Display AS
70:B3:D5:BC:A0:00/36 DeymedDi # Deymed Diagnostic
70:B3:D5:BC:C0:00/36 MbConnec # MB connect line GmbH Fernwartungssysteme
+70:B3:D5:BD:10:00/36 Cablelab # CableLabs
70:B3:D5:BD:20:00/36 BurkTech # Burk Technology
70:B3:D5:BD:30:00/36 FotonaDD # FOTONA D.D.
70:B3:D5:BD:50:00/36 Synics # Synics AG
@@ -24171,6 +24197,7 @@
70:B3:D5:D1:10:00/36 EreeElec # EREE Electronique
70:B3:D5:D1:20:00/36 Fideltro # FIDELTRONIK POLAND SP. Z O.O.
70:B3:D5:D1:B0:00/36 GrupoEpe # Grupo Epelsa S.L.
+70:B3:D5:D1:C0:00/36 Speciali # Specialised Imaging Limited
70:B3:D5:D1:E0:00/36 HoustonR # Houston Radar LLC
70:B3:D5:D1:F0:00/36 Embsec # Embsec AB
70:B3:D5:D2:50:00/36 Engenesi # ENGenesis
@@ -24311,6 +24338,7 @@
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:E8:E0:00/36 MacnicaT # Macnica Technology
70:B3:D5:E8:F0:00/36 Dismunte # DISMUNTEL, S.A.
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.
@@ -24367,6 +24395,7 @@
70:B3:D5:F0:70:00/36 DuvalMes # DUVAL MESSIEN
70:B3:D5:F0:80:00/36 SzaboSof # Szabo Software & Engineering UK Ltd
70:B3:D5:F0:B0:00/36 RfIndust # RF Industries
+70:B3:D5:F0:D0:00/36 Meq # MeQ Inc.
70:B3:D5:F1:00:00/36 RieglLas # Riegl Laser Measurement Systems GmbH
70:B3:D5:F1:10:00/36 Broadsof # BroadSoft Inc
70:B3:D5:F1:20:00/36 IncoilIn # Incoil Induktion AB
@@ -24426,6 +24455,7 @@
70:B3:D5:F9:60:00/36 Ecologic # Ecologicsense
70:B3:D5:F9:90:00/36 TexCompu # TEX COMPUTER SRL
70:B3:D5:F9:A0:00/36 Krabbenh # Krabbenhøft og Ingolfsson
+70:B3:D5:F9:E0:00/36 Internat # International Center for Elementary Particle Physics, The University of Tokyo
70:B3:D5:FA:10:00/36 BbiEngin # BBI Engineering, Inc.
70:B3:D5:FA:20:00/36 SarokalT # Sarokal Test Systems Oy
70:B3:D5:FA:40:00/36 Energybo # Energybox Limited
@@ -24469,7 +24499,7 @@
70:B3:D5:FF:40:00/36 Serveron # Serveron Corporation
70:B3:D5:FF:50:00/36 ProlanPr # Prolan Process Control Co.
70:B3:D5:FF:70:00/36 Cybercom # Cybercom AB
-70:B3:D5:FF:C0:00/36 ExtantAe # Extant Aerospace
+70:B3:D5:FF:C0:00/36 Symetric # Symetrics Industries d.b.a. Extant Aerospace
70:B3:D5:FF:E0:00/36 Private
70:B3:D5:FF:F0:00/36 Private
70:B5:99 Embedded # Embedded Technologies s.r.o.
@@ -25459,6 +25489,7 @@
84:77:78 Cochlear # Cochlear Limited
84:78:8B Apple # Apple, Inc.
84:78:AC Cisco # Cisco Systems, Inc
+84:79:33 Profichi # profichip GmbH
84:79:73 Shanghai # Shanghai Baud Data Communication Co.,Ltd.
84:7A:88 Htc # HTC Corporation
84:7B:EB Dell # Dell Inc.
@@ -25580,7 +25611,7 @@
88:10:36 PanodicS # Panodic(ShenZhen) Electronics Limted
88:12:4E Qualcomm # Qualcomm Inc.
88:14:2B Protonic # Protonic Holland
-88:15:44 Meraki # Meraki, Inc.
+88:15:44 CiscoMer # Cisco Meraki
88:18:AE Tamron # Tamron Co., Ltd
88:1B:99 Shenzhen # SHENZHEN XIN FEI JIA ELECTRONIC CO. LTD.
88:1D:FC Cisco # Cisco Systems, Inc
@@ -25717,7 +25748,9 @@
88:CC:45 Skyworth # Skyworth Digital Technology(Shenzhen) Co.,Ltd
88:CE:FA HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
88:CF:98 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
+88:D2:74 Zte # zte corporation
88:D3:7B FirmtekL # FirmTek, LLC
+88:D5:0C Guangdon # GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
88:D7:BC Dep # DEP Company
88:D9:62 CanopusU # Canopus Systems US LLC
88:DC:96 SenaoNet # SENAO Networks, Inc.
@@ -26304,6 +26337,7 @@
98:29:3F FujianSt # Fujian Start Computer Equipment Co.,Ltd
98:2C:BE 2wire # 2Wire Inc
98:2D:56 Resoluti # Resolution Audio
+98:2D:BA Fibergat # Fibergate Inc.
98:2F:3C SichuanC # Sichuan Changhong Electric Ltd.
98:30:00 BeijingK # Beijing KEMACOM Technologies Co., Ltd.
98:30:71 Daikyung # DAIKYUNG VASCOM
@@ -26685,6 +26719,7 @@ A0:3E:6B:E0:00:00/28 NanjingZ # Nanjing zhanyi software technology
A0:3E:6B:F0:00:00/28 Private
A0:40:25 Actionca # Actioncable, Inc.
A0:40:41 Samwonfa # SAMWONFA Co.,Ltd.
+A0:40:A0 Netgear
A0:41:5E OpsensSo # Opsens Solution Inc.
A0:41:A7 NlMinist # NL Ministry of Defense
A0:42:3F TyanComp # Tyan Computer Corp
@@ -29033,6 +29068,7 @@ D0:EB:9E Seowoo # Seowoo Inc.
D0:F0:DB Ericsson
D0:F2:7F Steadyse # SteadyServ Technoligies, LLC
D0:F7:3B HelmutMa # Helmut Mauell GmbH Werk Weida
+D0:F8:8C Motorola # Motorola (Wuhan) Mobility Technologies Communication Co., Ltd.
D0:FA:1D Qihoo360 # Qihoo 360 Technology Co.,Ltd
D0:FC:CC SamsungE # Samsung Electronics Co.,Ltd
D0:FF:50 TexasIns # Texas Instruments
@@ -29065,6 +29101,7 @@ D4:22:3F LenovoMo # Lenovo Mobile Communication Technology Ltd.
D4:22:4E AlcatelL # Alcatel Lucent
D4:27:51 Infopia # Infopia Co., Ltd
D4:28:B2 Iobridge # ioBridge, Inc.
+D4:28:D5 TctMobil # TCT mobile ltd
D4:29:EA Zimory # Zimory GmbH
D4:2C:0F ArrisGro # ARRIS Group, Inc.
D4:2C:3D SkyLight # Sky Light Digital Limited
@@ -29174,6 +29211,7 @@ D4:B8:FF HomeCont # Home Control Singapore Pte Ltd
D4:BE:D9 Dell # Dell Inc.
D4:BF:2D SeContro # SE Controls Asia Pacific Ltd
D4:BF:7F Upvel
+D4:C1:C8 Zte # zte corporation
D4:C1:FC Nokia # Nokia Corporation
D4:C7:66 Acentic # Acentic GmbH
D4:C8:B0 PrimeEle # Prime Electronics & Satellitics Inc.
@@ -29707,6 +29745,7 @@ E0:D1:0A Katouden # Katoudenkikougyousyo co ltd
E0:D1:73 Cisco # Cisco Systems, Inc
E0:D1:E6 AliphDba # Aliph dba Jawbone
E0:D3:1A EquesTec # EQUES Technology Co., Limited
+E0:D5:5E Giga-Byt # GIGA-BYTE TECHNOLOGY CO.,LTD.
E0:D7:BA TexasIns # Texas Instruments
E0:D9:A2 HippihAp # Hippih aps
E0:D9:E3 EltexEnt # Eltex Enterprise Ltd.
@@ -30092,6 +30131,7 @@ EC:22:57 JiangsuN # JiangSu NanJing University Electronic Informat
EC:22:80 D-LinkIn # D-Link International
EC:23:3D HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
EC:23:68 Intelliv # IntelliVoice Co.,Ltd.
+EC:23:7B Zte # zte corporation
EC:24:B8 TexasIns # Texas Instruments
EC:26:CA Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD.
EC:26:FB Tecc # TECC CO.,LTD.
@@ -30200,6 +30240,7 @@ EC:EA:03 DarfonLi # DARFON LIGHTING CORP
EC:EE:D8 ZtlxNetw # ZTLX Network Technology Co.,Ltd
EC:F0:0E Abocom
EC:F2:36 Neomonta # NEOMONTANA ELECTRONICS
+EC:F3:42 Guangdon # GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
EC:F3:5B Nokia # Nokia Corporation
EC:F4:BB Dell # Dell Inc.
EC:F7:2B HdDigita # HD DIGITAL TECH CO., LTD.
diff --git a/services b/services
index 76a3581d56..c209d3fe14 100644
--- a/services
+++ b/services
@@ -1368,8 +1368,8 @@ dhcp-failover2 847/tcp # dhcp-failover 2 [Bernard_Volz] [Bernard_Volz]
dhcp-failover2 847/udp # dhcp-failover 2 [Bernard_Volz] [Bernard_Volz]
gdoi 848/tcp # GDOI [RFC3547]
gdoi 848/udp # GDOI [RFC3547]
-domain-s 853/tcp # DNS query-response protocol run over TLS/DTLS [IESG] [IETF_Chair] 2015-10-08 2016-05-18 [RFC7858]
-domain-s 853/udp # DNS query-response protocol run over TLS/DTLS [IESG] [IETF_Chair] 2015-10-08 2016-05-18 [RFC7858]
+domain-s 853/tcp # DNS query-response protocol run over TLS/DTLS [IESG] [IETF_Chair] 2015-10-08 2017-01-23 [RFC7858][RFC-ietf-dprive-dnsodtls-15]
+domain-s 853/udp # DNS query-response protocol run over TLS/DTLS [IESG] [IETF_Chair] 2015-10-08 2017-01-23 [RFC7858][RFC-ietf-dprive-dnsodtls-15]
iscsi 860/tcp # iSCSI [IESG] [IETF_Chair] 2013-08-27 [RFC7143]
iscsi 860/udp # iSCSI [IESG] [IETF_Chair] 2013-08-27 [RFC7143]
owamp-control 861/tcp # OWAMP-Control [RFC4656]
@@ -7233,8 +7233,8 @@ aftmux 3917/tcp # AFT multiplex port [Alfred_Schmidt] [Alfred_Schmidt]
aftmux 3917/udp # AFT multiples port [Alfred_Schmidt] [Alfred_Schmidt] 2003-11
pktcablemmcops 3918/tcp # PacketCableMultimediaCOPS [Eric_Rosenfeld] [Eric_Rosenfeld] 2003-11
pktcablemmcops 3918/udp # PacketCableMultimediaCOPS [Eric_Rosenfeld] [Eric_Rosenfeld] 2003-11
-hyperip 3919/tcp # HyperIP [Dave_Reiland] [Dave_Reiland] 2003-11
-hyperip 3919/udp # HyperIP [Dave_Reiland] [Dave_Reiland] 2003-11
+hyperip 3919/tcp # HyperIP [Network_Executive_Software_Inc] [Nancy_Golio] 2003-11 2017-01-25
+hyperip 3919/udp # HyperIP [Network_Executive_Software_Inc] [Nancy_Golio] 2003-11 2017-01-25
exasoftport1 3920/tcp # Exasoft IP Port [Alan_Malik] [Alan_Malik] 2003-11
exasoftport1 3920/udp # Exasoft IP Port [Alan_Malik] [Alan_Malik] 2003-11
herodotus-net 3921/tcp # Herodotus Net [Adam_Gawne_Cain] [Adam_Gawne_Cain] 2003-11
@@ -9794,6 +9794,7 @@ collaber 7689/udp # Collaber Network Service [Rajesh_Akkineni] [Rajesh_A
klio 7697/tcp # KLIO communications [Helmut_Giritzer_2] [Helmut_Giritzer_2] 2005-08
klio 7697/udp # KLIO communications [Helmut_Giritzer_2] [Helmut_Giritzer_2] 2005-08
em7-secom 7700/tcp # EM7 Secure Communications [Christopher_Cordray] [Christopher_Cordray] 2008-06-05
+nfapi 7701/sctp # SCF nFAPI defining MAC/PHY split [Small_Cell_Forum] [Richard_Kennedy] 2017-01-24
sync-em7 7707/tcp # EM7 Dynamic Updates [Christopher_Cordray] [Christopher_Cordray] 2004-11
sync-em7 7707/udp # EM7 Dynamic Updates [Christopher_Cordray] [Christopher_Cordray] 2004-11
scinet 7708/tcp # scientia.net [Christoph_Anton_Mitt] [Christoph_Anton_Mitt] 2006-01
@@ -10044,6 +10045,7 @@ hncp-udp-port 8231/udp # HNCP [IESG] [IETF_Chair] 2016-01-13 [RFC7788]
hncp-dtls-port 8232/udp # HNCP over DTLS [IESG] [IETF_Chair] 2016-01-13 [RFC7788]
synapse-nhttps 8243/tcp # Synapse Non Blocking HTTPS [Ruwan_Linton] [Ruwan_Linton] 2008-07-10
synapse-nhttps 8243/udp # Synapse Non Blocking HTTPS [Ruwan_Linton] [Ruwan_Linton] 2008-07-10
+robot-remote 8270/tcp # Robot Framework Remote Library Interface [Robot_Framework_Foundation] [Chris_Newman] 2017-01-26
pando-sec 8276/tcp # Pando Media Controlled Distribution [Laird_Popkin] [Laird_Popkin] 2008-02-27
pando-sec 8276/udp # Pando Media Controlled Distribution [Laird_Popkin] [Laird_Popkin] 2008-02-27
synapse-nhttp 8280/tcp # Synapse Non Blocking HTTP [Ruwan_Linton] [Ruwan_Linton] 2008-06-05
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 3689814e6b..6fca61bcd1 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -2225,7 +2225,6 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<translation>Suchen:</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="72"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Relations can be used to restrict fields to specific values. Each relation does the following:&lt;/p&gt;
&lt;table&gt;&lt;tbody&gt;
&lt;tr&gt;&lt;th&gt;is present&lt;/th&gt;&lt;td&gt;Match any packet that contains this field&lt;/td&gt;&lt;/tr&gt;
@@ -2233,7 +2232,7 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
&lt;tr&gt;&lt;th&gt;contains, matches&lt;/th&gt;&lt;td&gt;Check the field against a string (contains) or a regular expression (matches)&lt;/td&gt;&lt;/tr&gt;
&lt;/tbody&gt;&lt;/table&gt;
&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Relations können genutzt werden um Felder auf bestimmte Werte einzugrenzen. Folgende Relationen können verwendet werden:&lt;/p&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Relations können genutzt werden um Felder auf bestimmte Werte einzugrenzen. Folgende Relationen können verwendet werden:&lt;/p&gt;
&lt;table&gt;&lt;tbody&gt;
&lt;tr&gt;&lt;th&gt;is present&lt;/th&gt;&lt;td&gt;Jedes Paket das dieses Feld enthält &lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;th&gt;==, !=, etc.&lt;/th&gt;&lt;td&gt;Vergleicht das Feld auf einen bestimmten Wert&lt;/td&gt;&lt;/tr&gt;
@@ -2242,62 +2241,69 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="81"/>
+ <location filename="display_filter_expression_dialog.ui" line="72"/>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Relations can be used to restrict fields to specific values. Each relation does the following:&lt;/p&gt;&lt;table border=&quot;0&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;&quot; cellspacing=&quot;2&quot; cellpadding=&quot;0&quot;&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;is present&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Match any packet that contains this field&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;==, !=, etc.&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Compare the field to a specific value.&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;contains, matches&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Check the field against a string (contains) or a regular expression (matches)&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;in&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Compare the field to a specific set of values&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;
+
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="display_filter_expression_dialog.ui" line="77"/>
<source>Relation</source>
<translation>Relation</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="108"/>
+ <location filename="display_filter_expression_dialog.ui" line="104"/>
<source>Match against this value.</source>
<translation>Überprüft diesen Wert.</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="111"/>
+ <location filename="display_filter_expression_dialog.ui" line="107"/>
<source>Value</source>
<translation>Wert</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="125"/>
+ <location filename="display_filter_expression_dialog.ui" line="121"/>
<source>If the field you have selected has a known set of valid values they will be listed here.</source>
<translation>Wenn das ausgewählte Feld bekannte mögliche Werte hat, so werden sie hier aufgelistet.</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="128"/>
+ <location filename="display_filter_expression_dialog.ui" line="124"/>
<source>Predefined Values</source>
<translation>Vordefinierte Werte</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="155"/>
+ <location filename="display_filter_expression_dialog.ui" line="151"/>
<source>If the field you have selected covers a range of bytes (e.g. you have selected a protocol) you can restrict the match to a range of bytes here.</source>
<translation>Wenn das ausgewählte Feld einen Bereich von Bytes abdeckt (z.B. bei der Auswahl eines Protokolls) kann der Treffer auf einen Bereich von Bytes eingeschränkt werden.</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="158"/>
+ <location filename="display_filter_expression_dialog.ui" line="154"/>
<source>Range (offset:length)</source>
<translation>Bereich (Versatz:Länge)</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="177"/>
+ <location filename="display_filter_expression_dialog.ui" line="173"/>
<source>No display filter</source>
<translation>Kein Anzeigefilter vorhanden</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="184"/>
+ <location filename="display_filter_expression_dialog.ui" line="180"/>
<source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
<translation>&lt;small&gt;&lt;i&gt;Hinweis&lt;/i&gt;&lt;/small&gt;</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="74"/>
+ <location filename="display_filter_expression_dialog.cpp" line="75"/>
<source>Display Filter Expression</source>
<translation>Anzeigefilterausdruck</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="213"/>
+ <location filename="display_filter_expression_dialog.cpp" line="223"/>
<source>Select a field name to get started</source>
<translation>Einen Feldnamen auswählen um zu starten</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="217"/>
+ <location filename="display_filter_expression_dialog.cpp" line="227"/>
<source>Click OK to insert this filter</source>
<translation>Zum Einfügen dieses Filter OK klicken</translation>
</message>
@@ -9444,22 +9450,22 @@ text-decoration: underline;
<translation> vor dem Schließen</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1066"/>
+ <location filename="main_window.cpp" line="1079"/>
<source>Save packets before merging?</source>
<translation>Pakete vor dem Zusammenführen speichern?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1067"/>
+ <location filename="main_window.cpp" line="1080"/>
<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="1073"/>
+ <location filename="main_window.cpp" line="1086"/>
<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="1075"/>
+ <location filename="main_window.cpp" line="1088"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>Änderungen müssen vor dem Zusammenführen gespeichert werden.</translation>
</message>
@@ -9469,117 +9475,122 @@ text-decoration: underline;
<translation>Ungültiger Anzeigefilter</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1112"/>
+ <location filename="main_window.cpp" line="1125"/>
<source>Invalid Read Filter</source>
<translation>Ungültiger Lesefilter</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1113"/>
+ <location filename="main_window.cpp" line="1126"/>
<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="1202"/>
+ <location filename="main_window.cpp" line="1215"/>
<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="1478"/>
+ <location filename="main_window.cpp" line="1491"/>
<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="1479"/>
+ <location filename="main_window.cpp" line="1492"/>
<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="1565"/>
- <location filename="main_window.cpp" line="1590"/>
+ <location filename="main_window.cpp" line="1580"/>
+ <location filename="main_window.cpp" line="1605"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1637"/>
+ <location filename="main_window.cpp" line="1652"/>
<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="1633"/>
- <location filename="main_window.cpp" line="1641"/>
+ <location filename="main_window.cpp" line="1648"/>
+ <location filename="main_window.cpp" line="1656"/>
<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="1646"/>
+ <location filename="main_window.cpp" line="1661"/>
<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="1638"/>
- <location filename="main_window.cpp" line="1647"/>
+ <location filename="main_window.cpp" line="1653"/>
+ <location filename="main_window.cpp" line="1662"/>
<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="1632"/>
+ <location filename="main_window.cpp" line="880"/>
+ <source>Unable to drop files during capture.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="main_window.cpp" line="1647"/>
<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="1640"/>
+ <location filename="main_window.cpp" line="1655"/>
<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="1664"/>
+ <location filename="main_window.cpp" line="1679"/>
<source>Save before Continue</source>
<translation>Vor dem Fortsetzen speichern</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1666"/>
+ <location filename="main_window.cpp" line="1681"/>
<source>Stop and Save</source>
<translation>Stoppen und speichern</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1678"/>
+ <location filename="main_window.cpp" line="1693"/>
<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="1690"/>
+ <location filename="main_window.cpp" line="1705"/>
<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="1681"/>
- <location filename="main_window.cpp" line="1694"/>
+ <location filename="main_window.cpp" line="1696"/>
+ <location filename="main_window.cpp" line="1709"/>
<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="1684"/>
+ <location filename="main_window.cpp" line="1699"/>
<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="2033"/>
+ <location filename="main_window.cpp" line="2048"/>
<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="2054"/>
+ <location filename="main_window.cpp" line="2069"/>
<source>The Wireshark Network Analyzer</source>
<translation>Die Wireshark Netzwerk Analysesoftware</translation>
</message>
<message>
- <location filename="main_window.cpp" line="2079"/>
+ <location filename="main_window.cpp" line="2094"/>
<source>Capturing from %1</source>
<translation>Aufzeichnen von %1</translation>
</message>
@@ -9594,52 +9605,52 @@ text-decoration: underline;
<translation>%1: %2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="816"/>
+ <location filename="main_window_slots.cpp" line="817"/>
<source>Saving %1</source>
<translation>Speichere %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="856"/>
+ <location filename="main_window_slots.cpp" line="857"/>
<source>No interface selected</source>
<translation>Keine Schnittstelle ausgewählt</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="866"/>
+ <location filename="main_window_slots.cpp" line="867"/>
<source>Invalid capture filter</source>
<translation>Ungültiger Mitschnittfilter</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1114"/>
+ <location filename="main_window_slots.cpp" line="1115"/>
<source>Clear Menu</source>
<translation>Menüeinträge löschen</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1597"/>
+ <location filename="main_window_slots.cpp" line="1598"/>
<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="1698"/>
+ <location filename="main_window_slots.cpp" line="1699"/>
<source> before closing the file</source>
<translation> vor dem Schließen der Datei</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1780"/>
+ <location filename="main_window_slots.cpp" line="1781"/>
<source>Export Selected Packet Bytes</source>
<translation>Ausgewählte Paketbytes exportieren</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1846"/>
+ <location filename="main_window_slots.cpp" line="1847"/>
<source>No Keys</source>
<translation>Keine Schlüssel</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1847"/>
+ <location filename="main_window_slots.cpp" line="1848"/>
<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="1853"/>
+ <location filename="main_window_slots.cpp" line="1854"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation>
@@ -9648,7 +9659,7 @@ text-decoration: underline;
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1782"/>
+ <location filename="main_window_slots.cpp" line="1783"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation>Rohdaten (*.bin *.dat *.raw);; Alle Dateien (</translation>
</message>
@@ -9658,64 +9669,64 @@ text-decoration: underline;
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1857"/>
+ <location filename="main_window_slots.cpp" line="1858"/>
<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="1975"/>
+ <location filename="main_window_slots.cpp" line="1976"/>
<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="2381"/>
- <location filename="main_window_slots.cpp" line="3492"/>
+ <location filename="main_window_slots.cpp" line="2382"/>
+ <location filename="main_window_slots.cpp" line="3493"/>
<source>Unable to build conversation filter.</source>
<translation>Verbindungsfilter kann nicht erstellt werden.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2531"/>
- <location filename="main_window_slots.cpp" line="2544"/>
+ <location filename="main_window_slots.cpp" line="2532"/>
+ <location filename="main_window_slots.cpp" line="2545"/>
<source> before reloading the file</source>
<translation> vor dem Neuladen der Datei</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2578"/>
+ <location filename="main_window_slots.cpp" line="2579"/>
<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="3499"/>
+ <location filename="main_window_slots.cpp" line="3500"/>
<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="3508"/>
+ <location filename="main_window_slots.cpp" line="3509"/>
<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="3585"/>
+ <location filename="main_window_slots.cpp" line="3586"/>
<source>No Interface Selected</source>
<translation>Keine Schnittstelle ausgewählt</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3592"/>
+ <location filename="main_window_slots.cpp" line="3593"/>
<source> before starting a new capture</source>
<translation> vor dem Starten einer neuen Aufzeichnung</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3610"/>
+ <location filename="main_window_slots.cpp" line="3611"/>
<source> before restarting the capture</source>
<translation> vor dem Neustart der Aufzeichnung</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3818"/>
+ <location filename="main_window_slots.cpp" line="3819"/>
<source>Wiki Page for %1</source>
<translation>Wikiseite für &amp;1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3819"/>
+ <location filename="main_window_slots.cpp" line="3820"/>
<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>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index 759a472681..980e7647e6 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -2160,72 +2160,68 @@ PLEASE NOTE: One option MUST be selected.</source>
</message>
<message>
<location filename="display_filter_expression_dialog.ui" line="72"/>
- <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Relations can be used to restrict fields to specific values. Each relation does the following:&lt;/p&gt;
-&lt;table&gt;&lt;tbody&gt;
-&lt;tr&gt;&lt;th&gt;is present&lt;/th&gt;&lt;td&gt;Match any packet that contains this field&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;th&gt;==, !=, etc.&lt;/th&gt;&lt;td&gt;Compare the field to a specific value.&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;th&gt;contains, matches&lt;/th&gt;&lt;td&gt;Check the field against a string (contains) or a regular expression (matches)&lt;/td&gt;&lt;/tr&gt;
-&lt;/tbody&gt;&lt;/table&gt;
-&lt;/body&gt;&lt;/html&gt;</source>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Relations can be used to restrict fields to specific values. Each relation does the following:&lt;/p&gt;&lt;table border=&quot;0&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;&quot; cellspacing=&quot;2&quot; cellpadding=&quot;0&quot;&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;is present&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Match any packet that contains this field&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;==, !=, etc.&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Compare the field to a specific value.&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;contains, matches&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Check the field against a string (contains) or a regular expression (matches)&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;in&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Compare the field to a specific set of values&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;
+
+</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="81"/>
+ <location filename="display_filter_expression_dialog.ui" line="77"/>
<source>Relation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="108"/>
+ <location filename="display_filter_expression_dialog.ui" line="104"/>
<source>Match against this value.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="111"/>
+ <location filename="display_filter_expression_dialog.ui" line="107"/>
<source>Value</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="125"/>
+ <location filename="display_filter_expression_dialog.ui" line="121"/>
<source>If the field you have selected has a known set of valid values they will be listed here.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="128"/>
+ <location filename="display_filter_expression_dialog.ui" line="124"/>
<source>Predefined Values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="155"/>
+ <location filename="display_filter_expression_dialog.ui" line="151"/>
<source>If the field you have selected covers a range of bytes (e.g. you have selected a protocol) you can restrict the match to a range of bytes here.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="158"/>
+ <location filename="display_filter_expression_dialog.ui" line="154"/>
<source>Range (offset:length)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="177"/>
+ <location filename="display_filter_expression_dialog.ui" line="173"/>
<source>No display filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="184"/>
+ <location filename="display_filter_expression_dialog.ui" line="180"/>
<source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="74"/>
+ <location filename="display_filter_expression_dialog.cpp" line="75"/>
<source>Display Filter Expression</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="213"/>
+ <location filename="display_filter_expression_dialog.cpp" line="223"/>
<source>Select a field name to get started</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="217"/>
+ <location filename="display_filter_expression_dialog.cpp" line="227"/>
<source>Click OK to insert this filter</source>
<translation type="unfinished"></translation>
</message>
@@ -9200,22 +9196,22 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1066"/>
+ <location filename="main_window.cpp" line="1079"/>
<source>Save packets before merging?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1067"/>
+ <location filename="main_window.cpp" line="1080"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1073"/>
+ <location filename="main_window.cpp" line="1086"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1075"/>
+ <location filename="main_window.cpp" line="1088"/>
<source>Changes must be saved before the files can be merged.</source>
<translation type="unfinished"></translation>
</message>
@@ -9225,117 +9221,122 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1112"/>
+ <location filename="main_window.cpp" line="1125"/>
<source>Invalid Read Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1113"/>
+ <location filename="main_window.cpp" line="1126"/>
<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="1202"/>
+ <location filename="main_window.cpp" line="1215"/>
<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="1478"/>
+ <location filename="main_window.cpp" line="1491"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1479"/>
+ <location filename="main_window.cpp" line="1492"/>
<source>You cannot export packets to the current capture file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1565"/>
- <location filename="main_window.cpp" line="1590"/>
+ <location filename="main_window.cpp" line="1580"/>
+ <location filename="main_window.cpp" line="1605"/>
<source>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1637"/>
+ <location filename="main_window.cpp" line="1652"/>
<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="1633"/>
- <location filename="main_window.cpp" line="1641"/>
+ <location filename="main_window.cpp" line="1648"/>
+ <location filename="main_window.cpp" line="1656"/>
<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="1646"/>
+ <location filename="main_window.cpp" line="1661"/>
<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="1638"/>
- <location filename="main_window.cpp" line="1647"/>
+ <location filename="main_window.cpp" line="1653"/>
+ <location filename="main_window.cpp" line="1662"/>
<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="1632"/>
+ <location filename="main_window.cpp" line="880"/>
+ <source>Unable to drop files during capture.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="main_window.cpp" line="1647"/>
<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="1640"/>
+ <location filename="main_window.cpp" line="1655"/>
<source>Do you want to save the captured packets%1?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1664"/>
+ <location filename="main_window.cpp" line="1679"/>
<source>Save before Continue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1666"/>
+ <location filename="main_window.cpp" line="1681"/>
<source>Stop and Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1678"/>
+ <location filename="main_window.cpp" line="1693"/>
<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="1690"/>
+ <location filename="main_window.cpp" line="1705"/>
<source>Quit &amp;without Saving</source>
<oldsource>Quit without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1681"/>
- <location filename="main_window.cpp" line="1694"/>
+ <location filename="main_window.cpp" line="1696"/>
+ <location filename="main_window.cpp" line="1709"/>
<source>Continue &amp;without Saving</source>
<oldsource>Continue without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1684"/>
+ <location filename="main_window.cpp" line="1699"/>
<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="2033"/>
+ <location filename="main_window.cpp" line="2048"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="2054"/>
+ <location filename="main_window.cpp" line="2069"/>
<source>The Wireshark Network Analyzer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="2079"/>
+ <location filename="main_window.cpp" line="2094"/>
<source>Capturing from %1</source>
<translation type="unfinished"></translation>
</message>
@@ -9350,52 +9351,52 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="816"/>
+ <location filename="main_window_slots.cpp" line="817"/>
<source>Saving %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="856"/>
+ <location filename="main_window_slots.cpp" line="857"/>
<source>No interface selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="866"/>
+ <location filename="main_window_slots.cpp" line="867"/>
<source>Invalid capture filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1114"/>
+ <location filename="main_window_slots.cpp" line="1115"/>
<source>Clear Menu</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1597"/>
+ <location filename="main_window_slots.cpp" line="1598"/>
<source>Please wait while Wireshark is initializing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1698"/>
+ <location filename="main_window_slots.cpp" line="1699"/>
<source> before closing the file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1780"/>
+ <location filename="main_window_slots.cpp" line="1781"/>
<source>Export Selected Packet Bytes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1846"/>
+ <location filename="main_window_slots.cpp" line="1847"/>
<source>No Keys</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1847"/>
+ <location filename="main_window_slots.cpp" line="1848"/>
<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="1853"/>
+ <location filename="main_window_slots.cpp" line="1854"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation>
@@ -9404,7 +9405,7 @@ a:hover {
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1782"/>
+ <location filename="main_window_slots.cpp" line="1783"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation type="unfinished"></translation>
</message>
@@ -9414,64 +9415,64 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1857"/>
+ <location filename="main_window_slots.cpp" line="1858"/>
<source>SSL Session Keys (*.keys *.txt);;All Files (</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1975"/>
+ <location filename="main_window_slots.cpp" line="1976"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2381"/>
- <location filename="main_window_slots.cpp" line="3492"/>
+ <location filename="main_window_slots.cpp" line="2382"/>
+ <location filename="main_window_slots.cpp" line="3493"/>
<source>Unable to build conversation filter.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2531"/>
- <location filename="main_window_slots.cpp" line="2544"/>
+ <location filename="main_window_slots.cpp" line="2532"/>
+ <location filename="main_window_slots.cpp" line="2545"/>
<source> before reloading the file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2578"/>
+ <location filename="main_window_slots.cpp" line="2579"/>
<source>No filter available. Try another </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3499"/>
+ <location filename="main_window_slots.cpp" line="3500"/>
<source>Error compiling filter for this conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3508"/>
+ <location filename="main_window_slots.cpp" line="3509"/>
<source>No previous/next packet in conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3585"/>
+ <location filename="main_window_slots.cpp" line="3586"/>
<source>No Interface Selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3592"/>
+ <location filename="main_window_slots.cpp" line="3593"/>
<source> before starting a new capture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3610"/>
+ <location filename="main_window_slots.cpp" line="3611"/>
<source> before restarting the capture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3818"/>
+ <location filename="main_window_slots.cpp" line="3819"/>
<source>Wiki Page for %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3819"/>
+ <location filename="main_window_slots.cpp" line="3820"/>
<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>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index da01b86e19..1b15e2ede2 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -2226,7 +2226,6 @@ si vous voulez utiliser des fichiers multiples.</translation>
<translation>Recherche:</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="72"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Relations can be used to restrict fields to specific values. Each relation does the following:&lt;/p&gt;
&lt;table&gt;&lt;tbody&gt;
&lt;tr&gt;&lt;th&gt;is present&lt;/th&gt;&lt;td&gt;Match any packet that contains this field&lt;/td&gt;&lt;/tr&gt;
@@ -2234,7 +2233,7 @@ si vous voulez utiliser des fichiers multiples.</translation>
&lt;tr&gt;&lt;th&gt;contains, matches&lt;/th&gt;&lt;td&gt;Check the field against a string (contains) or a regular expression (matches)&lt;/td&gt;&lt;/tr&gt;
&lt;/tbody&gt;&lt;/table&gt;
&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Des relations peuvent être utilisées pour limiter des champs à des valeurs spécifiques. Chaque relation fait ce qui suit:&lt;/p&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Des relations peuvent être utilisées pour limiter des champs à des valeurs spécifiques. Chaque relation fait ce qui suit:&lt;/p&gt;
&lt;table&gt;&lt;tbody&gt;
&lt;tr&gt;&lt;th&gt;is present&lt;/th&gt;&lt;td&gt;Accepte tout paquet qui contient ce champ&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;th&gt;==, !=, etc.&lt;/th&gt;&lt;td&gt;Compare le champ à une valeur spécifique.&lt;/td&gt;&lt;/tr&gt;
@@ -2243,62 +2242,69 @@ si vous voulez utiliser des fichiers multiples.</translation>
&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="81"/>
+ <location filename="display_filter_expression_dialog.ui" line="72"/>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Relations can be used to restrict fields to specific values. Each relation does the following:&lt;/p&gt;&lt;table border=&quot;0&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;&quot; cellspacing=&quot;2&quot; cellpadding=&quot;0&quot;&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;is present&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Match any packet that contains this field&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;==, !=, etc.&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Compare the field to a specific value.&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;contains, matches&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Check the field against a string (contains) or a regular expression (matches)&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;in&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Compare the field to a specific set of values&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;
+
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="display_filter_expression_dialog.ui" line="77"/>
<source>Relation</source>
<translation>Relation</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="108"/>
+ <location filename="display_filter_expression_dialog.ui" line="104"/>
<source>Match against this value.</source>
<translation>Correspond à cette valeur</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="111"/>
+ <location filename="display_filter_expression_dialog.ui" line="107"/>
<source>Value</source>
<translation>Valeur</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="125"/>
+ <location filename="display_filter_expression_dialog.ui" line="121"/>
<source>If the field you have selected has a known set of valid values they will be listed here.</source>
<translation>Si le champ que vous avez sélectionné a un ensemble connu de valeurs valides elles seront listées ici</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="128"/>
+ <location filename="display_filter_expression_dialog.ui" line="124"/>
<source>Predefined Values</source>
<translation>Valeurs prédéfinies</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="155"/>
+ <location filename="display_filter_expression_dialog.ui" line="151"/>
<source>If the field you have selected covers a range of bytes (e.g. you have selected a protocol) you can restrict the match to a range of bytes here.</source>
<translation>Si le champ que vous avez sélectionné couvre une série d&apos;octets (p.ex. vous avez sélectionné un protocole) vous pouvez limiter la correspondance à une série d&apos;octets ici.</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="158"/>
+ <location filename="display_filter_expression_dialog.ui" line="154"/>
<source>Range (offset:length)</source>
<translation>Série (offset:longueur)</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="177"/>
+ <location filename="display_filter_expression_dialog.ui" line="173"/>
<source>No display filter</source>
<translation>Pas de filtre d&apos;affichage.</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="184"/>
+ <location filename="display_filter_expression_dialog.ui" line="180"/>
<source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
<translation>&lt;small&gt;&lt;i&gt;Un indice.&lt;/i&gt;&lt;/small&gt;</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="74"/>
+ <location filename="display_filter_expression_dialog.cpp" line="75"/>
<source>Display Filter Expression</source>
<translation>Affiche Expression de Filtre</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="213"/>
+ <location filename="display_filter_expression_dialog.cpp" line="223"/>
<source>Select a field name to get started</source>
<translation>Sélectionner un nom de champ pour commencer</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="217"/>
+ <location filename="display_filter_expression_dialog.cpp" line="227"/>
<source>Click OK to insert this filter</source>
<translation>Cliquer OK pour insérer ce filtre</translation>
</message>
@@ -9412,22 +9418,22 @@ a:hover {
<translation>avant de quitter</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1066"/>
+ <location filename="main_window.cpp" line="1079"/>
<source>Save packets before merging?</source>
<translation>Sauvegarder les paquets avant la fusion?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1067"/>
+ <location filename="main_window.cpp" line="1080"/>
<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="1073"/>
+ <location filename="main_window.cpp" line="1086"/>
<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="1075"/>
+ <location filename="main_window.cpp" line="1088"/>
<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>
@@ -9437,117 +9443,122 @@ a:hover {
<translation>Filtre d&apos;affichage invalide</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1112"/>
+ <location filename="main_window.cpp" line="1125"/>
<source>Invalid Read Filter</source>
<translation>Filtre de Lecture Invalide</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1113"/>
+ <location filename="main_window.cpp" line="1126"/>
<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="1202"/>
+ <location filename="main_window.cpp" line="1215"/>
<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="1478"/>
+ <location filename="main_window.cpp" line="1491"/>
<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="1479"/>
+ <location filename="main_window.cpp" line="1492"/>
<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="1565"/>
- <location filename="main_window.cpp" line="1590"/>
+ <location filename="main_window.cpp" line="1580"/>
+ <location filename="main_window.cpp" line="1605"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1637"/>
+ <location filename="main_window.cpp" line="1652"/>
<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="1633"/>
- <location filename="main_window.cpp" line="1641"/>
+ <location filename="main_window.cpp" line="1648"/>
+ <location filename="main_window.cpp" line="1656"/>
<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="1646"/>
+ <location filename="main_window.cpp" line="1661"/>
<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="1638"/>
- <location filename="main_window.cpp" line="1647"/>
+ <location filename="main_window.cpp" line="1653"/>
+ <location filename="main_window.cpp" line="1662"/>
<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="1632"/>
+ <location filename="main_window.cpp" line="880"/>
+ <source>Unable to drop files during capture.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="main_window.cpp" line="1647"/>
<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="1640"/>
+ <location filename="main_window.cpp" line="1655"/>
<source>Do you want to save the captured packets%1?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1664"/>
+ <location filename="main_window.cpp" line="1679"/>
<source>Save before Continue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1666"/>
+ <location filename="main_window.cpp" line="1681"/>
<source>Stop and Save</source>
<translation>Arreter et Sauvegarder</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1678"/>
+ <location filename="main_window.cpp" line="1693"/>
<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="1690"/>
+ <location filename="main_window.cpp" line="1705"/>
<source>Quit &amp;without Saving</source>
<oldsource>Quit without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1681"/>
- <location filename="main_window.cpp" line="1694"/>
+ <location filename="main_window.cpp" line="1696"/>
+ <location filename="main_window.cpp" line="1709"/>
<source>Continue &amp;without Saving</source>
<oldsource>Continue without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1684"/>
+ <location filename="main_window.cpp" line="1699"/>
<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="2033"/>
+ <location filename="main_window.cpp" line="2048"/>
<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="2054"/>
+ <location filename="main_window.cpp" line="2069"/>
<source>The Wireshark Network Analyzer</source>
<translation>L&apos;analyseur de réseau Wireshark</translation>
</message>
<message>
- <location filename="main_window.cpp" line="2079"/>
+ <location filename="main_window.cpp" line="2094"/>
<source>Capturing from %1</source>
<translation>Capture en cours de %1</translation>
</message>
@@ -9562,52 +9573,52 @@ a:hover {
<translation>%1: %2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="816"/>
+ <location filename="main_window_slots.cpp" line="817"/>
<source>Saving %1</source>
<translation>Sauvegarde en cours %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="856"/>
+ <location filename="main_window_slots.cpp" line="857"/>
<source>No interface selected</source>
<translation>Aucune interface sélectionnée</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="866"/>
+ <location filename="main_window_slots.cpp" line="867"/>
<source>Invalid capture filter</source>
<translation>Filtre de capture invalide</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1114"/>
+ <location filename="main_window_slots.cpp" line="1115"/>
<source>Clear Menu</source>
<translation>Effacer les fichiers récemment ouverts</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1597"/>
+ <location filename="main_window_slots.cpp" line="1598"/>
<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="1698"/>
+ <location filename="main_window_slots.cpp" line="1699"/>
<source> before closing the file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1780"/>
+ <location filename="main_window_slots.cpp" line="1781"/>
<source>Export Selected Packet Bytes</source>
<translation>Exporter Octets de Paquets Sélectionnés</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1846"/>
+ <location filename="main_window_slots.cpp" line="1847"/>
<source>No Keys</source>
<translation>Aucune clés</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1847"/>
+ <location filename="main_window_slots.cpp" line="1848"/>
<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="1853"/>
+ <location filename="main_window_slots.cpp" line="1854"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation type="unfinished">
@@ -9616,7 +9627,7 @@ a:hover {
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1782"/>
+ <location filename="main_window_slots.cpp" line="1783"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation type="unfinished"></translation>
</message>
@@ -9626,64 +9637,64 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1857"/>
+ <location filename="main_window_slots.cpp" line="1858"/>
<source>SSL Session Keys (*.keys *.txt);;All Files (</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1975"/>
+ <location filename="main_window_slots.cpp" line="1976"/>
<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="2381"/>
- <location filename="main_window_slots.cpp" line="3492"/>
+ <location filename="main_window_slots.cpp" line="2382"/>
+ <location filename="main_window_slots.cpp" line="3493"/>
<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="2531"/>
- <location filename="main_window_slots.cpp" line="2544"/>
+ <location filename="main_window_slots.cpp" line="2532"/>
+ <location filename="main_window_slots.cpp" line="2545"/>
<source> before reloading the file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2578"/>
+ <location filename="main_window_slots.cpp" line="2579"/>
<source>No filter available. Try another </source>
<translation>Aucun filtre disponible. Essayer un autre</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3499"/>
+ <location filename="main_window_slots.cpp" line="3500"/>
<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="3508"/>
+ <location filename="main_window_slots.cpp" line="3509"/>
<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="3585"/>
+ <location filename="main_window_slots.cpp" line="3586"/>
<source>No Interface Selected</source>
<translation>Aucune Interface Sélectionnée</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3592"/>
+ <location filename="main_window_slots.cpp" line="3593"/>
<source> before starting a new capture</source>
<translation>avant de commencer une nouvelle capture</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3610"/>
+ <location filename="main_window_slots.cpp" line="3611"/>
<source> before restarting the capture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3818"/>
+ <location filename="main_window_slots.cpp" line="3819"/>
<source>Wiki Page for %1</source>
<translation>Page Wiki pour %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3819"/>
+ <location filename="main_window_slots.cpp" line="3820"/>
<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;
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index 4390506827..48e70b5d35 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -2225,7 +2225,6 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<translation>Cerca:</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="72"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Relations can be used to restrict fields to specific values. Each relation does the following:&lt;/p&gt;
&lt;table&gt;&lt;tbody&gt;
&lt;tr&gt;&lt;th&gt;is present&lt;/th&gt;&lt;td&gt;Match any packet that contains this field&lt;/td&gt;&lt;/tr&gt;
@@ -2233,7 +2232,7 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
&lt;tr&gt;&lt;th&gt;contains, matches&lt;/th&gt;&lt;td&gt;Check the field against a string (contains) or a regular expression (matches)&lt;/td&gt;&lt;/tr&gt;
&lt;/tbody&gt;&lt;/table&gt;
&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Le relazioni possono essere utilizzate per restringere i campi a valori specifici. Ogni relazione fa ciò che segue:&lt;/p&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Le relazioni possono essere utilizzate per restringere i campi a valori specifici. Ogni relazione fa ciò che segue:&lt;/p&gt;
&lt;table&gt;&lt;tbody&gt;
&lt;tr&gt;&lt;th&gt;è presente&lt;/th&gt;&lt;td&gt;Verifica qualsiasi pacchetto che contiene questo campo&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;th&gt;==, !=, etc.&lt;/th&gt;&lt;td&gt;Confronta il campo con un valore specifico.&lt;/td&gt;&lt;/tr&gt;
@@ -2242,62 +2241,69 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="81"/>
+ <location filename="display_filter_expression_dialog.ui" line="72"/>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Relations can be used to restrict fields to specific values. Each relation does the following:&lt;/p&gt;&lt;table border=&quot;0&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;&quot; cellspacing=&quot;2&quot; cellpadding=&quot;0&quot;&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;is present&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Match any packet that contains this field&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;==, !=, etc.&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Compare the field to a specific value.&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;contains, matches&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Check the field against a string (contains) or a regular expression (matches)&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;in&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Compare the field to a specific set of values&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;
+
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="display_filter_expression_dialog.ui" line="77"/>
<source>Relation</source>
<translation>Relazione</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="108"/>
+ <location filename="display_filter_expression_dialog.ui" line="104"/>
<source>Match against this value.</source>
<translation>Verifica questo valore.</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="111"/>
+ <location filename="display_filter_expression_dialog.ui" line="107"/>
<source>Value</source>
<translation>Valore</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="125"/>
+ <location filename="display_filter_expression_dialog.ui" line="121"/>
<source>If the field you have selected has a known set of valid values they will be listed here.</source>
<translation>Se il campo selezionato ha un insieme noto di valori validi, questi valori saranno elencati qui.</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="128"/>
+ <location filename="display_filter_expression_dialog.ui" line="124"/>
<source>Predefined Values</source>
<translation>Valori predefiniti</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="155"/>
+ <location filename="display_filter_expression_dialog.ui" line="151"/>
<source>If the field you have selected covers a range of bytes (e.g. you have selected a protocol) you can restrict the match to a range of bytes here.</source>
<translation>Se il campo selezionato copre un intervallo di byte (ad es. hai selezionato un protocollo), puoi restringere qui la corrispondenza a un intervallo di byte.</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="158"/>
+ <location filename="display_filter_expression_dialog.ui" line="154"/>
<source>Range (offset:length)</source>
<translation>Intervallo (offset:lunghezza)</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="177"/>
+ <location filename="display_filter_expression_dialog.ui" line="173"/>
<source>No display filter</source>
<translation>Nessun filtro di visualizzazione</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="184"/>
+ <location filename="display_filter_expression_dialog.ui" line="180"/>
<source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
<translation>&lt;small&gt;&lt;i&gt;Un suggerimento.&lt;/i&gt;&lt;/small&gt;</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="74"/>
+ <location filename="display_filter_expression_dialog.cpp" line="75"/>
<source>Display Filter Expression</source>
<translation>Espressione del filtro di visualizzazione</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="213"/>
+ <location filename="display_filter_expression_dialog.cpp" line="223"/>
<source>Select a field name to get started</source>
<translation>Seleziona il nome di un campo per iniziare</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="217"/>
+ <location filename="display_filter_expression_dialog.cpp" line="227"/>
<source>Click OK to insert this filter</source>
<translation>Fai clic su OK per inserire questo filtro</translation>
</message>
@@ -9442,22 +9448,22 @@ a:hover {
<translation>prima di uscire</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1066"/>
+ <location filename="main_window.cpp" line="1079"/>
<source>Save packets before merging?</source>
<translation>Salvare i pacchetti prima di unire?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1067"/>
+ <location filename="main_window.cpp" line="1080"/>
<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="1073"/>
+ <location filename="main_window.cpp" line="1086"/>
<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="1075"/>
+ <location filename="main_window.cpp" line="1088"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>Le modifiche devono essere salvate prima di unire.</translation>
</message>
@@ -9467,117 +9473,122 @@ a:hover {
<translation>Filtro di visualizzazione non valido</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1112"/>
+ <location filename="main_window.cpp" line="1125"/>
<source>Invalid Read Filter</source>
<translation>Filtro di lettura non valido</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1113"/>
+ <location filename="main_window.cpp" line="1126"/>
<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="1202"/>
+ <location filename="main_window.cpp" line="1215"/>
<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="1478"/>
+ <location filename="main_window.cpp" line="1491"/>
<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="1479"/>
+ <location filename="main_window.cpp" line="1492"/>
<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="1565"/>
- <location filename="main_window.cpp" line="1590"/>
+ <location filename="main_window.cpp" line="1580"/>
+ <location filename="main_window.cpp" line="1605"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1637"/>
+ <location filename="main_window.cpp" line="1652"/>
<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="1633"/>
- <location filename="main_window.cpp" line="1641"/>
+ <location filename="main_window.cpp" line="1648"/>
+ <location filename="main_window.cpp" line="1656"/>
<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="1646"/>
+ <location filename="main_window.cpp" line="1661"/>
<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="1638"/>
- <location filename="main_window.cpp" line="1647"/>
+ <location filename="main_window.cpp" line="1653"/>
+ <location filename="main_window.cpp" line="1662"/>
<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="1632"/>
+ <location filename="main_window.cpp" line="880"/>
+ <source>Unable to drop files during capture.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="main_window.cpp" line="1647"/>
<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="1640"/>
+ <location filename="main_window.cpp" line="1655"/>
<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="1664"/>
+ <location filename="main_window.cpp" line="1679"/>
<source>Save before Continue</source>
<translation>Salva prima di continuare</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1666"/>
+ <location filename="main_window.cpp" line="1681"/>
<source>Stop and Save</source>
<translation>Ferma e salva</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1678"/>
+ <location filename="main_window.cpp" line="1693"/>
<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="1690"/>
+ <location filename="main_window.cpp" line="1705"/>
<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="1681"/>
- <location filename="main_window.cpp" line="1694"/>
+ <location filename="main_window.cpp" line="1696"/>
+ <location filename="main_window.cpp" line="1709"/>
<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="1684"/>
+ <location filename="main_window.cpp" line="1699"/>
<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="2033"/>
+ <location filename="main_window.cpp" line="2048"/>
<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="2054"/>
+ <location filename="main_window.cpp" line="2069"/>
<source>The Wireshark Network Analyzer</source>
<translation>Wireshark l&apos;analizzatore di rete</translation>
</message>
<message>
- <location filename="main_window.cpp" line="2079"/>
+ <location filename="main_window.cpp" line="2094"/>
<source>Capturing from %1</source>
<translation>Cattura da %1</translation>
</message>
@@ -9592,52 +9603,52 @@ a:hover {
<translation>%1: %2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="816"/>
+ <location filename="main_window_slots.cpp" line="817"/>
<source>Saving %1</source>
<translation>Salvataggio di %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="856"/>
+ <location filename="main_window_slots.cpp" line="857"/>
<source>No interface selected</source>
<translation>Nessuna interfaccia selezionata</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="866"/>
+ <location filename="main_window_slots.cpp" line="867"/>
<source>Invalid capture filter</source>
<translation>Filtro di cattura invalido</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1114"/>
+ <location filename="main_window_slots.cpp" line="1115"/>
<source>Clear Menu</source>
<translation>Pulisci menu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1597"/>
+ <location filename="main_window_slots.cpp" line="1598"/>
<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="1698"/>
+ <location filename="main_window_slots.cpp" line="1699"/>
<source> before closing the file</source>
<translation>prima della chiusura del file</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1780"/>
+ <location filename="main_window_slots.cpp" line="1781"/>
<source>Export Selected Packet Bytes</source>
<translation>Esporta i byte del pacchetto selezionato</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1846"/>
+ <location filename="main_window_slots.cpp" line="1847"/>
<source>No Keys</source>
<translation>Nessuna chiave</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1847"/>
+ <location filename="main_window_slots.cpp" line="1848"/>
<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="1853"/>
+ <location filename="main_window_slots.cpp" line="1854"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation>
@@ -9646,7 +9657,7 @@ a:hover {
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1782"/>
+ <location filename="main_window_slots.cpp" line="1783"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation>Dati grezzi (*.bin *.dat *.raw);;Tutti i file (</translation>
</message>
@@ -9656,64 +9667,64 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1857"/>
+ <location filename="main_window_slots.cpp" line="1858"/>
<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="1975"/>
+ <location filename="main_window_slots.cpp" line="1976"/>
<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="2381"/>
- <location filename="main_window_slots.cpp" line="3492"/>
+ <location filename="main_window_slots.cpp" line="2382"/>
+ <location filename="main_window_slots.cpp" line="3493"/>
<source>Unable to build conversation filter.</source>
<translation>Impossibile creare il filtro di conversazione.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2531"/>
- <location filename="main_window_slots.cpp" line="2544"/>
+ <location filename="main_window_slots.cpp" line="2532"/>
+ <location filename="main_window_slots.cpp" line="2545"/>
<source> before reloading the file</source>
<translation>prima di ricaricare il file</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2578"/>
+ <location filename="main_window_slots.cpp" line="2579"/>
<source>No filter available. Try another </source>
<translation>Nessun filtro disponibile. Provane un altro </translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3499"/>
+ <location filename="main_window_slots.cpp" line="3500"/>
<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="3508"/>
+ <location filename="main_window_slots.cpp" line="3509"/>
<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="3585"/>
+ <location filename="main_window_slots.cpp" line="3586"/>
<source>No Interface Selected</source>
<translation>Nessuna interfaccia selezionata</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3592"/>
+ <location filename="main_window_slots.cpp" line="3593"/>
<source> before starting a new capture</source>
<translation>prima di iniziare una nuova cattura</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3610"/>
+ <location filename="main_window_slots.cpp" line="3611"/>
<source> before restarting the capture</source>
<translation>prima di riavviare la cattura</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3818"/>
+ <location filename="main_window_slots.cpp" line="3819"/>
<source>Wiki Page for %1</source>
<translation>Pagina wiki per %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3819"/>
+ <location filename="main_window_slots.cpp" line="3820"/>
<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>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index 3d36fa4297..c1382dd695 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -2221,7 +2221,6 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>検索:</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="72"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Relations can be used to restrict fields to specific values. Each relation does the following:&lt;/p&gt;
&lt;table&gt;&lt;tbody&gt;
&lt;tr&gt;&lt;th&gt;is present&lt;/th&gt;&lt;td&gt;Match any packet that contains this field&lt;/td&gt;&lt;/tr&gt;
@@ -2229,7 +2228,7 @@ PLEASE NOTE: One option MUST be selected.</source>
&lt;tr&gt;&lt;th&gt;contains, matches&lt;/th&gt;&lt;td&gt;Check the field against a string (contains) or a regular expression (matches)&lt;/td&gt;&lt;/tr&gt;
&lt;/tbody&gt;&lt;/table&gt;
&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;リレーションは特定の値へフィールドを制限するために用いられます。それぞれのリレーションは以下になります:&lt;/p&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;リレーションは特定の値へフィールドを制限するために用いられます。それぞれのリレーションは以下になります:&lt;/p&gt;
&lt;table&gt;&lt;tbody&gt;
&lt;tr&gt;&lt;th&gt;is present&lt;/th&gt;&lt;td&gt;Match any packet that contains this field&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;th&gt;==, !=, etc.&lt;/th&gt;&lt;td&gt;Compare the field to a specific value.&lt;/td&gt;&lt;/tr&gt;
@@ -2238,62 +2237,69 @@ PLEASE NOTE: One option MUST be selected.</source>
&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="81"/>
+ <location filename="display_filter_expression_dialog.ui" line="72"/>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Relations can be used to restrict fields to specific values. Each relation does the following:&lt;/p&gt;&lt;table border=&quot;0&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;&quot; cellspacing=&quot;2&quot; cellpadding=&quot;0&quot;&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;is present&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Match any packet that contains this field&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;==, !=, etc.&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Compare the field to a specific value.&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;contains, matches&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Check the field against a string (contains) or a regular expression (matches)&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;in&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Compare the field to a specific set of values&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;
+
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="display_filter_expression_dialog.ui" line="77"/>
<source>Relation</source>
<translation>リレーション</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="108"/>
+ <location filename="display_filter_expression_dialog.ui" line="104"/>
<source>Match against this value.</source>
<translation>この値に合致します</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="111"/>
+ <location filename="display_filter_expression_dialog.ui" line="107"/>
<source>Value</source>
<translation>値</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="125"/>
+ <location filename="display_filter_expression_dialog.ui" line="121"/>
<source>If the field you have selected has a known set of valid values they will be listed here.</source>
<translation>選択したフィールドに有効な値があるとここに一覧表示されます</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="128"/>
+ <location filename="display_filter_expression_dialog.ui" line="124"/>
<source>Predefined Values</source>
<translation>事前に定義された値</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="155"/>
+ <location filename="display_filter_expression_dialog.ui" line="151"/>
<source>If the field you have selected covers a range of bytes (e.g. you have selected a protocol) you can restrict the match to a range of bytes here.</source>
<translation>選択したフィールドがバイト範囲に収まる場合(プロトコルを選んだときなど)、ここで合致するバイトの範囲制限できます</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="158"/>
+ <location filename="display_filter_expression_dialog.ui" line="154"/>
<source>Range (offset:length)</source>
<translation>範囲 (位置:長さ)</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="177"/>
+ <location filename="display_filter_expression_dialog.ui" line="173"/>
<source>No display filter</source>
<translation>表示フィルタなし</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="184"/>
+ <location filename="display_filter_expression_dialog.ui" line="180"/>
<source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
<translation>&lt;small&gt;&lt;i&gt;ヒント&lt;/i&gt;&lt;/small&gt;</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="74"/>
+ <location filename="display_filter_expression_dialog.cpp" line="75"/>
<source>Display Filter Expression</source>
<translation>表示フィルタ式</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="213"/>
+ <location filename="display_filter_expression_dialog.cpp" line="223"/>
<source>Select a field name to get started</source>
<translation>開始するフィールド名を選択</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="217"/>
+ <location filename="display_filter_expression_dialog.cpp" line="227"/>
<source>Click OK to insert this filter</source>
<translation>OKをクリックしてこのフィルタを挿入</translation>
</message>
@@ -9394,22 +9400,22 @@ a:hover {
<translation>終了前</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1066"/>
+ <location filename="main_window.cpp" line="1079"/>
<source>Save packets before merging?</source>
<translation>結合する前にパケットを保存しますか?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1067"/>
+ <location filename="main_window.cpp" line="1080"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation>一時的なキャプチャファイルは結合することができません</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1073"/>
+ <location filename="main_window.cpp" line="1086"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation>結合する前に &quot;%1&quot; に変更を保存しますか?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1075"/>
+ <location filename="main_window.cpp" line="1088"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>ファイルを結合する前に変更を保存する必要があります</translation>
</message>
@@ -9419,117 +9425,122 @@ a:hover {
<translation>無効な表示フィルタ</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1112"/>
+ <location filename="main_window.cpp" line="1125"/>
<source>Invalid Read Filter</source>
<translation>無効な読込フィルタ</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1113"/>
+ <location filename="main_window.cpp" line="1126"/>
<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="1202"/>
+ <location filename="main_window.cpp" line="1215"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
<translation>新しいキャプチャファイルをインポートする前に</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1478"/>
+ <location filename="main_window.cpp" line="1491"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation>&quot;%1&quot; をエクスポートすることができません</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1479"/>
+ <location filename="main_window.cpp" line="1492"/>
<source>You cannot export packets to the current capture file.</source>
<translation>現在のキャプチャファイルへパケットをエクスポートすることはできません</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1565"/>
- <location filename="main_window.cpp" line="1590"/>
+ <location filename="main_window.cpp" line="1580"/>
+ <location filename="main_window.cpp" line="1605"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1637"/>
+ <location filename="main_window.cpp" line="1652"/>
<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="1633"/>
- <location filename="main_window.cpp" line="1641"/>
+ <location filename="main_window.cpp" line="1648"/>
+ <location filename="main_window.cpp" line="1656"/>
<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="1646"/>
+ <location filename="main_window.cpp" line="1661"/>
<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="1638"/>
- <location filename="main_window.cpp" line="1647"/>
+ <location filename="main_window.cpp" line="1653"/>
+ <location filename="main_window.cpp" line="1662"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>保存しない場合変更は失われます</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1632"/>
+ <location filename="main_window.cpp" line="880"/>
+ <source>Unable to drop files during capture.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="main_window.cpp" line="1647"/>
<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="1640"/>
+ <location filename="main_window.cpp" line="1655"/>
<source>Do you want to save the captured packets%1?</source>
<translation>キャプチャしたパケットを保存しますか?%1</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1664"/>
+ <location filename="main_window.cpp" line="1679"/>
<source>Save before Continue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1666"/>
+ <location filename="main_window.cpp" line="1681"/>
<source>Stop and Save</source>
<translation>停止して保存</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1678"/>
+ <location filename="main_window.cpp" line="1693"/>
<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="1690"/>
+ <location filename="main_window.cpp" line="1705"/>
<source>Quit &amp;without Saving</source>
<oldsource>Quit without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1681"/>
- <location filename="main_window.cpp" line="1694"/>
+ <location filename="main_window.cpp" line="1696"/>
+ <location filename="main_window.cpp" line="1709"/>
<source>Continue &amp;without Saving</source>
<oldsource>Continue without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1684"/>
+ <location filename="main_window.cpp" line="1699"/>
<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="2033"/>
+ <location filename="main_window.cpp" line="2048"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>ファイル名をUTF-8形式に割り当てできません</translation>
</message>
<message>
- <location filename="main_window.cpp" line="2054"/>
+ <location filename="main_window.cpp" line="2069"/>
<source>The Wireshark Network Analyzer</source>
<translation>ワイヤーシャークネットワークアナライザ</translation>
</message>
<message>
- <location filename="main_window.cpp" line="2079"/>
+ <location filename="main_window.cpp" line="2094"/>
<source>Capturing from %1</source>
<translation>%1 からキャプチャ中</translation>
</message>
@@ -9544,52 +9555,52 @@ a:hover {
<translation>%1: %2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="816"/>
+ <location filename="main_window_slots.cpp" line="817"/>
<source>Saving %1</source>
<translation>保存中 %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="856"/>
+ <location filename="main_window_slots.cpp" line="857"/>
<source>No interface selected</source>
<translation>インターフェースが選択されていません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="866"/>
+ <location filename="main_window_slots.cpp" line="867"/>
<source>Invalid capture filter</source>
<translation>無効なキャプチャフィルタ</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1114"/>
+ <location filename="main_window_slots.cpp" line="1115"/>
<source>Clear Menu</source>
<translation>メニューをクリア</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1597"/>
+ <location filename="main_window_slots.cpp" line="1598"/>
<source>Please wait while Wireshark is initializing</source>
<translation>Wiresharkが初期化している間お待ちください</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1698"/>
+ <location filename="main_window_slots.cpp" line="1699"/>
<source> before closing the file</source>
<translation>ファイルを閉じる前に</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1780"/>
+ <location filename="main_window_slots.cpp" line="1781"/>
<source>Export Selected Packet Bytes</source>
<translation>選択したパケットバイト列をエクスポート</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1846"/>
+ <location filename="main_window_slots.cpp" line="1847"/>
<source>No Keys</source>
<translation>キーはありません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1847"/>
+ <location filename="main_window_slots.cpp" line="1848"/>
<source>There are no SSL Session Keys to save.</source>
<translation>保存するSSLセッション鍵はありません</translation>
</message>
<message numerus="yes">
- <location filename="main_window_slots.cpp" line="1853"/>
+ <location filename="main_window_slots.cpp" line="1854"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation>
@@ -9597,7 +9608,7 @@ a:hover {
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1782"/>
+ <location filename="main_window_slots.cpp" line="1783"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation>Raw(無加工)データ形式 (*.bin *.dat *.raw);;すべてのファイル(</translation>
</message>
@@ -9607,64 +9618,64 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1857"/>
+ <location filename="main_window_slots.cpp" line="1858"/>
<source>SSL Session Keys (*.keys *.txt);;All Files (</source>
<translation>SSLセッション鍵 (*.keys *.txt);;すべてのファイル (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1975"/>
+ <location filename="main_window_slots.cpp" line="1976"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation>テキストをコピーできません 別の項目を試してみてください</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2381"/>
- <location filename="main_window_slots.cpp" line="3492"/>
+ <location filename="main_window_slots.cpp" line="2382"/>
+ <location filename="main_window_slots.cpp" line="3493"/>
<source>Unable to build conversation filter.</source>
<translation>会話フィルタを作成できません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2531"/>
- <location filename="main_window_slots.cpp" line="2544"/>
+ <location filename="main_window_slots.cpp" line="2532"/>
+ <location filename="main_window_slots.cpp" line="2545"/>
<source> before reloading the file</source>
<translation>ファイルを再読み込みする前に</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2578"/>
+ <location filename="main_window_slots.cpp" line="2579"/>
<source>No filter available. Try another </source>
<translation>フィルタが利用できません 別のものを試してください</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3499"/>
+ <location filename="main_window_slots.cpp" line="3500"/>
<source>Error compiling filter for this conversation.</source>
<translation>この対話の間のフィルタ翻訳エラー</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3508"/>
+ <location filename="main_window_slots.cpp" line="3509"/>
<source>No previous/next packet in conversation.</source>
<translation>対話の前/次のパケットがありません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3585"/>
+ <location filename="main_window_slots.cpp" line="3586"/>
<source>No Interface Selected</source>
<translation>インターフェースが選択されていません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3592"/>
+ <location filename="main_window_slots.cpp" line="3593"/>
<source> before starting a new capture</source>
<translation>新規キャプチャを開始する前に</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3610"/>
+ <location filename="main_window_slots.cpp" line="3611"/>
<source> before restarting the capture</source>
<translation>キャプチャを再スタートする前に</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3818"/>
+ <location filename="main_window_slots.cpp" line="3819"/>
<source>Wiki Page for %1</source>
<translation>%1 の Wikiページ</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3819"/>
+ <location filename="main_window_slots.cpp" line="3820"/>
<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>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index 19e4bd2ddb..a5d49df76f 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -2224,7 +2224,6 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
<translation>Szukaj:</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="72"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Relations can be used to restrict fields to specific values. Each relation does the following:&lt;/p&gt;
&lt;table&gt;&lt;tbody&gt;
&lt;tr&gt;&lt;th&gt;is present&lt;/th&gt;&lt;td&gt;Match any packet that contains this field&lt;/td&gt;&lt;/tr&gt;
@@ -2232,7 +2231,7 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
&lt;tr&gt;&lt;th&gt;contains, matches&lt;/th&gt;&lt;td&gt;Check the field against a string (contains) or a regular expression (matches)&lt;/td&gt;&lt;/tr&gt;
&lt;/tbody&gt;&lt;/table&gt;
&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Relacji można użyć by ograniczyć wyszukiwanie pól do wybranych ich wartości. Każda relacja posiada następujące właściwości:&lt;/p&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Relacji można użyć by ograniczyć wyszukiwanie pól do wybranych ich wartości. Każda relacja posiada następujące właściwości:&lt;/p&gt;
&lt;table&gt;&lt;tbody&gt;
&lt;tr&gt;&lt;th&gt;ramka posiadająca to pole&lt;/th&gt;&lt;td&gt;Sprawdza każdy pakiet czy zawiera to pole&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;th&gt;==, !=, itd.&lt;/th&gt;&lt;td&gt;Porównuje wartość pola do zadanej wartości&lt;/td&gt;&lt;/tr&gt;
@@ -2241,62 +2240,69 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="81"/>
+ <location filename="display_filter_expression_dialog.ui" line="72"/>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Relations can be used to restrict fields to specific values. Each relation does the following:&lt;/p&gt;&lt;table border=&quot;0&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;&quot; cellspacing=&quot;2&quot; cellpadding=&quot;0&quot;&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;is present&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Match any packet that contains this field&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;==, !=, etc.&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Compare the field to a specific value.&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;contains, matches&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Check the field against a string (contains) or a regular expression (matches)&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;in&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Compare the field to a specific set of values&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;
+
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="display_filter_expression_dialog.ui" line="77"/>
<source>Relation</source>
<translation>Relacja</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="108"/>
+ <location filename="display_filter_expression_dialog.ui" line="104"/>
<source>Match against this value.</source>
<translation>Porównuje z tą wartością.</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="111"/>
+ <location filename="display_filter_expression_dialog.ui" line="107"/>
<source>Value</source>
<translation>Wartość</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="125"/>
+ <location filename="display_filter_expression_dialog.ui" line="121"/>
<source>If the field you have selected has a known set of valid values they will be listed here.</source>
<translation>Jeśli pole, które wybrano ma znane wartości to będą tu wyświetlane.</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="128"/>
+ <location filename="display_filter_expression_dialog.ui" line="124"/>
<source>Predefined Values</source>
<translation>Predefiniowane wartości</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="155"/>
+ <location filename="display_filter_expression_dialog.ui" line="151"/>
<source>If the field you have selected covers a range of bytes (e.g. you have selected a protocol) you can restrict the match to a range of bytes here.</source>
<translation>Jeśli pole, które wybrano obejmuje zakres bajtów (np. wybrano protokół) to tutaj można ograniczyć porównywanie do pewnego zakresu bajtów.</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="158"/>
+ <location filename="display_filter_expression_dialog.ui" line="154"/>
<source>Range (offset:length)</source>
<translation>Zakres (pozycja:długość)</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="177"/>
+ <location filename="display_filter_expression_dialog.ui" line="173"/>
<source>No display filter</source>
<translation>Brak filtru wyświetlania</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="184"/>
+ <location filename="display_filter_expression_dialog.ui" line="180"/>
<source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
<translation>&lt;small&gt;&lt;i&gt;Podpowiedź.&lt;/i&gt;&lt;/small&gt;</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="74"/>
+ <location filename="display_filter_expression_dialog.cpp" line="75"/>
<source>Display Filter Expression</source>
<translation>Wyrażenie filtru wyświetlania</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="213"/>
+ <location filename="display_filter_expression_dialog.cpp" line="223"/>
<source>Select a field name to get started</source>
<translation>Wybierz nazwę pola by rozpocząć</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="217"/>
+ <location filename="display_filter_expression_dialog.cpp" line="227"/>
<source>Click OK to insert this filter</source>
<translation>Kliknij OK by dodać filtr</translation>
</message>
@@ -9444,22 +9450,22 @@ text-decoration: underline;
<translation>przed wyjściem</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1066"/>
+ <location filename="main_window.cpp" line="1079"/>
<source>Save packets before merging?</source>
<translation>Zapisać pakiety przed scaleniem?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1067"/>
+ <location filename="main_window.cpp" line="1080"/>
<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="1073"/>
+ <location filename="main_window.cpp" line="1086"/>
<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="1075"/>
+ <location filename="main_window.cpp" line="1088"/>
<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>
@@ -9469,117 +9475,122 @@ text-decoration: underline;
<translation>Niepoprawny filtr</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1112"/>
+ <location filename="main_window.cpp" line="1125"/>
<source>Invalid Read Filter</source>
<translation>Niepoprawny filtr wczytywania</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1113"/>
+ <location filename="main_window.cpp" line="1126"/>
<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="1202"/>
+ <location filename="main_window.cpp" line="1215"/>
<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="1478"/>
+ <location filename="main_window.cpp" line="1491"/>
<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="1479"/>
+ <location filename="main_window.cpp" line="1492"/>
<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="1565"/>
- <location filename="main_window.cpp" line="1590"/>
+ <location filename="main_window.cpp" line="1580"/>
+ <location filename="main_window.cpp" line="1605"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1637"/>
+ <location filename="main_window.cpp" line="1652"/>
<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="1633"/>
- <location filename="main_window.cpp" line="1641"/>
+ <location filename="main_window.cpp" line="1648"/>
+ <location filename="main_window.cpp" line="1656"/>
<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="1646"/>
+ <location filename="main_window.cpp" line="1661"/>
<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="1638"/>
- <location filename="main_window.cpp" line="1647"/>
+ <location filename="main_window.cpp" line="1653"/>
+ <location filename="main_window.cpp" line="1662"/>
<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="1632"/>
+ <location filename="main_window.cpp" line="880"/>
+ <source>Unable to drop files during capture.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="main_window.cpp" line="1647"/>
<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="1640"/>
+ <location filename="main_window.cpp" line="1655"/>
<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="1664"/>
+ <location filename="main_window.cpp" line="1679"/>
<source>Save before Continue</source>
<translation>Zapisz przed kontynuowaniem</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1666"/>
+ <location filename="main_window.cpp" line="1681"/>
<source>Stop and Save</source>
<translation>Zatrzymaj i zapisz</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1678"/>
+ <location filename="main_window.cpp" line="1693"/>
<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="1690"/>
+ <location filename="main_window.cpp" line="1705"/>
<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="1681"/>
- <location filename="main_window.cpp" line="1694"/>
+ <location filename="main_window.cpp" line="1696"/>
+ <location filename="main_window.cpp" line="1709"/>
<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="1684"/>
+ <location filename="main_window.cpp" line="1699"/>
<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="2033"/>
+ <location filename="main_window.cpp" line="2048"/>
<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="2054"/>
+ <location filename="main_window.cpp" line="2069"/>
<source>The Wireshark Network Analyzer</source>
<translation>Analizator Wireshark</translation>
</message>
<message>
- <location filename="main_window.cpp" line="2079"/>
+ <location filename="main_window.cpp" line="2094"/>
<source>Capturing from %1</source>
<translation>Przechwytywanie z %1</translation>
</message>
@@ -9594,52 +9605,52 @@ text-decoration: underline;
<translation>%1: %2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="816"/>
+ <location filename="main_window_slots.cpp" line="817"/>
<source>Saving %1</source>
<translation>Zapisywanie %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="856"/>
+ <location filename="main_window_slots.cpp" line="857"/>
<source>No interface selected</source>
<translation>Nie wybrano interfejsu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="866"/>
+ <location filename="main_window_slots.cpp" line="867"/>
<source>Invalid capture filter</source>
<translation>Niepoprawny filtr przechwytywania</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1114"/>
+ <location filename="main_window_slots.cpp" line="1115"/>
<source>Clear Menu</source>
<translation>Wyczyść Menu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1597"/>
+ <location filename="main_window_slots.cpp" line="1598"/>
<source>Please wait while Wireshark is initializing</source>
<translation>Proszę czekać, trwa uruchamianie Wiresharka</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1698"/>
+ <location filename="main_window_slots.cpp" line="1699"/>
<source> before closing the file</source>
<translation>przed zapisaniem pliku</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1780"/>
+ <location filename="main_window_slots.cpp" line="1781"/>
<source>Export Selected Packet Bytes</source>
<translation>Eksportuj zaznaczony bajty pakietu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1846"/>
+ <location filename="main_window_slots.cpp" line="1847"/>
<source>No Keys</source>
<translation>Brak kluczy</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1847"/>
+ <location filename="main_window_slots.cpp" line="1848"/>
<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="1853"/>
+ <location filename="main_window_slots.cpp" line="1854"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation>
@@ -9649,7 +9660,7 @@ text-decoration: underline;
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1782"/>
+ <location filename="main_window_slots.cpp" line="1783"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation>Surowe dane (*.bin *.dat *.raw);;Dowolny plik (</translation>
</message>
@@ -9659,64 +9670,64 @@ text-decoration: underline;
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1857"/>
+ <location filename="main_window_slots.cpp" line="1858"/>
<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="1975"/>
+ <location filename="main_window_slots.cpp" line="1976"/>
<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="2381"/>
- <location filename="main_window_slots.cpp" line="3492"/>
+ <location filename="main_window_slots.cpp" line="2382"/>
+ <location filename="main_window_slots.cpp" line="3493"/>
<source>Unable to build conversation filter.</source>
<translation>Nie można stworzyć filtru konwersacji.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2531"/>
- <location filename="main_window_slots.cpp" line="2544"/>
+ <location filename="main_window_slots.cpp" line="2532"/>
+ <location filename="main_window_slots.cpp" line="2545"/>
<source> before reloading the file</source>
<translation>przed przeładowaniem pliku</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2578"/>
+ <location filename="main_window_slots.cpp" line="2579"/>
<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="3499"/>
+ <location filename="main_window_slots.cpp" line="3500"/>
<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="3508"/>
+ <location filename="main_window_slots.cpp" line="3509"/>
<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="3585"/>
+ <location filename="main_window_slots.cpp" line="3586"/>
<source>No Interface Selected</source>
<translation>Nie wybrano interfejsu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3592"/>
+ <location filename="main_window_slots.cpp" line="3593"/>
<source> before starting a new capture</source>
<translation>przed wystartowaniem nowego przechwytywania</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3610"/>
+ <location filename="main_window_slots.cpp" line="3611"/>
<source> before restarting the capture</source>
<translation>przed restartem przechwytywania</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3818"/>
+ <location filename="main_window_slots.cpp" line="3819"/>
<source>Wiki Page for %1</source>
<translation>Strona Wiki dla %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3819"/>
+ <location filename="main_window_slots.cpp" line="3820"/>
<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>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 6f670ab8d9..676127ba70 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -2224,7 +2224,6 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>搜索:</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="72"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Relations can be used to restrict fields to specific values. Each relation does the following:&lt;/p&gt;
&lt;table&gt;&lt;tbody&gt;
&lt;tr&gt;&lt;th&gt;is present&lt;/th&gt;&lt;td&gt;Match any packet that contains this field&lt;/td&gt;&lt;/tr&gt;
@@ -2232,7 +2231,7 @@ PLEASE NOTE: One option MUST be selected.</source>
&lt;tr&gt;&lt;th&gt;contains, matches&lt;/th&gt;&lt;td&gt;Check the field against a string (contains) or a regular expression (matches)&lt;/td&gt;&lt;/tr&gt;
&lt;/tbody&gt;&lt;/table&gt;
&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;“关系”可用于限定字段为指定的值。每项关系将执行下列操作:&lt;/p&gt;
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;“关系”可用于限定字段为指定的值。每项关系将执行下列操作:&lt;/p&gt;
&lt;table&gt;&lt;tbody&gt;
&lt;tr&gt;&lt;th&gt;目前在&lt;/th&gt;&lt;td&gt;匹配包含此字段的任何分组&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;th&gt;==、!= 等&lt;/th&gt;&lt;td&gt;在字段与指定值之间进行比较&lt;/td&gt;&lt;/tr&gt;
@@ -2241,62 +2240,69 @@ PLEASE NOTE: One option MUST be selected.</source>
&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="81"/>
+ <location filename="display_filter_expression_dialog.ui" line="72"/>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Relations can be used to restrict fields to specific values. Each relation does the following:&lt;/p&gt;&lt;table border=&quot;0&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;&quot; cellspacing=&quot;2&quot; cellpadding=&quot;0&quot;&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;is present&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Match any packet that contains this field&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;==, !=, etc.&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Compare the field to a specific value.&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;contains, matches&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Check the field against a string (contains) or a regular expression (matches)&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;in&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p&gt;Compare the field to a specific set of values&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;
+
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="display_filter_expression_dialog.ui" line="77"/>
<source>Relation</source>
<translation>关系</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="108"/>
+ <location filename="display_filter_expression_dialog.ui" line="104"/>
<source>Match against this value.</source>
<translation>匹配对应此值。</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="111"/>
+ <location filename="display_filter_expression_dialog.ui" line="107"/>
<source>Value</source>
<translation>值</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="125"/>
+ <location filename="display_filter_expression_dialog.ui" line="121"/>
<source>If the field you have selected has a known set of valid values they will be listed here.</source>
<translation>如果您已选择的字段有一个已知的有效值的集,它将被在这里列出。</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="128"/>
+ <location filename="display_filter_expression_dialog.ui" line="124"/>
<source>Predefined Values</source>
<translation>预定义的值</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="155"/>
+ <location filename="display_filter_expression_dialog.ui" line="151"/>
<source>If the field you have selected covers a range of bytes (e.g. you have selected a protocol) you can restrict the match to a range of bytes here.</source>
<translation>如果您已选择的字段涵盖范围字节(例如您选择了一个协议),您可以在这里对匹配进行字节范围的限制。</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="158"/>
+ <location filename="display_filter_expression_dialog.ui" line="154"/>
<source>Range (offset:length)</source>
<translation>范围 (偏移:长度)</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="177"/>
+ <location filename="display_filter_expression_dialog.ui" line="173"/>
<source>No display filter</source>
<translation>无显示过滤器</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.ui" line="184"/>
+ <location filename="display_filter_expression_dialog.ui" line="180"/>
<source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
<translation>&lt;small&gt;&lt;i&gt;提示&lt;/i&gt;&lt;/small&gt;</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="74"/>
+ <location filename="display_filter_expression_dialog.cpp" line="75"/>
<source>Display Filter Expression</source>
<translation>显示过滤器表达式</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="213"/>
+ <location filename="display_filter_expression_dialog.cpp" line="223"/>
<source>Select a field name to get started</source>
<translation>选择一个字段名称以开始</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="217"/>
+ <location filename="display_filter_expression_dialog.cpp" line="227"/>
<source>Click OK to insert this filter</source>
<translation>点击确定插入此过滤器</translation>
</message>
@@ -9431,22 +9437,22 @@ text-decoration: underline;
<translation>在退出前</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1066"/>
+ <location filename="main_window.cpp" line="1079"/>
<source>Save packets before merging?</source>
<translation>是否在合并之前保存分组?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1067"/>
+ <location filename="main_window.cpp" line="1080"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation>无法合并临时捕获文件。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1073"/>
+ <location filename="main_window.cpp" line="1086"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation>是否在合并前保存对“%1”的更改?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1075"/>
+ <location filename="main_window.cpp" line="1088"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>在文件合并之前,其更改必须先保存。</translation>
</message>
@@ -9456,117 +9462,122 @@ text-decoration: underline;
<translation>无效显示过滤器</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1112"/>
+ <location filename="main_window.cpp" line="1125"/>
<source>Invalid Read Filter</source>
<translation>无效读取过滤器</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1113"/>
+ <location filename="main_window.cpp" line="1126"/>
<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="1202"/>
+ <location filename="main_window.cpp" line="1215"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
<translation> 导入新捕获前</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1478"/>
+ <location filename="main_window.cpp" line="1491"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation>无法导出“%1”。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1479"/>
+ <location filename="main_window.cpp" line="1492"/>
<source>You cannot export packets to the current capture file.</source>
<translation>您不能将分组导出到当前捕获文件。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1565"/>
- <location filename="main_window.cpp" line="1590"/>
+ <location filename="main_window.cpp" line="1580"/>
+ <location filename="main_window.cpp" line="1605"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1637"/>
+ <location filename="main_window.cpp" line="1652"/>
<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="1633"/>
- <location filename="main_window.cpp" line="1641"/>
+ <location filename="main_window.cpp" line="1648"/>
+ <location filename="main_window.cpp" line="1656"/>
<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="1646"/>
+ <location filename="main_window.cpp" line="1661"/>
<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="1638"/>
- <location filename="main_window.cpp" line="1647"/>
+ <location filename="main_window.cpp" line="1653"/>
+ <location filename="main_window.cpp" line="1662"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>若不保存,您的更改将会丢失。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1632"/>
+ <location filename="main_window.cpp" line="880"/>
+ <source>Unable to drop files during capture.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="main_window.cpp" line="1647"/>
<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="1640"/>
+ <location filename="main_window.cpp" line="1655"/>
<source>Do you want to save the captured packets%1?</source>
<translation>您是否要保存已捕获的分组%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1664"/>
+ <location filename="main_window.cpp" line="1679"/>
<source>Save before Continue</source>
<translation>继续前保存</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1666"/>
+ <location filename="main_window.cpp" line="1681"/>
<source>Stop and Save</source>
<translation>停止并保存</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1678"/>
+ <location filename="main_window.cpp" line="1693"/>
<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="1690"/>
+ <location filename="main_window.cpp" line="1705"/>
<source>Quit &amp;without Saving</source>
<oldsource>Quit without Saving</oldsource>
<translation>直接退出,不保存(&amp;W)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1681"/>
- <location filename="main_window.cpp" line="1694"/>
+ <location filename="main_window.cpp" line="1696"/>
+ <location filename="main_window.cpp" line="1709"/>
<source>Continue &amp;without Saving</source>
<oldsource>Continue without Saving</oldsource>
<translation>继续,不保存(&amp;W)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1684"/>
+ <location filename="main_window.cpp" line="1699"/>
<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="2033"/>
+ <location filename="main_window.cpp" line="2048"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>文件名不能映射到UTF-8</translation>
</message>
<message>
- <location filename="main_window.cpp" line="2054"/>
+ <location filename="main_window.cpp" line="2069"/>
<source>The Wireshark Network Analyzer</source>
<translation>Wireshark 网络分析器</translation>
</message>
<message>
- <location filename="main_window.cpp" line="2079"/>
+ <location filename="main_window.cpp" line="2094"/>
<source>Capturing from %1</source>
<translation>正在捕获 %1</translation>
</message>
@@ -9581,52 +9592,52 @@ text-decoration: underline;
<translation>%1: %2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="816"/>
+ <location filename="main_window_slots.cpp" line="817"/>
<source>Saving %1</source>
<translation>正在保存 %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="856"/>
+ <location filename="main_window_slots.cpp" line="857"/>
<source>No interface selected</source>
<translation>未选中接口</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="866"/>
+ <location filename="main_window_slots.cpp" line="867"/>
<source>Invalid capture filter</source>
<translation>无效捕获过滤器</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1114"/>
+ <location filename="main_window_slots.cpp" line="1115"/>
<source>Clear Menu</source>
<translation>清除菜单</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1597"/>
+ <location filename="main_window_slots.cpp" line="1598"/>
<source>Please wait while Wireshark is initializing</source>
<translation>Wireshark 正在初始化,请稍候</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1698"/>
+ <location filename="main_window_slots.cpp" line="1699"/>
<source> before closing the file</source>
<translation>关闭文件前</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1780"/>
+ <location filename="main_window_slots.cpp" line="1781"/>
<source>Export Selected Packet Bytes</source>
<translation>导出选择分组字节流</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1846"/>
+ <location filename="main_window_slots.cpp" line="1847"/>
<source>No Keys</source>
<translation>无密钥</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1847"/>
+ <location filename="main_window_slots.cpp" line="1848"/>
<source>There are no SSL Session Keys to save.</source>
<translation>没有可以保存的 SSL 会话密钥。</translation>
</message>
<message numerus="yes">
- <location filename="main_window_slots.cpp" line="1853"/>
+ <location filename="main_window_slots.cpp" line="1854"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation>
@@ -9634,7 +9645,7 @@ text-decoration: underline;
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1782"/>
+ <location filename="main_window_slots.cpp" line="1783"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation>原始数据 (*.bin *.dat *.raw);;所有文件 (</translation>
</message>
@@ -9644,64 +9655,64 @@ text-decoration: underline;
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1857"/>
+ <location filename="main_window_slots.cpp" line="1858"/>
<source>SSL Session Keys (*.keys *.txt);;All Files (</source>
<translation>SSL 会话密钥 (*.keys *.txt);;所有文件 (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1975"/>
+ <location filename="main_window_slots.cpp" line="1976"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation>无法复制文本。请尝试其他对象。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2381"/>
- <location filename="main_window_slots.cpp" line="3492"/>
+ <location filename="main_window_slots.cpp" line="2382"/>
+ <location filename="main_window_slots.cpp" line="3493"/>
<source>Unable to build conversation filter.</source>
<translation>无法建立对话过滤器。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2531"/>
- <location filename="main_window_slots.cpp" line="2544"/>
+ <location filename="main_window_slots.cpp" line="2532"/>
+ <location filename="main_window_slots.cpp" line="2545"/>
<source> before reloading the file</source>
<translation>重新载入文件前</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2578"/>
+ <location filename="main_window_slots.cpp" line="2579"/>
<source>No filter available. Try another </source>
<translation>无过滤器可用。请尝试其他 </translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3499"/>
+ <location filename="main_window_slots.cpp" line="3500"/>
<source>Error compiling filter for this conversation.</source>
<translation>为此对话编译过滤器时出错。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3508"/>
+ <location filename="main_window_slots.cpp" line="3509"/>
<source>No previous/next packet in conversation.</source>
<translation>此对话中没有上一个/下一个分组。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3585"/>
+ <location filename="main_window_slots.cpp" line="3586"/>
<source>No Interface Selected</source>
<translation>未选中接口</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3592"/>
+ <location filename="main_window_slots.cpp" line="3593"/>
<source> before starting a new capture</source>
<translation>在开始新捕获前</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3610"/>
+ <location filename="main_window_slots.cpp" line="3611"/>
<source> before restarting the capture</source>
<translation>重新开始捕获前</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3818"/>
+ <location filename="main_window_slots.cpp" line="3819"/>
<source>Wiki Page for %1</source>
<translation>%1 的 Wiki 页面</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3819"/>
+ <location filename="main_window_slots.cpp" line="3820"/>
<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>