aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/wireshark_en.ts
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-09-25 08:12:59 -0700
committerGerald Combs <gerald@wireshark.org>2016-09-25 15:14:17 +0000
commitfce2531169e4e239c866ffa208722cf84de4d8c5 (patch)
treedd7ca77f686e655b14115e6b3702ad53cf3c1421 /ui/qt/wireshark_en.ts
parente6ea68c72e681f10c73103ff8da88954ed98e65e (diff)
[Automatic update for 2016-09-25]
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ie3096d67f82b93b751640e063ebe231fc235f83f Reviewed-on: https://code.wireshark.org/review/17917 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/wireshark_en.ts')
-rw-r--r--ui/qt/wireshark_en.ts149
1 files changed, 77 insertions, 72 deletions
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index 7fa866a791..e09d9affc6 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -785,12 +785,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="782"/>
+ <location filename="capture_file_dialog.cpp" line="784"/>
<source>%1, error after %2 packets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="789"/>
+ <location filename="capture_file_dialog.cpp" line="791"/>
<source>%1, timed out at %2 packets</source>
<translation type="unfinished"></translation>
</message>
@@ -869,22 +869,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="728"/>
+ <location filename="capture_file_dialog.cpp" line="730"/>
<source>directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="735"/>
+ <location filename="capture_file_dialog.cpp" line="737"/>
<source>unknown file format</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="737"/>
+ <location filename="capture_file_dialog.cpp" line="739"/>
<source>error opening file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="816"/>
+ <location filename="capture_file_dialog.cpp" line="818"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
@@ -6725,6 +6725,11 @@ a:hover {
<source>Copy file path</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="main_welcome.cpp" line="478"/>
+ <source>Remove</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
@@ -8947,33 +8952,33 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="437"/>
+ <location filename="main_window.cpp" line="441"/>
<source>Check for Updates</source>
<oldsource>Check for Updates...</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="819"/>
+ <location filename="main_window.cpp" line="823"/>
<source> before quitting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1004"/>
+ <location filename="main_window.cpp" line="1008"/>
<source>Save packets before merging?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1005"/>
+ <location filename="main_window.cpp" line="1009"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1011"/>
+ <location filename="main_window.cpp" line="1015"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1013"/>
+ <location filename="main_window.cpp" line="1017"/>
<source>Changes must be saved before the files can be merged.</source>
<translation type="unfinished"></translation>
</message>
@@ -8983,117 +8988,117 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1050"/>
+ <location filename="main_window.cpp" line="1054"/>
<source>Invalid Read Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1051"/>
+ <location filename="main_window.cpp" line="1055"/>
<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="1141"/>
+ <location filename="main_window.cpp" line="1145"/>
<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="1417"/>
+ <location filename="main_window.cpp" line="1421"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1418"/>
+ <location filename="main_window.cpp" line="1422"/>
<source>You cannot export packets to the current capture file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1505"/>
- <location filename="main_window.cpp" line="1530"/>
+ <location filename="main_window.cpp" line="1509"/>
+ <location filename="main_window.cpp" line="1534"/>
<source>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1577"/>
+ <location filename="main_window.cpp" line="1581"/>
<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="1573"/>
- <location filename="main_window.cpp" line="1581"/>
+ <location filename="main_window.cpp" line="1577"/>
+ <location filename="main_window.cpp" line="1585"/>
<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="1586"/>
+ <location filename="main_window.cpp" line="1590"/>
<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="1578"/>
- <location filename="main_window.cpp" line="1587"/>
+ <location filename="main_window.cpp" line="1582"/>
+ <location filename="main_window.cpp" line="1591"/>
<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="1572"/>
+ <location filename="main_window.cpp" line="1576"/>
<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="1580"/>
+ <location filename="main_window.cpp" line="1584"/>
<source>Do you want to save the captured packets%1?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1604"/>
+ <location filename="main_window.cpp" line="1608"/>
<source>Save before Continue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1606"/>
+ <location filename="main_window.cpp" line="1610"/>
<source>Stop and Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1618"/>
+ <location filename="main_window.cpp" line="1622"/>
<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="1630"/>
+ <location filename="main_window.cpp" line="1634"/>
<source>Quit &amp;without Saving</source>
<oldsource>Quit without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1621"/>
- <location filename="main_window.cpp" line="1634"/>
+ <location filename="main_window.cpp" line="1625"/>
+ <location filename="main_window.cpp" line="1638"/>
<source>Continue &amp;without Saving</source>
<oldsource>Continue without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1624"/>
+ <location filename="main_window.cpp" line="1628"/>
<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="1956"/>
+ <location filename="main_window.cpp" line="1960"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1977"/>
+ <location filename="main_window.cpp" line="1981"/>
<source>The Wireshark Network Analyzer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="2002"/>
+ <location filename="main_window.cpp" line="2006"/>
<source>Capturing from %1</source>
<translation type="unfinished"></translation>
</message>
@@ -9108,52 +9113,52 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="801"/>
+ <location filename="main_window_slots.cpp" line="799"/>
<source>Saving %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="841"/>
+ <location filename="main_window_slots.cpp" line="839"/>
<source>No interface selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="851"/>
+ <location filename="main_window_slots.cpp" line="849"/>
<source>Invalid capture filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1099"/>
+ <location filename="main_window_slots.cpp" line="1097"/>
<source>Clear Menu</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1579"/>
+ <location filename="main_window_slots.cpp" line="1577"/>
<source>Please wait while Wireshark is initializing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1669"/>
+ <location filename="main_window_slots.cpp" line="1667"/>
<source> before closing the file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1757"/>
+ <location filename="main_window_slots.cpp" line="1749"/>
<source>Export Selected Packet Bytes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1823"/>
+ <location filename="main_window_slots.cpp" line="1815"/>
<source>No Keys</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1824"/>
+ <location filename="main_window_slots.cpp" line="1816"/>
<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="1830"/>
+ <location filename="main_window_slots.cpp" line="1822"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation>
@@ -9162,69 +9167,69 @@ a:hover {
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1759"/>
+ <location filename="main_window_slots.cpp" line="1751"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1834"/>
+ <location filename="main_window_slots.cpp" line="1826"/>
<source>SSL Session Keys (*.keys *.txt);;All Files (</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1972"/>
+ <location filename="main_window_slots.cpp" line="1964"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2382"/>
- <location filename="main_window_slots.cpp" line="3484"/>
+ <location filename="main_window_slots.cpp" line="2374"/>
+ <location filename="main_window_slots.cpp" line="3476"/>
<source>Unable to build conversation filter.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2532"/>
- <location filename="main_window_slots.cpp" line="2545"/>
+ <location filename="main_window_slots.cpp" line="2524"/>
+ <location filename="main_window_slots.cpp" line="2537"/>
<source> before reloading the file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2579"/>
+ <location filename="main_window_slots.cpp" line="2571"/>
<source>No filter available. Try another </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3491"/>
+ <location filename="main_window_slots.cpp" line="3483"/>
<source>Error compiling filter for this conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3500"/>
+ <location filename="main_window_slots.cpp" line="3492"/>
<source>No previous/next packet in conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3577"/>
+ <location filename="main_window_slots.cpp" line="3569"/>
<source>No Interface Selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3584"/>
+ <location filename="main_window_slots.cpp" line="3576"/>
<source> before starting a new capture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3602"/>
+ <location filename="main_window_slots.cpp" line="3594"/>
<source> before restarting the capture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3815"/>
+ <location filename="main_window_slots.cpp" line="3807"/>
<source>Wiki Page for %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3816"/>
+ <location filename="main_window_slots.cpp" line="3808"/>
<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>
@@ -9857,54 +9862,54 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="723"/>
+ <location filename="packet_list.cpp" line="719"/>
<source>Align Left</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="724"/>
+ <location filename="packet_list.cpp" line="720"/>
<source>Align Center</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="725"/>
+ <location filename="packet_list.cpp" line="721"/>
<source>Align Right</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="727"/>
+ <location filename="packet_list.cpp" line="723"/>
<source>Column Preferences</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="728"/>
+ <location filename="packet_list.cpp" line="724"/>
<source>Edit Column</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="729"/>
+ <location filename="packet_list.cpp" line="725"/>
<source>Resize To Contents</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="730"/>
+ <location filename="packet_list.cpp" line="726"/>
<source>Resolve Names</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="735"/>
+ <location filename="packet_list.cpp" line="731"/>
<source>Remove This Column</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="1093"/>
+ <location filename="packet_list.cpp" line="1085"/>
<source>Frame %1: %2
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="1097"/>
+ <location filename="packet_list.cpp" line="1089"/>
<source>[ Comment text exceeds %1. Stopping. ]</source>
<translation type="unfinished"></translation>
</message>