diff options
author | Gerald Combs <gerald@wireshark.org> | 2016-09-11 08:12:41 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2016-09-11 15:13:19 +0000 |
commit | 1d493ce156c4a230bc376d957c196cab31388dd2 (patch) | |
tree | 3b7401c44d071808b5886f5ce80f1e5a7d15a74b /ui/qt/wireshark_en.ts | |
parent | 456312e22b06dd900ce11776f35321c0a158ea7e (diff) |
[Automatic update for 2016-09-11]
Update manuf, services enterprise-numbers, translations, and other items.
Change-Id: I29e1c1ae96c686a2c97609e939c2c35845d2d9ee
Reviewed-on: https://code.wireshark.org/review/17640
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/wireshark_en.ts')
-rw-r--r-- | ui/qt/wireshark_en.ts | 138 |
1 files changed, 47 insertions, 91 deletions
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts index 7b404c6e00..4531ac2b70 100644 --- a/ui/qt/wireshark_en.ts +++ b/ui/qt/wireshark_en.ts @@ -729,211 +729,162 @@ <context> <name>CaptureFileDialog</name> <message> - <location filename="capture_file_dialog.cpp" line="173"/> + <location filename="capture_file_dialog.cpp" line="140"/> <source>This capture file contains comments.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="183"/> + <location filename="capture_file_dialog.cpp" line="150"/> <source>The file format you chose doesn't support comments. Do you want to save the capture in a format that supports comments or discard the comments and save in the format you chose?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="187"/> - <location filename="capture_file_dialog.cpp" line="196"/> + <location filename="capture_file_dialog.cpp" line="154"/> + <location filename="capture_file_dialog.cpp" line="163"/> <source>Discard comments and save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="188"/> + <location filename="capture_file_dialog.cpp" line="155"/> <source>Save in another format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="193"/> + <location filename="capture_file_dialog.cpp" line="160"/> <source>No file format in which it can be saved supports comments. Do you want to discard the comments and save in the format you chose?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="412"/> + <location filename="capture_file_dialog.cpp" line="379"/> <source>All Files (</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="418"/> + <location filename="capture_file_dialog.cpp" line="385"/> <source>All Capture Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="454"/> + <location filename="capture_file_dialog.cpp" line="420"/> <source>Format:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="459"/> + <location filename="capture_file_dialog.cpp" line="425"/> <source>Size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="464"/> - <source>Packets:</source> + <location filename="capture_file_dialog.cpp" line="430"/> + <source>Start / elapsed:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="469"/> - <source>First Packet:</source> + <location filename="capture_file_dialog.cpp" line="476"/> + <source>Automatically detect file type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="474"/> - <source>Elapsed Time:</source> + <location filename="capture_file_dialog.cpp" line="772"/> + <source>%1, error after %2 packets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="486"/> + <location filename="capture_file_dialog.cpp" line="779"/> + <source>%1, timed out at %2 packets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_file_dialog.cpp" line="442"/> <source>Prepend packets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="487"/> + <location filename="capture_file_dialog.cpp" line="443"/> <source>Insert packets from the selected file before the current file. Packet timestamps will be ignored.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="490"/> + <location filename="capture_file_dialog.cpp" line="446"/> <source>Merge chronologically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="491"/> + <location filename="capture_file_dialog.cpp" line="447"/> <source>Insert packets in chronological order.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="495"/> + <location filename="capture_file_dialog.cpp" line="451"/> <source>Append packets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="496"/> + <location filename="capture_file_dialog.cpp" line="452"/> <source>Insert packets from the selected file after the current file. Packet timestamps will be ignored.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="511"/> + <location filename="capture_file_dialog.cpp" line="467"/> <source>Read filter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="520"/> - <source>Automatic</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="529"/> - <source>&MAC name resolution</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="533"/> - <source>&Transport name resolution</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="537"/> - <source>&Network name resolution</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="541"/> - <source>&External name resolver</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="547"/> + <location filename="capture_file_dialog.cpp" line="485"/> <source>Compress with g&zip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="578"/> + <location filename="capture_file_dialog.cpp" line="516"/> <source>Open Capture File</source> <oldsource>Wireshark: Open Capture File</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="614"/> + <location filename="capture_file_dialog.cpp" line="546"/> <source>Save Capture File As</source> <oldsource>Wireshark: Save Capture File As</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="620"/> + <location filename="capture_file_dialog.cpp" line="552"/> <source>Save as:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="642"/> + <location filename="capture_file_dialog.cpp" line="574"/> <source>Export Specified Packets</source> <oldsource>Wireshark: Export Specified Packets</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="646"/> + <location filename="capture_file_dialog.cpp" line="578"/> <source>Export as:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="675"/> + <location filename="capture_file_dialog.cpp" line="607"/> <source>Merge Capture File</source> <oldsource>Wireshark: Merge Capture File</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="777"/> - <location filename="capture_file_dialog.cpp" line="778"/> - <location filename="capture_file_dialog.cpp" line="779"/> - <location filename="capture_file_dialog.cpp" line="780"/> - <location filename="capture_file_dialog.cpp" line="781"/> - <source>-</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="788"/> + <location filename="capture_file_dialog.cpp" line="718"/> <source>directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="795"/> + <location filename="capture_file_dialog.cpp" line="725"/> <source>unknown file format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="797"/> + <location filename="capture_file_dialog.cpp" line="727"/> <source>error opening file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file_dialog.cpp" line="811"/> - <source>%1 bytes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="840"/> - <source>error after reading %1 packets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="846"/> - <source>more than %1 (preview timeout)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="865"/> - <source>?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="capture_file_dialog.cpp" line="871"/> + <location filename="capture_file_dialog.cpp" line="806"/> <source>unknown</source> <translation type="unfinished"></translation> </message> @@ -2639,13 +2590,13 @@ PLEASE NOTE: One option MUST be selected.</source> <context> <name>ExtcapOptionsDialog</name> <message> - <location filename="extcap_options_dialog.cpp" line="74"/> - <location filename="extcap_options_dialog.cpp" line="108"/> + <location filename="extcap_options_dialog.cpp" line="76"/> + <location filename="extcap_options_dialog.cpp" line="110"/> <source>Extcap Interface Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="extcap_options_dialog.cpp" line="78"/> + <location filename="extcap_options_dialog.cpp" line="80"/> <source>Start</source> <translation type="unfinished"></translation> </message> @@ -14912,6 +14863,11 @@ a:hover { <translation type="unfinished"></translation> </message> <message> + <location filename="traffic_table_dialog.ui" line="68"/> + <source><html><head/><body><p>Show absolute times in the start time column.</p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="traffic_table_dialog.ui" line="71"/> <source>Absolute start time</source> <translation type="unfinished"></translation> |