aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--epan/enterprise-numbers168
-rw-r--r--epan/sminmpec.c40
-rw-r--r--services2
-rw-r--r--ui/qt/wireshark_de.qmbin336810 -> 337799 bytes
-rw-r--r--ui/qt/wireshark_de.ts97
-rw-r--r--ui/qt/wireshark_en.ts43
-rw-r--r--ui/qt/wireshark_fr.qmbin284318 -> 284938 bytes
-rw-r--r--ui/qt/wireshark_fr.ts103
-rw-r--r--ui/qt/wireshark_it.qmbin343466 -> 344497 bytes
-rw-r--r--ui/qt/wireshark_it.ts97
-rw-r--r--ui/qt/wireshark_ja_JP.qmbin260053 -> 259596 bytes
-rw-r--r--ui/qt/wireshark_ja_JP.ts67
-rw-r--r--ui/qt/wireshark_pl.qmbin329358 -> 330387 bytes
-rw-r--r--ui/qt/wireshark_pl.ts97
-rw-r--r--ui/qt/wireshark_zh_CN.qmbin250395 -> 251056 bytes
-rw-r--r--ui/qt/wireshark_zh_CN.ts97
16 files changed, 461 insertions, 350 deletions
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 3d2306919b..87355bfe8b 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2016-01-31)
+(last updated 2016-02-04)
SMI Network Management Private Enterprise Codes:
@@ -807,8 +807,8 @@ Decimal
---none---
198
University of Waterloo
- R. J. White
- snmp-tech&watmath.waterloo.edu
+ Network Services
+ ns-tech&ist.uwaterloo.ca
199
CCL/ITRI
Ming-Perng Chen
@@ -48895,8 +48895,8 @@ Decimal
martin.sperl&ucpag.com
12335
University of York
- Chris Kilgour
- crhk1&york.ac.uk
+ Gavin Atkinson
+ gavin.atkinson&york.ac.uk
12336
BuyWays
Jaap Bouma
@@ -53434,9 +53434,9 @@ Decimal
Alan Deger
adeger&netlibrary.com
13470
- Otto Security & Software Technologie GmbH
- Simon Hartl
- shartl&osst.at
+ SecureGUARD GmbH (formerly 'Otto Security & Software Technologie GmbH')
+ Martin Rummerstorfer
+ mrummerstorfer&secureguard.at
13471
PowerWAN, Inc
Siddana Gouda
@@ -188107,6 +188107,158 @@ Decentralization / Helenic Public Administra
ViktorBalogh
Viktor Balogh
me&viktorbalogh.net
+47132
+ Thinking Automation, Inc.
+ Derek Knutsen
+ dknutsen&researchcapitalgroup.com
+47133
+ Research Capital Group, Inc.
+ Derek Knutsen
+ dknutsen&researchcapitalgroup.com
+47134
+ FROG CELLSAT LIMITED
+ TARUN SHARMA
+ tarun&frogcellsat.com
+47135
+ MotionLED Technology Ltd.
+ Wilfred Wong
+ wilfred&motionledtechnology.com
+47136
+ 4S Information Technologies
+ Efe Erdogru
+ efe.erdogru&4s.com.tr
+47137
+ Andre Grosse Bley
+ Andre Grosse Bley
+ mib&grosse-bley.com
+47138
+ Noble 3D Printers, LLC
+ Edward R. Aylward II
+ edward.aylward&Noble3DPrinters.com
+47139
+ MaTelSo GmbH
+ Marc Fürst
+ marc.fuerst&matelso.de
+47140
+ DSG Systems AS
+ Espen Remman
+ espen.remman&dsg.no
+47141
+ PT. WIRAKY NUSA TELEKOMUNIKASI
+ UJANG HERANI
+ ujaheran&wnt.co.id
+47142
+ CoralTree Systems
+ Lee Ward
+ lee.ward&coraltreesystems.com
+47143
+ iSnapp
+ Willem de Jonge
+ willem&isnapp.nl
+47144
+ CommerceHub
+ Michael Vinzi
+ mvinzi&commercehub.com
+47145
+ Telonic Berkeley Inc
+ KANAK VAGHELA
+ kanak&telonicberkeley.com
+47146
+ ENDERCODING
+ Elias Werberich
+ support&endercoding.com
+47147
+ Avionics Interface Technologies
+ Sharon Simon
+ sharons&aviftech.com
+47148
+ Winston Brands Inc.
+ Wilson Caetano
+ wcaetano&winstonbrands.com
+47149
+ Adaptrum Inc.
+ Shufen Zhang
+ shufen&adaptrum.com
+47150
+ Virginia Cancer Institute
+ Shonda Clements
+ sclements&vacancer.com
+47151
+ CoinBau GmbH
+ Dr. Markus Winter
+ winter&coinbau.com
+47152
+ Dovecot Oy
+ Ville Savolainen
+ ville.savolainen&dovecot.fi
+47153
+ Brunke electronic
+ Marc Brunke
+ pen.iana&optocore.org
+47154
+ Stabilitas
+ Stephen Riley
+ stephen&stabilitas.io
+47155
+ VINTEGRIS SL
+ Marisa Herranz
+ marisa.herranz&vintegris.com
+47156
+ Haus Michael auf Draht e.V.
+ Malte Horstmann
+ mad&rub.de
+47157
+ Boston Scientific Corporation
+ Craig Johnson
+ Craig.Johnson&bsci.com
+47158
+ Clipcomm Inc.
+ Kim Eunsoo
+ eskim&clipcomm.co.kr
+47159
+ Jevons Global Pty Ltd
+ Kingsley Jones
+ Info&jevonsglobal.com
+47160
+ Centorrino Technologies
+ Nicholas Iacobucci
+ niacobucci&ct.com.au
+47161
+ Stuttgarter Haus- und Grundbesitzerverein e. V.
+ Daniel Niccoli
+ d.niccoli&hausundgrund-stuttgart.de
+47162
+ Ote SA (Hellenic Telecommunications Organisation)
+ George Patikis
+ gpatikis&ote.gr
+47163
+ Banka Koper d.d.
+ Damjan Janezic
+ damjan.janezic&banka-koper.si
+47164
+ Ciudad del Motor de Aragon, SA
+ Jose Miguel Arilla Navarro
+ jmarilla&motorlandaragon.com
+47165
+ Self Esteem Brands
+ Matthew Warrick
+ matt&sebrands.com
+47166
+ Digital Insyte, LLC
+ Lewey Taylor
+ lewey&digitalinsyte.com
+47167
+ AB LITGRID
+ Robertas Radžvilas
+ robertas.radzvilas&litgrid.eu
+47168
+ Guangzhou Yinxun Comm. Tech. Co., LTD
+ Hengxuan Liu
+ market&gzyinxun.com
+47169
+ JSS Technologies, LLC
+ Jared Szechy
+ jared&jsstechllc.com
End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index 801a981429..692b88599c 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -13490,7 +13490,7 @@ const value_string sminmpec_values[] = {
{ 13467, "Medasys" },
{ 13468, "Montclair State University" },
{ 13469, "netLibrary, Inc." },
- { 13470, "Otto Security & Software Technologie GmbH" },
+ { 13470, "SecureGUARD GmbH (formerly 'Otto Security & Software Technologie GmbH')" },
{ 13471, "PowerWAN, Inc" },
{ 13472, "RTS Realtimes Systems (Deutschland) AG" },
{ 13473, "SafeWeb, Inc." },
@@ -47152,6 +47152,44 @@ const value_string sminmpec_values[] = {
{ 47129, "SECURA Insurance Companies" },
{ 47130, "Al Yah Satellite Communication Company PJSC (Yahsat)" },
{ 47131, "ViktorBalogh" },
+ { 47132, "Thinking Automation, Inc." },
+ { 47133, "Research Capital Group, Inc." },
+ { 47134, "FROG CELLSAT LIMITED" },
+ { 47135, "MotionLED Technology Ltd. " },
+ { 47136, "4S Information Technologies" },
+ { 47137, "Andre Grosse Bley" },
+ { 47138, "Noble 3D Printers, LLC" },
+ { 47139, "MaTelSo GmbH" },
+ { 47140, "DSG Systems AS" },
+ { 47141, "PT. WIRAKY NUSA TELEKOMUNIKASI" },
+ { 47142, "CoralTree Systems" },
+ { 47143, "iSnapp" },
+ { 47144, "CommerceHub" },
+ { 47145, "Telonic Berkeley Inc" },
+ { 47146, "ENDERCODING" },
+ { 47147, "Avionics Interface Technologies" },
+ { 47148, "Winston Brands Inc." },
+ { 47149, "Adaptrum Inc." },
+ { 47150, "Virginia Cancer Institute" },
+ { 47151, "CoinBau GmbH" },
+ { 47152, "Dovecot Oy" },
+ { 47153, "Brunke electronic" },
+ { 47154, "Stabilitas" },
+ { 47155, "VINTEGRIS SL" },
+ { 47156, "Haus Michael auf Draht e.V." },
+ { 47157, "Boston Scientific Corporation" },
+ { 47158, "Clipcomm Inc." },
+ { 47159, "Jevons Global Pty Ltd" },
+ { 47160, "Centorrino Technologies" },
+ { 47161, "Stuttgarter Haus- und Grundbesitzerverein e. V." },
+ { 47162, "Ote SA (Hellenic Telecommunications Organisation)" },
+ { 47163, "Banka Koper d.d." },
+ { 47164, "Ciudad del Motor de Aragon, SA" },
+ { 47165, "Self Esteem Brands" },
+ { 47166, "Digital Insyte, LLC" },
+ { 47167, "AB LITGRID" },
+ { 47168, "Guangzhou Yinxun Comm. Tech. Co., LTD" },
+ { 47169, "JSS Technologies, LLC" },
{ 0, NULL}
};
diff --git a/services b/services
index 7e33d46772..03ff960582 100644
--- a/services
+++ b/services
@@ -10086,7 +10086,7 @@ fmtp 8500/udp # Flight Message Transfer Protocol [Eivan_Cerasi] [Eiv
cmtp-mgt 8501/tcp # CYTEL Message Transfer Management
cmtp-av 8501/udp # CYTEL Message Transfer Audio and Video [Frank_Jakel] [Frank_Jakel] 2011-04-29
ftnmtp 8502/tcp # FTN Message Transfer Protocol [Yuri_Myakotin] [Yuri_Myakotin] 2014-01-07
-lsp-self-ping 8503/udp # MPLS LSP Self-Ping [IESG] [IETF_Chair] 2015-06-11 2015-11-03 [RFC-ietf-mpls-self-ping-06]
+lsp-self-ping 8503/udp # MPLS LSP Self-Ping [IESG] [IETF_Chair] 2015-06-11 2016-02-01 [RFC7746]
rtsp-alt 8554/tcp # RTSP Alternate (see port 554) [Stephen_Casner_2] [Stephen_Casner_2]
rtsp-alt 8554/udp # RTSP Alternate (see port 554) [Stephen_Casner_2] [Stephen_Casner_2]
d-fence 8555/tcp # SYMAX D-FENCE [Thomas_Geisel] [Thomas_Geisel] 2003-01
diff --git a/ui/qt/wireshark_de.qm b/ui/qt/wireshark_de.qm
index d86b0f0aff..f9bd910d81 100644
--- a/ui/qt/wireshark_de.qm
+++ b/ui/qt/wireshark_de.qm
Binary files differ
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index be2014f50c..5ee1474eed 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -1021,28 +1021,28 @@
<message>
<location filename="capture_filter_edit.cpp" line="358"/>
<source>Save this filter</source>
- <translation type="unfinished">Disen Filter speichern</translation>
+ <translation>Diesen Filter speichern</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="360"/>
<source>Remove this filter</source>
- <translation type="unfinished">Diesen Filter entfernen</translation>
+ <translation>Diesen Filter entfernen</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="362"/>
<source>Manage Capture Filters</source>
- <translation type="unfinished"></translation>
+ <translation>Mitschnittfilter verwalten</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="498"/>
<source>Unable to save capture filter settings.</source>
- <translation type="unfinished">Einstellungen für die Mitschnittfilter konnten nicht gespeichert werden.</translation>
+ <translation>Mitschnittfiltereinstellungen können nicht gespeichert werden.</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="499"/>
<source>Could not save to your capture filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished">Ihre Mitschnittfilterdatei konnte nicht gespeichert werden
+ <translation>Mitschnittfilterdatei kann nicht gespeichert werden
&quot;%1&quot;: %2.</translation>
</message>
</context>
@@ -1210,7 +1210,7 @@
<location filename="capture_interfaces_dialog.ui" line="128"/>
<source>Capture filter for selected interfaces:</source>
<oldsource>Capture Filter for selected Interfaces:</oldsource>
- <translation type="unfinished">Mitschnitt Filter für ausgewählte Interfaces:</translation>
+ <translation>Mitschnittfilter für das ausgewählte Interface:</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="158"/>
@@ -1902,13 +1902,13 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<message>
<location filename="display_filter_edit.cpp" line="572"/>
<source>Unable to save display filter settings.</source>
- <translation type="unfinished">Einstellungen für die Anzeigenfilter konnten nicht gespeichert werden.</translation>
+ <translation>Anzeigefiltereinstellungen können nicht gespeichert werden.</translation>
</message>
<message>
<location filename="display_filter_edit.cpp" line="573"/>
<source>Could not save to your display filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished">Ihre Anzeigefilterdatei konnte nicht gespeichert werden
+ <translation>Anzeigefilterdatei kann nicht gespeichert werden
&quot;%1&quot;: %2.</translation>
</message>
<message>
@@ -2018,12 +2018,12 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<translation>Anzeigefilterausdruck</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="187"/>
+ <location filename="display_filter_expression_dialog.cpp" line="188"/>
<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="191"/>
+ <location filename="display_filter_expression_dialog.cpp" line="192"/>
<source>Click OK to insert this filter</source>
<translation>Zum Einfügen dieses Filter OK klicken</translation>
</message>
@@ -2437,12 +2437,12 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<context>
<name>ExtcapArgumentFileSelection</name>
<message>
- <location filename="extcap_argument_file.cpp" line="101"/>
+ <location filename="extcap_argument_file.cpp" line="110"/>
<source>Any File (*.*)</source>
<translation>Alle Dateien (*.*)</translation>
</message>
<message>
- <location filename="extcap_argument_file.cpp" line="110"/>
+ <location filename="extcap_argument_file.cpp" line="119"/>
<source>Open File</source>
<translation>Öffne Datei</translation>
</message>
@@ -2450,16 +2450,21 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<context>
<name>ExtcapOptionsDialog</name>
<message>
- <location filename="extcap_options_dialog.cpp" line="69"/>
- <location filename="extcap_options_dialog.cpp" line="102"/>
+ <location filename="extcap_options_dialog.cpp" line="74"/>
+ <location filename="extcap_options_dialog.cpp" line="108"/>
<source>Extcap Interface Options</source>
<translation>Extcap Interface Optionen</translation>
</message>
<message>
- <location filename="extcap_options_dialog.cpp" line="72"/>
+ <location filename="extcap_options_dialog.cpp" line="78"/>
<source>Start</source>
<translation>Start</translation>
</message>
+ <message>
+ <location filename="extcap_options_dialog.ui" line="33"/>
+ <source>Save parameter on capture start</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>FileSetDialog</name>
@@ -2678,7 +2683,7 @@ für die Filterdateien kann nicht erstellt werden:
<location filename="follow_stream_dialog.cpp" line="116"/>
<source>Filter Out This Stream</source>
<oldsource>Hide this stream</oldsource>
- <translation type="unfinished">Diesen Stream verstecken</translation>
+ <translation>Diesen Stream filtern</translation>
</message>
<message>
<location filename="follow_stream_dialog.cpp" line="119"/>
@@ -9146,7 +9151,7 @@ text-decoration: underline;
<location filename="main_window.cpp" line="1124"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
- <translation type="unfinished">vor dem Importieren eines neuen Mitschnitts</translation>
+ <translation>vor dem Importieren einer Aufzeichnung</translation>
</message>
<message>
<location filename="main_window.cpp" line="1437"/>
@@ -9165,26 +9170,10 @@ text-decoration: underline;
<translation>.</translation>
</message>
<message>
- <source>You have unsaved packets</source>
- <translation type="vanished">Sie haben nicht gespeicherte Pakete</translation>
- </message>
- <message>
- <source>They will be lost if you don&apos;t save them.</source>
- <translation type="vanished">Diese gehen verloren wenn sie nicht gespeichert werden.</translation>
- </message>
- <message>
- <source>Do you want to stop the capture and save the captured packets</source>
- <translation type="vanished">Soll der Mitschnitt gestoppt werden und die aufgezeichneten Pakete gespeichert werden</translation>
- </message>
- <message>
<location filename="main_window.cpp" line="1597"/>
<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">Sollen die aufgezeichneten Pakete gespeichert werden</translation>
- </message>
- <message>
- <source>?</source>
- <translation type="vanished">?</translation>
+ <translation>Wollen Sie die durchgeführten Änderungen speichern%1?</translation>
</message>
<message>
<location filename="main_window.cpp" line="1593"/>
@@ -9206,12 +9195,12 @@ text-decoration: underline;
<message>
<location filename="main_window.cpp" line="1592"/>
<source>Do you want to stop the capture and save the captured packets%1?</source>
- <translation type="unfinished"></translation>
+ <translation>Wollen Sie die Aufzeichnung stoppen und die aufgezeichneten Pakete speichern%1?</translation>
</message>
<message>
<location filename="main_window.cpp" line="1600"/>
<source>Do you want to save the captured packets%1?</source>
- <translation type="unfinished"></translation>
+ <translation>Wollen Sie die aufgezeichneten Pakete speichern%1?</translation>
</message>
<message>
<location filename="main_window.cpp" line="1624"/>
@@ -9262,7 +9251,7 @@ text-decoration: underline;
<message>
<location filename="main_window_slots.cpp" line="205"/>
<source> before opening another file</source>
- <translation type="unfinished"></translation>
+ <translation>vor dem Öffnen einer anderen Datei</translation>
</message>
<message>
<location filename="main_window_slots.cpp" line="692"/>
@@ -9297,7 +9286,7 @@ text-decoration: underline;
<message>
<location filename="main_window_slots.cpp" line="1655"/>
<source> before closing the file</source>
- <translation type="unfinished"></translation>
+ <translation>vor dem Schließen der Datei</translation>
</message>
<message>
<location filename="main_window_slots.cpp" line="1732"/>
@@ -9335,58 +9324,54 @@ text-decoration: underline;
<translation>Text konnte nicht kopiert werden. Probieren sie einen anderen Eintrag.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2348"/>
- <location filename="main_window_slots.cpp" line="3422"/>
+ <location filename="main_window_slots.cpp" line="2350"/>
+ <location filename="main_window_slots.cpp" line="3424"/>
<source>Unable to build conversation filter.</source>
<translation>Verbindungsfilter kann nicht erstellt werden.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2485"/>
- <location filename="main_window_slots.cpp" line="2498"/>
+ <location filename="main_window_slots.cpp" line="2487"/>
+ <location filename="main_window_slots.cpp" line="2500"/>
<source> before reloading the file</source>
- <translation type="unfinished"></translation>
+ <translation>vor dem Neuladen der Datei</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2532"/>
+ <location filename="main_window_slots.cpp" line="2534"/>
<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="3429"/>
+ <location filename="main_window_slots.cpp" line="3431"/>
<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="3438"/>
+ <location filename="main_window_slots.cpp" line="3440"/>
<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="3515"/>
+ <location filename="main_window_slots.cpp" line="3517"/>
<source>No Interface Selected</source>
<translation>Kein Interface ausgewählt</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3522"/>
+ <location filename="main_window_slots.cpp" line="3524"/>
<source> before starting a new capture</source>
<translation>vor dem Starten einer neuen Aufzeichnung</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3540"/>
+ <location filename="main_window_slots.cpp" line="3542"/>
<source> before restarting the capture</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source> before restarting a new capture</source>
- <translation type="vanished">vor dem Starten einer neuen Aufzeichnung</translation>
+ <translation>vor dem Neustart der Aufzeichnung</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3723"/>
+ <location filename="main_window_slots.cpp" line="3725"/>
<source>Wiki Page for %1</source>
<translation>Wikiseite für &amp;1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3724"/>
+ <location filename="main_window_slots.cpp" line="3726"/>
<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 geheni?&lt;/p&gt;</translation>
</message>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index fb569b155e..979a7adb8b 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -2007,12 +2007,12 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="187"/>
+ <location filename="display_filter_expression_dialog.cpp" line="188"/>
<source>Select a field name to get started</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="191"/>
+ <location filename="display_filter_expression_dialog.cpp" line="192"/>
<source>Click OK to insert this filter</source>
<translation type="unfinished"></translation>
</message>
@@ -2426,12 +2426,12 @@ PLEASE NOTE: One option MUST be selected.</source>
<context>
<name>ExtcapArgumentFileSelection</name>
<message>
- <location filename="extcap_argument_file.cpp" line="101"/>
+ <location filename="extcap_argument_file.cpp" line="110"/>
<source>Any File (*.*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="extcap_argument_file.cpp" line="110"/>
+ <location filename="extcap_argument_file.cpp" line="119"/>
<source>Open File</source>
<translation type="unfinished"></translation>
</message>
@@ -2439,16 +2439,21 @@ PLEASE NOTE: One option MUST be selected.</source>
<context>
<name>ExtcapOptionsDialog</name>
<message>
- <location filename="extcap_options_dialog.cpp" line="69"/>
- <location filename="extcap_options_dialog.cpp" line="102"/>
+ <location filename="extcap_options_dialog.cpp" line="74"/>
+ <location filename="extcap_options_dialog.cpp" line="108"/>
<source>Extcap Interface Options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="extcap_options_dialog.cpp" line="72"/>
+ <location filename="extcap_options_dialog.cpp" line="78"/>
<source>Start</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="extcap_options_dialog.ui" line="33"/>
+ <source>Save parameter on capture start</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>FileSetDialog</name>
@@ -9199,54 +9204,54 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2348"/>
- <location filename="main_window_slots.cpp" line="3422"/>
+ <location filename="main_window_slots.cpp" line="2350"/>
+ <location filename="main_window_slots.cpp" line="3424"/>
<source>Unable to build conversation filter.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2485"/>
- <location filename="main_window_slots.cpp" line="2498"/>
+ <location filename="main_window_slots.cpp" line="2487"/>
+ <location filename="main_window_slots.cpp" line="2500"/>
<source> before reloading the file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2532"/>
+ <location filename="main_window_slots.cpp" line="2534"/>
<source>No filter available. Try another </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3429"/>
+ <location filename="main_window_slots.cpp" line="3431"/>
<source>Error compiling filter for this conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3438"/>
+ <location filename="main_window_slots.cpp" line="3440"/>
<source>No previous/next packet in conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3515"/>
+ <location filename="main_window_slots.cpp" line="3517"/>
<source>No Interface Selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3522"/>
+ <location filename="main_window_slots.cpp" line="3524"/>
<source> before starting a new capture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3540"/>
+ <location filename="main_window_slots.cpp" line="3542"/>
<source> before restarting the capture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3723"/>
+ <location filename="main_window_slots.cpp" line="3725"/>
<source>Wiki Page for %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3724"/>
+ <location filename="main_window_slots.cpp" line="3726"/>
<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.qm b/ui/qt/wireshark_fr.qm
index ff15305bd5..4924187cb6 100644
--- a/ui/qt/wireshark_fr.qm
+++ b/ui/qt/wireshark_fr.qm
Binary files differ
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 649bff00cd..fea0b84d1d 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -1210,7 +1210,7 @@
<location filename="capture_interfaces_dialog.ui" line="128"/>
<source>Capture filter for selected interfaces:</source>
<oldsource>Capture Filter for selected Interfaces:</oldsource>
- <translation type="unfinished">Filtre de capture pour les interfaces sélectionnées :</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="158"/>
@@ -1873,7 +1873,7 @@ si vous voulez utiliser des fichiers multiples.</translation>
<message>
<location filename="display_filter_edit.cpp" line="218"/>
<source>Apply a read filter %1</source>
- <translation type="unfinished"></translation>
+ <translation>Appliquer un filtre de lecture %1</translation>
</message>
<message>
<location filename="display_filter_edit.cpp" line="128"/>
@@ -1903,15 +1903,14 @@ si vous voulez utiliser des fichiers multiples.</translation>
<message>
<location filename="display_filter_edit.cpp" line="572"/>
<source>Unable to save display filter settings.</source>
- <translation type="unfinished">Impossible d&apos;enregistrer les paramètres de filtre d&apos;affichage.</translation>
+ <translation>Impossible d&apos;enregistrer les paramètres de filtre d&apos;affichage.</translation>
</message>
<message>
<location filename="display_filter_edit.cpp" line="573"/>
<source>Could not save to your display filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished">Ne peut enregistrer votre fichier de filtre d&apos;affichage
-&quot;%1&quot;: %2.
-</translation>
+ <translation>Impossible de sauvegarder dans votre dossier de filtre d&apos;affichage
+&quot;%1&quot;: %2.</translation>
</message>
<message>
<location filename="display_filter_edit.cpp" line="389"/>
@@ -2020,12 +2019,12 @@ si vous voulez utiliser des fichiers multiples.</translation>
<translation>Affiche Expression de Filtre</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="187"/>
+ <location filename="display_filter_expression_dialog.cpp" line="188"/>
<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="191"/>
+ <location filename="display_filter_expression_dialog.cpp" line="192"/>
<source>Click OK to insert this filter</source>
<translation>Cliquer OK pour insérer ce filtre</translation>
</message>
@@ -2439,12 +2438,12 @@ si vous voulez utiliser des fichiers multiples.</translation>
<context>
<name>ExtcapArgumentFileSelection</name>
<message>
- <location filename="extcap_argument_file.cpp" line="101"/>
+ <location filename="extcap_argument_file.cpp" line="110"/>
<source>Any File (*.*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="extcap_argument_file.cpp" line="110"/>
+ <location filename="extcap_argument_file.cpp" line="119"/>
<source>Open File</source>
<translation>Ouvrir un fichier</translation>
</message>
@@ -2452,16 +2451,21 @@ si vous voulez utiliser des fichiers multiples.</translation>
<context>
<name>ExtcapOptionsDialog</name>
<message>
- <location filename="extcap_options_dialog.cpp" line="69"/>
- <location filename="extcap_options_dialog.cpp" line="102"/>
+ <location filename="extcap_options_dialog.cpp" line="74"/>
+ <location filename="extcap_options_dialog.cpp" line="108"/>
<source>Extcap Interface Options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="extcap_options_dialog.cpp" line="72"/>
+ <location filename="extcap_options_dialog.cpp" line="78"/>
<source>Start</source>
<translation>Démarrer</translation>
</message>
+ <message>
+ <location filename="extcap_options_dialog.ui" line="33"/>
+ <source>Save parameter on capture start</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>FileSetDialog</name>
@@ -2671,7 +2675,7 @@ pour fichiers de filtre : %2.</translation>
<message>
<location filename="filter_expressions_preferences_frame.ui" line="60"/>
<source>Copy this filter.</source>
- <translation type="unfinished">Copier ce filtre.</translation>
+ <translation>Copier ce filtre.</translation>
</message>
</context>
<context>
@@ -2680,7 +2684,7 @@ pour fichiers de filtre : %2.</translation>
<location filename="follow_stream_dialog.cpp" line="116"/>
<source>Filter Out This Stream</source>
<oldsource>Hide this stream</oldsource>
- <translation type="unfinished">Cacher ce flux</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="follow_stream_dialog.cpp" line="119"/>
@@ -7206,7 +7210,7 @@ a:hover {
<message>
<location filename="main_window.ui" line="725"/>
<source>Wireless Toolbar</source>
- <translation type="unfinished"></translation>
+ <translation>Barre d&apos;outils Wireless</translation>
</message>
<message>
<location filename="main_window.ui" line="817"/>
@@ -7407,7 +7411,7 @@ a:hover {
<location filename="main_window.ui" line="1460"/>
<source>Ctrl+Alt+M</source>
<oldsource>Meta+Alt+M</oldsource>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+Alt+M</translation>
</message>
<message>
<location filename="main_window.ui" line="1465"/>
@@ -7423,7 +7427,7 @@ a:hover {
<location filename="main_window.ui" line="1471"/>
<source>Ctrl+Shift+N</source>
<oldsource>Meta+Shift+N</oldsource>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+Maj+N</translation>
</message>
<message>
<location filename="main_window.ui" line="1476"/>
@@ -7439,7 +7443,7 @@ a:hover {
<location filename="main_window.ui" line="1482"/>
<source>Ctrl+Shift+B</source>
<oldsource>Meta+Shift+B</oldsource>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+Maj+B</translation>
</message>
<message>
<location filename="main_window.ui" line="1487"/>
@@ -7594,7 +7598,7 @@ a:hover {
<message>
<location filename="main_window.ui" line="1631"/>
<source>&amp;Protocol Hierarchy</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Hiérarchie des Protocoles</translation>
</message>
<message>
<location filename="main_window.ui" line="1634"/>
@@ -7830,7 +7834,7 @@ a:hover {
<message>
<location filename="main_window.ui" line="1851"/>
<source>Sametime</source>
- <translation type="unfinished"></translation>
+ <translation>Sametime</translation>
</message>
<message>
<location filename="main_window.ui" line="1854"/>
@@ -7895,18 +7899,18 @@ a:hover {
<message>
<location filename="main_window.ui" line="1915"/>
<source>Advertisements by Topic</source>
- <translation type="unfinished"></translation>
+ <translation>Annonces par Sujet</translation>
</message>
<message>
<location filename="main_window.ui" line="1920"/>
<location filename="main_window.ui" line="1955"/>
<source>Advertisements by Source</source>
- <translation type="unfinished"></translation>
+ <translation>Annonces par Source</translation>
</message>
<message>
<location filename="main_window.ui" line="1925"/>
<source>Advertisements by Transport</source>
- <translation type="unfinished"></translation>
+ <translation>Annonces par Transport</translation>
</message>
<message>
<location filename="main_window.ui" line="1930"/>
@@ -8204,7 +8208,7 @@ a:hover {
<message>
<location filename="main_window.ui" line="1224"/>
<source>&amp;DICOM…</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;DICOM…</translation>
</message>
<message>
<location filename="main_window.ui" line="1229"/>
@@ -8337,7 +8341,7 @@ a:hover {
<message>
<location filename="main_window.ui" line="1998"/>
<source>Export PDUs to File…</source>
- <translation type="unfinished"></translation>
+ <translation>Exporter PDU vers un Fichier...</translation>
</message>
<message>
<location filename="main_window.ui" line="2003"/>
@@ -8362,7 +8366,7 @@ a:hover {
<message>
<location filename="main_window.ui" line="2031"/>
<source>&amp;Filter Toolbar</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Barre d&apos;outils Filtre</translation>
</message>
<message>
<location filename="main_window.ui" line="2034"/>
@@ -9119,7 +9123,7 @@ a:hover {
<location filename="main_window.cpp" line="1124"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
- <translation type="unfinished"> avant l&apos;import d&apos;une nouvelle capture</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="main_window.cpp" line="1437"/>
@@ -9138,27 +9142,10 @@ a:hover {
<translation>.</translation>
</message>
<message>
- <source>You have unsaved packets</source>
- <translation type="vanished">Vous avez des paquets non sauvegardés</translation>
- </message>
- <message>
- <source>They will be lost if you don&apos;t save them.</source>
- <translation type="vanished">Ils seront perdues si vous ne les enregistrez pas.</translation>
- </message>
- <message>
- <source>Do you want to stop the capture and save the captured packets</source>
- <translation type="vanished">
-Voulez-vous arrêter la capture et enregistrer les paquets capturés</translation>
- </message>
- <message>
<location filename="main_window.cpp" line="1597"/>
<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">Voulez-vous enregistrer les paquets capturés</translation>
- </message>
- <message>
- <source>?</source>
- <translation type="vanished">?</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="main_window.cpp" line="1593"/>
@@ -9309,54 +9296,54 @@ Voulez-vous arrêter la capture et enregistrer les paquets capturés</translatio
<translation>Impossible de copier le texte. Essayer un autre item.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2348"/>
- <location filename="main_window_slots.cpp" line="3422"/>
+ <location filename="main_window_slots.cpp" line="2350"/>
+ <location filename="main_window_slots.cpp" line="3424"/>
<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="2485"/>
- <location filename="main_window_slots.cpp" line="2498"/>
+ <location filename="main_window_slots.cpp" line="2487"/>
+ <location filename="main_window_slots.cpp" line="2500"/>
<source> before reloading the file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2532"/>
+ <location filename="main_window_slots.cpp" line="2534"/>
<source>No filter available. Try another </source>
<translation>Aucun filtre disponible. Essayer un autre</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3429"/>
+ <location filename="main_window_slots.cpp" line="3431"/>
<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="3438"/>
+ <location filename="main_window_slots.cpp" line="3440"/>
<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="3515"/>
+ <location filename="main_window_slots.cpp" line="3517"/>
<source>No Interface Selected</source>
<translation>Aucune Interface Sélectionnée</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3522"/>
+ <location filename="main_window_slots.cpp" line="3524"/>
<source> before starting a new capture</source>
<translation>avant de commencer une nouvelle capture</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3540"/>
+ <location filename="main_window_slots.cpp" line="3542"/>
<source> before restarting the capture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3723"/>
+ <location filename="main_window_slots.cpp" line="3725"/>
<source>Wiki Page for %1</source>
<translation>Page Wiki pour %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3724"/>
+ <location filename="main_window_slots.cpp" line="3726"/>
<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.qm b/ui/qt/wireshark_it.qm
index 4ebdc2a117..bfff3933d6 100644
--- a/ui/qt/wireshark_it.qm
+++ b/ui/qt/wireshark_it.qm
Binary files differ
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index de54771fd6..df5494b816 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -1021,28 +1021,28 @@
<message>
<location filename="capture_filter_edit.cpp" line="358"/>
<source>Save this filter</source>
- <translation type="unfinished">Salva questo filtro</translation>
+ <translation>Salva questo filtro</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="360"/>
<source>Remove this filter</source>
- <translation type="unfinished">Rimuovi questo filtro</translation>
+ <translation>Rimuovi questo filtro</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="362"/>
<source>Manage Capture Filters</source>
- <translation type="unfinished"></translation>
+ <translation>Gestisci fltri di cattura</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="498"/>
<source>Unable to save capture filter settings.</source>
- <translation type="unfinished">Impossibile salvare le impostazioni del filtro di cattura.</translation>
+ <translation>Impossibile salvare le impostazioni del filtro di cattura.</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="499"/>
<source>Could not save to your capture filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished">Impossibile salvare il file del filtro di cattura
+ <translation>Impossibile salvare il file del filtro di cattura
&quot;%1&quot;: %2.</translation>
</message>
</context>
@@ -1210,7 +1210,7 @@
<location filename="capture_interfaces_dialog.ui" line="128"/>
<source>Capture filter for selected interfaces:</source>
<oldsource>Capture Filter for selected Interfaces:</oldsource>
- <translation type="unfinished">File di cattura per le interfacce selezionate:</translation>
+ <translation>Filtro di cattura per le interfacce selezionate:</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="158"/>
@@ -1902,13 +1902,13 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<message>
<location filename="display_filter_edit.cpp" line="572"/>
<source>Unable to save display filter settings.</source>
- <translation type="unfinished">Impossibile salvare le impostazioni del filtro di visualizzazione.</translation>
+ <translation>Impossibile salvare le impostazioni del filtro di visualizzazione.</translation>
</message>
<message>
<location filename="display_filter_edit.cpp" line="573"/>
<source>Could not save to your display filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished">Impossibile salvare il file del filtro di visualizzazione
+ <translation>Impossibile salvare il file del filtro di visualizzazione
&quot;%1&quot;: %2.</translation>
</message>
<message>
@@ -2018,12 +2018,12 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<translation>Espressione del filtro di visualizzazione</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="187"/>
+ <location filename="display_filter_expression_dialog.cpp" line="188"/>
<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="191"/>
+ <location filename="display_filter_expression_dialog.cpp" line="192"/>
<source>Click OK to insert this filter</source>
<translation>Fai clic su OK per inserire questo filtro</translation>
</message>
@@ -2437,12 +2437,12 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<context>
<name>ExtcapArgumentFileSelection</name>
<message>
- <location filename="extcap_argument_file.cpp" line="101"/>
+ <location filename="extcap_argument_file.cpp" line="110"/>
<source>Any File (*.*)</source>
<translation>Tutti i file (*.*)</translation>
</message>
<message>
- <location filename="extcap_argument_file.cpp" line="110"/>
+ <location filename="extcap_argument_file.cpp" line="119"/>
<source>Open File</source>
<translation>Apri file</translation>
</message>
@@ -2450,16 +2450,21 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<context>
<name>ExtcapOptionsDialog</name>
<message>
- <location filename="extcap_options_dialog.cpp" line="69"/>
- <location filename="extcap_options_dialog.cpp" line="102"/>
+ <location filename="extcap_options_dialog.cpp" line="74"/>
+ <location filename="extcap_options_dialog.cpp" line="108"/>
<source>Extcap Interface Options</source>
<translation>Opzioni interfaccia Extcap</translation>
</message>
<message>
- <location filename="extcap_options_dialog.cpp" line="72"/>
+ <location filename="extcap_options_dialog.cpp" line="78"/>
<source>Start</source>
<translation>Avvia</translation>
</message>
+ <message>
+ <location filename="extcap_options_dialog.ui" line="33"/>
+ <source>Save parameter on capture start</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>FileSetDialog</name>
@@ -2677,7 +2682,7 @@ per i file di filtro: %2.</translation>
<location filename="follow_stream_dialog.cpp" line="116"/>
<source>Filter Out This Stream</source>
<oldsource>Hide this stream</oldsource>
- <translation type="unfinished">Nascondi questo flusso</translation>
+ <translation>Filtra questo flusso</translation>
</message>
<message>
<location filename="follow_stream_dialog.cpp" line="119"/>
@@ -9144,7 +9149,7 @@ a:hover {
<location filename="main_window.cpp" line="1124"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
- <translation type="unfinished">prima di importare una nuova cattura</translation>
+ <translation>prima di importare una cattura</translation>
</message>
<message>
<location filename="main_window.cpp" line="1437"/>
@@ -9163,26 +9168,10 @@ a:hover {
<translation>.</translation>
</message>
<message>
- <source>You have unsaved packets</source>
- <translation type="vanished">Ci sono pacchetti non salvati</translation>
- </message>
- <message>
- <source>They will be lost if you don&apos;t save them.</source>
- <translation type="vanished">Saranno persi se non li salvi.</translation>
- </message>
- <message>
- <source>Do you want to stop the capture and save the captured packets</source>
- <translation type="vanished">Vuoi interrompere la cattura e salvare i pacchetti catturati</translation>
- </message>
- <message>
<location filename="main_window.cpp" line="1597"/>
<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">Vuoi salvare i pacchetti catturati </translation>
- </message>
- <message>
- <source>?</source>
- <translation type="vanished">?</translation>
+ <translation>Vuoi salvare le modifiche che hai apportato%1?</translation>
</message>
<message>
<location filename="main_window.cpp" line="1593"/>
@@ -9204,12 +9193,12 @@ a:hover {
<message>
<location filename="main_window.cpp" line="1592"/>
<source>Do you want to stop the capture and save the captured packets%1?</source>
- <translation type="unfinished"></translation>
+ <translation>Vuoi interrompere la cattura e salvare i pacchetti catturati%1?</translation>
</message>
<message>
<location filename="main_window.cpp" line="1600"/>
<source>Do you want to save the captured packets%1?</source>
- <translation type="unfinished"></translation>
+ <translation>Vuoi salvare i pacchetti catturati%1?</translation>
</message>
<message>
<location filename="main_window.cpp" line="1624"/>
@@ -9260,7 +9249,7 @@ a:hover {
<message>
<location filename="main_window_slots.cpp" line="205"/>
<source> before opening another file</source>
- <translation type="unfinished"></translation>
+ <translation>errore durante l&apos;apertura di un altro file</translation>
</message>
<message>
<location filename="main_window_slots.cpp" line="692"/>
@@ -9295,7 +9284,7 @@ a:hover {
<message>
<location filename="main_window_slots.cpp" line="1655"/>
<source> before closing the file</source>
- <translation type="unfinished"></translation>
+ <translation>prima della chiusura del file</translation>
</message>
<message>
<location filename="main_window_slots.cpp" line="1732"/>
@@ -9333,58 +9322,54 @@ a:hover {
<translation>Non riesco a copiare il testo. Prova un&apos;altra voce.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2348"/>
- <location filename="main_window_slots.cpp" line="3422"/>
+ <location filename="main_window_slots.cpp" line="2350"/>
+ <location filename="main_window_slots.cpp" line="3424"/>
<source>Unable to build conversation filter.</source>
<translation>Impossibile creare il filtro di conversazione.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2485"/>
- <location filename="main_window_slots.cpp" line="2498"/>
+ <location filename="main_window_slots.cpp" line="2487"/>
+ <location filename="main_window_slots.cpp" line="2500"/>
<source> before reloading the file</source>
- <translation type="unfinished"></translation>
+ <translation>prima di ricaricare il file</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2532"/>
+ <location filename="main_window_slots.cpp" line="2534"/>
<source>No filter available. Try another </source>
<translation>Nessun filtro disponibile. Provane un altro </translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3429"/>
+ <location filename="main_window_slots.cpp" line="3431"/>
<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="3438"/>
+ <location filename="main_window_slots.cpp" line="3440"/>
<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="3515"/>
+ <location filename="main_window_slots.cpp" line="3517"/>
<source>No Interface Selected</source>
<translation>Nessuna interfaccia selezionata</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3522"/>
+ <location filename="main_window_slots.cpp" line="3524"/>
<source> before starting a new capture</source>
<translation>prima di iniziare una nuova cattura</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3540"/>
+ <location filename="main_window_slots.cpp" line="3542"/>
<source> before restarting the capture</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source> before restarting a new capture</source>
- <translation type="vanished">prima di riavviare una nuova cattura</translation>
+ <translation>prima di riavviare la cattura</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3723"/>
+ <location filename="main_window_slots.cpp" line="3725"/>
<source>Wiki Page for %1</source>
<translation>Pagina wiki per %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3724"/>
+ <location filename="main_window_slots.cpp" line="3726"/>
<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.qm b/ui/qt/wireshark_ja_JP.qm
index 534062373d..43b34fa397 100644
--- a/ui/qt/wireshark_ja_JP.qm
+++ b/ui/qt/wireshark_ja_JP.qm
Binary files differ
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index 11b9b94fa7..b8026db9bb 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -1207,7 +1207,7 @@
<location filename="capture_interfaces_dialog.ui" line="128"/>
<source>Capture filter for selected interfaces:</source>
<oldsource>Capture Filter for selected Interfaces:</oldsource>
- <translation type="unfinished">選択したインタフェースのキャプチャフィルタ</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="158"/>
@@ -2014,12 +2014,12 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>表示フィルタ式</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="187"/>
+ <location filename="display_filter_expression_dialog.cpp" line="188"/>
<source>Select a field name to get started</source>
<translation>開始するフィールド名を選択</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="191"/>
+ <location filename="display_filter_expression_dialog.cpp" line="192"/>
<source>Click OK to insert this filter</source>
<translation>OKをクリックしてこのフィルタを挿入</translation>
</message>
@@ -2433,12 +2433,12 @@ PLEASE NOTE: One option MUST be selected.</source>
<context>
<name>ExtcapArgumentFileSelection</name>
<message>
- <location filename="extcap_argument_file.cpp" line="101"/>
+ <location filename="extcap_argument_file.cpp" line="110"/>
<source>Any File (*.*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="extcap_argument_file.cpp" line="110"/>
+ <location filename="extcap_argument_file.cpp" line="119"/>
<source>Open File</source>
<translation>ファイルを開く</translation>
</message>
@@ -2446,16 +2446,21 @@ PLEASE NOTE: One option MUST be selected.</source>
<context>
<name>ExtcapOptionsDialog</name>
<message>
- <location filename="extcap_options_dialog.cpp" line="69"/>
- <location filename="extcap_options_dialog.cpp" line="102"/>
+ <location filename="extcap_options_dialog.cpp" line="74"/>
+ <location filename="extcap_options_dialog.cpp" line="108"/>
<source>Extcap Interface Options</source>
<translation>Extcapインタフェースオプション</translation>
</message>
<message>
- <location filename="extcap_options_dialog.cpp" line="72"/>
+ <location filename="extcap_options_dialog.cpp" line="78"/>
<source>Start</source>
<translation>開始</translation>
</message>
+ <message>
+ <location filename="extcap_options_dialog.ui" line="33"/>
+ <source>Save parameter on capture start</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>FileSetDialog</name>
@@ -2669,7 +2674,7 @@ for filter files: %2.</source>
<location filename="follow_stream_dialog.cpp" line="116"/>
<source>Filter Out This Stream</source>
<oldsource>Hide this stream</oldsource>
- <translation type="unfinished">このストリームを隠す</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="follow_stream_dialog.cpp" line="119"/>
@@ -9102,7 +9107,7 @@ a:hover {
<location filename="main_window.cpp" line="1124"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
- <translation type="unfinished">新しいキャプチャファイルのインポートする前</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="main_window.cpp" line="1437"/>
@@ -9121,26 +9126,10 @@ a:hover {
<translation>.</translation>
</message>
<message>
- <source>You have unsaved packets</source>
- <translation type="vanished">保存していないパケットがあります。</translation>
- </message>
- <message>
- <source>They will be lost if you don&apos;t save them.</source>
- <translation type="vanished">保存しない場合、これらは失われます。</translation>
- </message>
- <message>
- <source>Do you want to stop the capture and save the captured packets</source>
- <translation type="vanished">キャプチャは停止してキャプチャされたパケットを保存しますか</translation>
- </message>
- <message>
<location filename="main_window.cpp" line="1597"/>
<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>
- <source>?</source>
- <translation type="vanished">?</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="main_window.cpp" line="1593"/>
@@ -9291,54 +9280,54 @@ a:hover {
<translation>テキストコピーできません 別に試してください</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2348"/>
- <location filename="main_window_slots.cpp" line="3422"/>
+ <location filename="main_window_slots.cpp" line="2350"/>
+ <location filename="main_window_slots.cpp" line="3424"/>
<source>Unable to build conversation filter.</source>
<translation>会話フィルタを作成できません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2485"/>
- <location filename="main_window_slots.cpp" line="2498"/>
+ <location filename="main_window_slots.cpp" line="2487"/>
+ <location filename="main_window_slots.cpp" line="2500"/>
<source> before reloading the file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2532"/>
+ <location filename="main_window_slots.cpp" line="2534"/>
<source>No filter available. Try another </source>
<translation>フィルタが利用できません 別に試してください</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3429"/>
+ <location filename="main_window_slots.cpp" line="3431"/>
<source>Error compiling filter for this conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3438"/>
+ <location filename="main_window_slots.cpp" line="3440"/>
<source>No previous/next packet in conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3515"/>
+ <location filename="main_window_slots.cpp" line="3517"/>
<source>No Interface Selected</source>
<translation>インターフェースが選択されていません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3522"/>
+ <location filename="main_window_slots.cpp" line="3524"/>
<source> before starting a new capture</source>
<translation>新規キャプチャを開始する前に</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3540"/>
+ <location filename="main_window_slots.cpp" line="3542"/>
<source> before restarting the capture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3723"/>
+ <location filename="main_window_slots.cpp" line="3725"/>
<source>Wiki Page for %1</source>
<translation>%1 の Wikiページ</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3724"/>
+ <location filename="main_window_slots.cpp" line="3726"/>
<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.qm b/ui/qt/wireshark_pl.qm
index cf35f685b4..69f27204f6 100644
--- a/ui/qt/wireshark_pl.qm
+++ b/ui/qt/wireshark_pl.qm
Binary files differ
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index 9a06c20001..8085433867 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -1019,28 +1019,28 @@
<message>
<location filename="capture_filter_edit.cpp" line="358"/>
<source>Save this filter</source>
- <translation type="unfinished">Zapisz filtr</translation>
+ <translation>Zapisz filtr</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="360"/>
<source>Remove this filter</source>
- <translation type="unfinished">Usuń filtr</translation>
+ <translation>Usuń filtr</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="362"/>
<source>Manage Capture Filters</source>
- <translation type="unfinished"></translation>
+ <translation>Zarządzaj filtrami przechwytywania</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="498"/>
<source>Unable to save capture filter settings.</source>
- <translation type="unfinished">Nie można zapisać ustawień filtru przechwytywania.</translation>
+ <translation>Nie można zapisać ustawień filtru przechwytywania.</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="499"/>
<source>Could not save to your capture filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished">Nie można zapisać do pliku filtrów przechwytywania
+ <translation>Nie można zapisać do pliku filtrów przechwytywania
&quot;%1&quot;:%2.</translation>
</message>
</context>
@@ -1208,7 +1208,7 @@
<location filename="capture_interfaces_dialog.ui" line="128"/>
<source>Capture filter for selected interfaces:</source>
<oldsource>Capture Filter for selected Interfaces:</oldsource>
- <translation type="unfinished">Filtr przechwytywania dla wybranych interfejsów:</translation>
+ <translation>Filtr przechwytywania dla wybranych interfejsów:</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="158"/>
@@ -1901,13 +1901,13 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
<message>
<location filename="display_filter_edit.cpp" line="572"/>
<source>Unable to save display filter settings.</source>
- <translation type="unfinished">Nie można zapisać ustawień filtru wyświetlania.</translation>
+ <translation>Nie można zapisać ustawień filtru wyświetlania.</translation>
</message>
<message>
<location filename="display_filter_edit.cpp" line="573"/>
<source>Could not save to your display filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished">Nie można zapisać do pliku filtrów wyświetlania
+ <translation>Nie można zapisać do pliku filtrów wyświetlania
&quot;%1&quot;:%2.</translation>
</message>
<message>
@@ -2017,12 +2017,12 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
<translation>Wyrażenie filtru wyświetlania</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="187"/>
+ <location filename="display_filter_expression_dialog.cpp" line="188"/>
<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="191"/>
+ <location filename="display_filter_expression_dialog.cpp" line="192"/>
<source>Click OK to insert this filter</source>
<translation>Kliknij OK by dodać filtr</translation>
</message>
@@ -2436,12 +2436,12 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
<context>
<name>ExtcapArgumentFileSelection</name>
<message>
- <location filename="extcap_argument_file.cpp" line="101"/>
+ <location filename="extcap_argument_file.cpp" line="110"/>
<source>Any File (*.*)</source>
<translation>Wszystkie pliki (*.*)</translation>
</message>
<message>
- <location filename="extcap_argument_file.cpp" line="110"/>
+ <location filename="extcap_argument_file.cpp" line="119"/>
<source>Open File</source>
<translation>Otwórz plik</translation>
</message>
@@ -2449,16 +2449,21 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
<context>
<name>ExtcapOptionsDialog</name>
<message>
- <location filename="extcap_options_dialog.cpp" line="69"/>
- <location filename="extcap_options_dialog.cpp" line="102"/>
+ <location filename="extcap_options_dialog.cpp" line="74"/>
+ <location filename="extcap_options_dialog.cpp" line="108"/>
<source>Extcap Interface Options</source>
<translation>Opcje interfejsów Extcap</translation>
</message>
<message>
- <location filename="extcap_options_dialog.cpp" line="72"/>
+ <location filename="extcap_options_dialog.cpp" line="78"/>
<source>Start</source>
<translation>Start</translation>
</message>
+ <message>
+ <location filename="extcap_options_dialog.ui" line="33"/>
+ <source>Save parameter on capture start</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>FileSetDialog</name>
@@ -2676,7 +2681,7 @@ dla plików filtrów: %2.</translation>
<location filename="follow_stream_dialog.cpp" line="116"/>
<source>Filter Out This Stream</source>
<oldsource>Hide this stream</oldsource>
- <translation type="unfinished">Ukryj ten strumień</translation>
+ <translation>Odfiltruj ten strumień</translation>
</message>
<message>
<location filename="follow_stream_dialog.cpp" line="119"/>
@@ -9144,7 +9149,7 @@ text-decoration: underline;
<location filename="main_window.cpp" line="1124"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
- <translation type="unfinished">przed zaimportowaniem nowego pliku przechwytywania</translation>
+ <translation>przed zaimportowaniem nowego pliku przechwytywania</translation>
</message>
<message>
<location filename="main_window.cpp" line="1437"/>
@@ -9163,26 +9168,10 @@ text-decoration: underline;
<translation>.</translation>
</message>
<message>
- <source>You have unsaved packets</source>
- <translation type="vanished">Masz niezapisane pakiety</translation>
- </message>
- <message>
- <source>They will be lost if you don&apos;t save them.</source>
- <translation type="vanished">Będą utracone jeśli ich nie zapiszesz.</translation>
- </message>
- <message>
- <source>Do you want to stop the capture and save the captured packets</source>
- <translation type="vanished">Czy chcesz zatrzymać przechwytywanie i zapisać przechwycone pakiety</translation>
- </message>
- <message>
<location filename="main_window.cpp" line="1597"/>
<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">Czy chcesz zapisać przechwycone pakiety</translation>
- </message>
- <message>
- <source>?</source>
- <translation type="vanished">?</translation>
+ <translation>Czy chcesz zapisać zrobione zmiany %1?</translation>
</message>
<message>
<location filename="main_window.cpp" line="1593"/>
@@ -9204,12 +9193,12 @@ text-decoration: underline;
<message>
<location filename="main_window.cpp" line="1592"/>
<source>Do you want to stop the capture and save the captured packets%1?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy chcesz zatrzymać przechwytywanie i zapisać przechwycone pakiety%1?</translation>
</message>
<message>
<location filename="main_window.cpp" line="1600"/>
<source>Do you want to save the captured packets%1?</source>
- <translation type="unfinished"></translation>
+ <translation>Czy chcesz zapisać przechwycone pakiety%1?</translation>
</message>
<message>
<location filename="main_window.cpp" line="1624"/>
@@ -9260,7 +9249,7 @@ text-decoration: underline;
<message>
<location filename="main_window_slots.cpp" line="205"/>
<source> before opening another file</source>
- <translation type="unfinished"></translation>
+ <translation>przed otwarciem nowego pliku</translation>
</message>
<message>
<location filename="main_window_slots.cpp" line="692"/>
@@ -9295,7 +9284,7 @@ text-decoration: underline;
<message>
<location filename="main_window_slots.cpp" line="1655"/>
<source> before closing the file</source>
- <translation type="unfinished"></translation>
+ <translation>przed zapisaniem pliku</translation>
</message>
<message>
<location filename="main_window_slots.cpp" line="1732"/>
@@ -9333,58 +9322,54 @@ text-decoration: underline;
<translation>Nie można skopiować tekstu. Spróbuj inną pozycję.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2348"/>
- <location filename="main_window_slots.cpp" line="3422"/>
+ <location filename="main_window_slots.cpp" line="2350"/>
+ <location filename="main_window_slots.cpp" line="3424"/>
<source>Unable to build conversation filter.</source>
<translation>Nie można stworzyć filtru konwersacji.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2485"/>
- <location filename="main_window_slots.cpp" line="2498"/>
+ <location filename="main_window_slots.cpp" line="2487"/>
+ <location filename="main_window_slots.cpp" line="2500"/>
<source> before reloading the file</source>
- <translation type="unfinished"></translation>
+ <translation>przed przeładowaniem pliku</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2532"/>
+ <location filename="main_window_slots.cpp" line="2534"/>
<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="3429"/>
+ <location filename="main_window_slots.cpp" line="3431"/>
<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="3438"/>
+ <location filename="main_window_slots.cpp" line="3440"/>
<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="3515"/>
+ <location filename="main_window_slots.cpp" line="3517"/>
<source>No Interface Selected</source>
<translation>Nie wybrano interfejsu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3522"/>
+ <location filename="main_window_slots.cpp" line="3524"/>
<source> before starting a new capture</source>
<translation>przed wystartowaniem nowego przechwytywania</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3540"/>
+ <location filename="main_window_slots.cpp" line="3542"/>
<source> before restarting the capture</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source> before restarting a new capture</source>
- <translation type="vanished">przed restartem przechwytywania</translation>
+ <translation>przed restartem przechwytywania</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3723"/>
+ <location filename="main_window_slots.cpp" line="3725"/>
<source>Wiki Page for %1</source>
<translation>Strona Wiki dla %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3724"/>
+ <location filename="main_window_slots.cpp" line="3726"/>
<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.qm b/ui/qt/wireshark_zh_CN.qm
index da630c872f..5b1dac1abc 100644
--- a/ui/qt/wireshark_zh_CN.qm
+++ b/ui/qt/wireshark_zh_CN.qm
Binary files differ
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 237b05d90b..b340b4b7ee 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -1019,28 +1019,28 @@
<message>
<location filename="capture_filter_edit.cpp" line="358"/>
<source>Save this filter</source>
- <translation type="unfinished">保存该过滤器</translation>
+ <translation>保存此过滤器</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="360"/>
<source>Remove this filter</source>
- <translation type="unfinished">删除该过滤器</translation>
+ <translation>移除此过滤器</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="362"/>
<source>Manage Capture Filters</source>
- <translation type="unfinished"></translation>
+ <translation>管理捕获筛选器</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="498"/>
<source>Unable to save capture filter settings.</source>
- <translation type="unfinished">无法保存捕获过滤器设置。</translation>
+ <translation>无法保存捕获筛选器设置。</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="499"/>
<source>Could not save to your capture filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished">未能保存您的捕获过滤器文件
+ <translation>未能保存您的捕获过滤器文件
“%1”:%2。</translation>
</message>
</context>
@@ -1208,7 +1208,7 @@
<location filename="capture_interfaces_dialog.ui" line="128"/>
<source>Capture filter for selected interfaces:</source>
<oldsource>Capture Filter for selected Interfaces:</oldsource>
- <translation type="unfinished">所选择接口的捕获过滤器:</translation>
+ <translation>所选择接口的捕获过滤器:</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="158"/>
@@ -1901,13 +1901,13 @@ PLEASE NOTE: One option MUST be selected.</source>
<message>
<location filename="display_filter_edit.cpp" line="572"/>
<source>Unable to save display filter settings.</source>
- <translation type="unfinished">无法保存显示过滤器设置。</translation>
+ <translation>无法保存显示过滤器设置。</translation>
</message>
<message>
<location filename="display_filter_edit.cpp" line="573"/>
<source>Could not save to your display filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished">未能保存您的显示过滤器文件
+ <translation>未能保存您的显示过滤器文件
“%1”:%2。</translation>
</message>
<message>
@@ -2017,12 +2017,12 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>显示过滤器表达式</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="187"/>
+ <location filename="display_filter_expression_dialog.cpp" line="188"/>
<source>Select a field name to get started</source>
<translation>选择一个字段名称以开始</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="191"/>
+ <location filename="display_filter_expression_dialog.cpp" line="192"/>
<source>Click OK to insert this filter</source>
<translation>点击确定插入此过滤器</translation>
</message>
@@ -2436,12 +2436,12 @@ PLEASE NOTE: One option MUST be selected.</source>
<context>
<name>ExtcapArgumentFileSelection</name>
<message>
- <location filename="extcap_argument_file.cpp" line="101"/>
+ <location filename="extcap_argument_file.cpp" line="110"/>
<source>Any File (*.*)</source>
<translation>任意文件 (*.*)</translation>
</message>
<message>
- <location filename="extcap_argument_file.cpp" line="110"/>
+ <location filename="extcap_argument_file.cpp" line="119"/>
<source>Open File</source>
<translation>打开文件</translation>
</message>
@@ -2449,16 +2449,21 @@ PLEASE NOTE: One option MUST be selected.</source>
<context>
<name>ExtcapOptionsDialog</name>
<message>
- <location filename="extcap_options_dialog.cpp" line="69"/>
- <location filename="extcap_options_dialog.cpp" line="102"/>
+ <location filename="extcap_options_dialog.cpp" line="74"/>
+ <location filename="extcap_options_dialog.cpp" line="108"/>
<source>Extcap Interface Options</source>
<translation>Extcap 接口选项</translation>
</message>
<message>
- <location filename="extcap_options_dialog.cpp" line="72"/>
+ <location filename="extcap_options_dialog.cpp" line="78"/>
<source>Start</source>
<translation>开始</translation>
</message>
+ <message>
+ <location filename="extcap_options_dialog.ui" line="33"/>
+ <source>Save parameter on capture start</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>FileSetDialog</name>
@@ -2676,7 +2681,7 @@ for filter files: %2.</source>
<location filename="follow_stream_dialog.cpp" line="116"/>
<source>Filter Out This Stream</source>
<oldsource>Hide this stream</oldsource>
- <translation type="unfinished">隐藏这条流</translation>
+ <translation>滤掉此流</translation>
</message>
<message>
<location filename="follow_stream_dialog.cpp" line="119"/>
@@ -9135,7 +9140,7 @@ text-decoration: underline;
<location filename="main_window.cpp" line="1124"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
- <translation type="unfinished"> 导入新捕获前</translation>
+ <translation> 导入新捕获前</translation>
</message>
<message>
<location filename="main_window.cpp" line="1437"/>
@@ -9154,26 +9159,10 @@ text-decoration: underline;
<translation>.</translation>
</message>
<message>
- <source>You have unsaved packets</source>
- <translation type="vanished">您有未保存的分组</translation>
- </message>
- <message>
- <source>They will be lost if you don&apos;t save them.</source>
- <translation type="vanished">若不保存,这些分组将会丢失。</translation>
- </message>
- <message>
- <source>Do you want to stop the capture and save the captured packets</source>
- <translation type="vanished">您是否要停止捕获,并保存已捕获的分组</translation>
- </message>
- <message>
<location filename="main_window.cpp" line="1597"/>
<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>
- <source>?</source>
- <translation type="vanished">?</translation>
+ <translation>您是否要保存已做出的更改%1?</translation>
</message>
<message>
<location filename="main_window.cpp" line="1593"/>
@@ -9195,12 +9184,12 @@ text-decoration: underline;
<message>
<location filename="main_window.cpp" line="1592"/>
<source>Do you want to stop the capture and save the captured packets%1?</source>
- <translation type="unfinished"></translation>
+ <translation>您是否要停止捕获,并保存已捕获的分组%1?</translation>
</message>
<message>
<location filename="main_window.cpp" line="1600"/>
<source>Do you want to save the captured packets%1?</source>
- <translation type="unfinished"></translation>
+ <translation>您是否要保存已捕获的分组%1?</translation>
</message>
<message>
<location filename="main_window.cpp" line="1624"/>
@@ -9251,7 +9240,7 @@ text-decoration: underline;
<message>
<location filename="main_window_slots.cpp" line="205"/>
<source> before opening another file</source>
- <translation type="unfinished"></translation>
+ <translation>打开另一个文件前</translation>
</message>
<message>
<location filename="main_window_slots.cpp" line="692"/>
@@ -9286,7 +9275,7 @@ text-decoration: underline;
<message>
<location filename="main_window_slots.cpp" line="1655"/>
<source> before closing the file</source>
- <translation type="unfinished"></translation>
+ <translation>关闭文件前</translation>
</message>
<message>
<location filename="main_window_slots.cpp" line="1732"/>
@@ -9324,58 +9313,54 @@ text-decoration: underline;
<translation>无法复制文本。请尝试其他对象。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2348"/>
- <location filename="main_window_slots.cpp" line="3422"/>
+ <location filename="main_window_slots.cpp" line="2350"/>
+ <location filename="main_window_slots.cpp" line="3424"/>
<source>Unable to build conversation filter.</source>
<translation>无法建立对话过滤器。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2485"/>
- <location filename="main_window_slots.cpp" line="2498"/>
+ <location filename="main_window_slots.cpp" line="2487"/>
+ <location filename="main_window_slots.cpp" line="2500"/>
<source> before reloading the file</source>
- <translation type="unfinished"></translation>
+ <translation>重新载入文件前</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2532"/>
+ <location filename="main_window_slots.cpp" line="2534"/>
<source>No filter available. Try another </source>
<translation>无过滤器可用。请尝试其他 </translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3429"/>
+ <location filename="main_window_slots.cpp" line="3431"/>
<source>Error compiling filter for this conversation.</source>
<translation>为此对话编译过滤器时出错。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3438"/>
+ <location filename="main_window_slots.cpp" line="3440"/>
<source>No previous/next packet in conversation.</source>
<translation>此对话中没有上一个/下一个分组。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3515"/>
+ <location filename="main_window_slots.cpp" line="3517"/>
<source>No Interface Selected</source>
<translation>未选中接口</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3522"/>
+ <location filename="main_window_slots.cpp" line="3524"/>
<source> before starting a new capture</source>
<translation>在开始新捕获前</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3540"/>
+ <location filename="main_window_slots.cpp" line="3542"/>
<source> before restarting the capture</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source> before restarting a new capture</source>
- <translation type="vanished">在重启新捕获前</translation>
+ <translation>重新开始捕获前</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3723"/>
+ <location filename="main_window_slots.cpp" line="3725"/>
<source>Wiki Page for %1</source>
<translation>%1 的 Wiki 页面</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3724"/>
+ <location filename="main_window_slots.cpp" line="3726"/>
<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>