diff options
author | Gerald Combs <gerald@wireshark.org> | 2016-02-28 08:05:51 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2016-02-28 16:06:00 +0000 |
commit | 995b791f4355131bfb703e3fa5bc4e826b1c34fd (patch) | |
tree | 0d570c0da21f4a4cfbf1f730ee39b514135a4efb /ui/qt/wireshark_en.ts | |
parent | 157b7e9b48fc83896fb6cd47dc1b74961ac5a69a (diff) |
[Automatic update for 2016-02-28]
Update manuf, services enterprise-numbers, translations, and other items.
Change-Id: I01e2b802cce29c9390a85b2d12fe4fefef2357c2
Reviewed-on: https://code.wireshark.org/review/14225
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/wireshark_en.ts')
-rw-r--r-- | ui/qt/wireshark_en.ts | 250 |
1 files changed, 143 insertions, 107 deletions
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts index c200281ce2..15eb203844 100644 --- a/ui/qt/wireshark_en.ts +++ b/ui/qt/wireshark_en.ts @@ -1002,42 +1002,53 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="capture_filter_edit.cpp" line="129"/> + <location filename="capture_filter_edit.cpp" line="303"/> <source>Enter a capture filter %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_filter_edit.cpp" line="139"/> + <location filename="capture_filter_edit.cpp" line="136"/> <source>Manage saved bookmarks.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_filter_edit.cpp" line="176"/> + <location filename="capture_filter_edit.cpp" line="173"/> <source>Apply this filter string to the display.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_filter_edit.cpp" line="358"/> + <location filename="capture_filter_edit.cpp" line="298"/> + <source>Multiple filters selected. Override them here or leave this blank to preserve them.</source> + <extracomment>This is a very long concept that needs to fit into a short space.</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_filter_edit.cpp" line="299"/> + <source><p>The interfaces you have selected have different capture filters. Typing a filter here will override them. Doing nothing will preserve them.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="capture_filter_edit.cpp" line="403"/> <source>Save this filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_filter_edit.cpp" line="360"/> + <location filename="capture_filter_edit.cpp" line="405"/> <source>Remove this filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_filter_edit.cpp" line="362"/> + <location filename="capture_filter_edit.cpp" line="407"/> <source>Manage Capture Filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_filter_edit.cpp" line="498"/> + <location filename="capture_filter_edit.cpp" line="540"/> <source>Unable to save capture filter settings.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_filter_edit.cpp" line="499"/> + <location filename="capture_filter_edit.cpp" line="541"/> <source>Could not save to your capture filter file "%1": %2.</source> <translation type="unfinished"></translation> @@ -1364,12 +1375,12 @@ PLEASE NOTE: One option MUST be selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_interfaces_dialog.cpp" line="121"/> + <location filename="capture_interfaces_dialog.cpp" line="120"/> <source>Capture Interfaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_interfaces_dialog.cpp" line="127"/> + <location filename="capture_interfaces_dialog.cpp" line="126"/> <source>Start</source> <translation type="unfinished"></translation> </message> @@ -1379,83 +1390,83 @@ PLEASE NOTE: One option MUST be selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_interfaces_dialog.cpp" line="276"/> - <location filename="capture_interfaces_dialog.cpp" line="554"/> - <location filename="capture_interfaces_dialog.cpp" line="560"/> + <location filename="capture_interfaces_dialog.cpp" line="238"/> + <location filename="capture_interfaces_dialog.cpp" line="519"/> + <location filename="capture_interfaces_dialog.cpp" line="525"/> <source>enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_interfaces_dialog.cpp" line="276"/> - <location filename="capture_interfaces_dialog.cpp" line="554"/> - <location filename="capture_interfaces_dialog.cpp" line="560"/> + <location filename="capture_interfaces_dialog.cpp" line="238"/> + <location filename="capture_interfaces_dialog.cpp" line="519"/> + <location filename="capture_interfaces_dialog.cpp" line="525"/> <source>disabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_interfaces_dialog.cpp" line="295"/> + <location filename="capture_interfaces_dialog.cpp" line="257"/> <source>Specify a Capture File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_interfaces_dialog.cpp" line="492"/> + <location filename="capture_interfaces_dialog.cpp" line="457"/> <source>%1: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_interfaces_dialog.cpp" line="492"/> + <location filename="capture_interfaces_dialog.cpp" line="457"/> <source>Addresses</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_interfaces_dialog.cpp" line="492"/> + <location filename="capture_interfaces_dialog.cpp" line="457"/> <source>Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_interfaces_dialog.cpp" line="502"/> + <location filename="capture_interfaces_dialog.cpp" line="467"/> <source>no addresses</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_interfaces_dialog.cpp" line="553"/> + <location filename="capture_interfaces_dialog.cpp" line="518"/> <source>default</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_interfaces_dialog.cpp" line="543"/> - <location filename="capture_interfaces_dialog.cpp" line="544"/> - <location filename="capture_interfaces_dialog.cpp" line="546"/> - <location filename="capture_interfaces_dialog.cpp" line="549"/> - <location filename="capture_interfaces_dialog.cpp" line="560"/> + <location filename="capture_interfaces_dialog.cpp" line="508"/> + <location filename="capture_interfaces_dialog.cpp" line="509"/> + <location filename="capture_interfaces_dialog.cpp" line="511"/> + <location filename="capture_interfaces_dialog.cpp" line="514"/> + <location filename="capture_interfaces_dialog.cpp" line="525"/> <source>n/a</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_interfaces_dialog.cpp" line="699"/> - <location filename="capture_interfaces_dialog.cpp" line="707"/> + <location filename="capture_interfaces_dialog.cpp" line="682"/> + <location filename="capture_interfaces_dialog.cpp" line="690"/> + <location filename="capture_interfaces_dialog.cpp" line="701"/> + <location filename="capture_interfaces_dialog.cpp" line="705"/> <location filename="capture_interfaces_dialog.cpp" line="718"/> - <location filename="capture_interfaces_dialog.cpp" line="722"/> - <location filename="capture_interfaces_dialog.cpp" line="735"/> - <location filename="capture_interfaces_dialog.cpp" line="743"/> + <location filename="capture_interfaces_dialog.cpp" line="726"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_interfaces_dialog.cpp" line="700"/> - <location filename="capture_interfaces_dialog.cpp" line="708"/> - <location filename="capture_interfaces_dialog.cpp" line="736"/> - <location filename="capture_interfaces_dialog.cpp" line="744"/> + <location filename="capture_interfaces_dialog.cpp" line="683"/> + <location filename="capture_interfaces_dialog.cpp" line="691"/> + <location filename="capture_interfaces_dialog.cpp" line="719"/> + <location filename="capture_interfaces_dialog.cpp" line="727"/> <source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_interfaces_dialog.cpp" line="719"/> + <location filename="capture_interfaces_dialog.cpp" line="702"/> <source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_interfaces_dialog.cpp" line="723"/> + <location filename="capture_interfaces_dialog.cpp" line="706"/> <source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file if you want to use multiple files.</source> <translation type="unfinished"></translation> @@ -1818,22 +1829,22 @@ PLEASE NOTE: One option MUST be selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="decode_as_dialog.cpp" line="81"/> + <location filename="decode_as_dialog.cpp" line="82"/> <source>Decode As</source> <translation type="unfinished"></translation> </message> <message> - <location filename="decode_as_dialog.cpp" line="380"/> + <location filename="decode_as_dialog.cpp" line="381"/> <source>String</source> <translation type="unfinished"></translation> </message> <message> - <location filename="decode_as_dialog.cpp" line="382"/> + <location filename="decode_as_dialog.cpp" line="383"/> <source>Integer, base </source> <translation type="unfinished"></translation> </message> <message> - <location filename="decode_as_dialog.cpp" line="394"/> + <location filename="decode_as_dialog.cpp" line="395"/> <source>unknown</source> <translation type="unfinished"></translation> </message> @@ -4263,34 +4274,59 @@ for filter files: %2.</source> <context> <name>InterfaceTree</name> <message> - <location filename="interface_tree.cpp" line="73"/> + <location filename="interface_tree.cpp" line="86"/> <source>Welcome screen list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="interface_tree.cpp" line="79"/> + <location filename="interface_tree.cpp" line="92"/> <source>Waiting for startup%1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="interface_tree.cpp" line="244"/> + <location filename="interface_tree.cpp" line="260"/> <source>Interface information not available</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="interface_tree.cpp" line="436"/> + <source>Addresses</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="interface_tree.cpp" line="436"/> + <source>Address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="interface_tree.cpp" line="439"/> + <source>No addresses</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="interface_tree.cpp" line="444"/> + <source>No capture filter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="interface_tree.cpp" line="447"/> + <source>Capture filter</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>InterfaceTreeDelegate</name> <message> - <location filename="capture_interfaces_dialog.cpp" line="1010"/> - <location filename="capture_interfaces_dialog.cpp" line="1042"/> - <location filename="capture_interfaces_dialog.cpp" line="1091"/> - <location filename="capture_interfaces_dialog.cpp" line="1111"/> + <location filename="capture_interfaces_dialog.cpp" line="1020"/> + <location filename="capture_interfaces_dialog.cpp" line="1052"/> + <location filename="capture_interfaces_dialog.cpp" line="1101"/> + <location filename="capture_interfaces_dialog.cpp" line="1121"/> <source>enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_interfaces_dialog.cpp" line="1011"/> - <location filename="capture_interfaces_dialog.cpp" line="1043"/> + <location filename="capture_interfaces_dialog.cpp" line="1021"/> + <location filename="capture_interfaces_dialog.cpp" line="1053"/> <source>disabled</source> <translation type="unfinished"></translation> </message> @@ -6427,32 +6463,32 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="main_welcome.cpp" line="225"/> + <location filename="main_welcome.cpp" line="226"/> <source>You are running Wireshark </source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_welcome.cpp" line="227"/> + <location filename="main_welcome.cpp" line="228"/> <source>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_welcome.cpp" line="230"/> + <location filename="main_welcome.cpp" line="231"/> <source> You receive automatic updates.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_welcome.cpp" line="232"/> + <location filename="main_welcome.cpp" line="233"/> <source> You have disabled automatic updates.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_welcome.cpp" line="346"/> + <location filename="main_welcome.cpp" line="374"/> <source>not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_welcome.cpp" line="419"/> + <location filename="main_welcome.cpp" line="453"/> <source>Copy file path</source> <translation type="unfinished"></translation> </message> @@ -9018,27 +9054,27 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="792"/> + <location filename="main_window.cpp" line="801"/> <source> before quitting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="968"/> + <location filename="main_window.cpp" line="977"/> <source>Save packets before merging?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="969"/> + <location filename="main_window.cpp" line="978"/> <source>A temporary capture file can't be merged.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="975"/> + <location filename="main_window.cpp" line="984"/> <source>Save changes in "%1" before merging?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="977"/> + <location filename="main_window.cpp" line="986"/> <source>Changes must be saved before the files can be merged.</source> <translation type="unfinished"></translation> </message> @@ -9048,113 +9084,113 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1034"/> + <location filename="main_window.cpp" line="1043"/> <source>Invalid Read Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1035"/> + <location filename="main_window.cpp" line="1044"/> <source>The filter expression %1 isn't a valid read filter. (%2).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1125"/> + <location filename="main_window.cpp" line="1134"/> <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="1438"/> + <location filename="main_window.cpp" line="1447"/> <source>Unable to export to "%1".</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1439"/> + <location filename="main_window.cpp" line="1448"/> <source>You cannot export packets to the current capture file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1526"/> - <location filename="main_window.cpp" line="1551"/> + <location filename="main_window.cpp" line="1535"/> + <location filename="main_window.cpp" line="1560"/> <source>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1598"/> + <location filename="main_window.cpp" line="1607"/> <source>Do you want to save the changes you'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="1594"/> - <location filename="main_window.cpp" line="1602"/> + <location filename="main_window.cpp" line="1603"/> + <location filename="main_window.cpp" line="1611"/> <source>Your captured packets will be lost if you don't save them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1607"/> + <location filename="main_window.cpp" line="1616"/> <source>Do you want to save the changes you've made to the capture file "%1"%2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1599"/> <location filename="main_window.cpp" line="1608"/> + <location filename="main_window.cpp" line="1617"/> <source>Your changes will be lost if you don't save them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1593"/> + <location filename="main_window.cpp" line="1602"/> <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="1601"/> + <location filename="main_window.cpp" line="1610"/> <source>Do you want to save the captured packets%1?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1625"/> + <location filename="main_window.cpp" line="1634"/> <source>Save before Continue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1627"/> + <location filename="main_window.cpp" line="1636"/> <source>Stop and Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1639"/> + <location filename="main_window.cpp" line="1648"/> <source>Stop and Quit without Saving</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1651"/> + <location filename="main_window.cpp" line="1660"/> <source>Quit without Saving</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1642"/> - <location filename="main_window.cpp" line="1655"/> + <location filename="main_window.cpp" line="1651"/> + <location filename="main_window.cpp" line="1664"/> <source>Continue without Saving</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1645"/> + <location filename="main_window.cpp" line="1654"/> <source>Stop and Continue without Saving</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1910"/> + <location filename="main_window.cpp" line="1919"/> <source>(File name can't be mapped to UTF-8)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1931"/> + <location filename="main_window.cpp" line="1940"/> <source>The Wireshark Network Analyzer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1956"/> + <location filename="main_window.cpp" line="1965"/> <source>Capturing from %1</source> <translation type="unfinished"></translation> </message> @@ -9529,12 +9565,12 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="manage_interfaces_dialog.cpp" line="422"/> + <location filename="manage_interfaces_dialog.cpp" line="424"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="manage_interfaces_dialog.cpp" line="423"/> + <location filename="manage_interfaces_dialog.cpp" line="425"/> <source>Default interface cannot be hidden.</source> <translation type="unfinished"></translation> </message> @@ -9913,59 +9949,59 @@ a:hover { <context> <name>PacketList</name> <message> - <location filename="packet_list.cpp" line="337"/> + <location filename="packet_list.cpp" line="338"/> <source>Summary as Text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="packet_list.cpp" line="627"/> + <location filename="packet_list.cpp" line="651"/> <source>Align Left</source> <translation type="unfinished"></translation> </message> <message> - <location filename="packet_list.cpp" line="628"/> + <location filename="packet_list.cpp" line="652"/> <source>Align Center</source> <translation type="unfinished"></translation> </message> <message> - <location filename="packet_list.cpp" line="629"/> + <location filename="packet_list.cpp" line="653"/> <source>Align Right</source> <translation type="unfinished"></translation> </message> <message> - <location filename="packet_list.cpp" line="631"/> + <location filename="packet_list.cpp" line="655"/> <source>Column Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="packet_list.cpp" line="632"/> + <location filename="packet_list.cpp" line="656"/> <source>Edit Column</source> <translation type="unfinished"></translation> </message> <message> - <location filename="packet_list.cpp" line="633"/> + <location filename="packet_list.cpp" line="657"/> <source>Resize To Contents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="packet_list.cpp" line="634"/> + <location filename="packet_list.cpp" line="658"/> <source>Resolve Names</source> <translation type="unfinished"></translation> </message> <message> - <location filename="packet_list.cpp" line="639"/> + <location filename="packet_list.cpp" line="663"/> <source>Remove This Column</source> <translation type="unfinished"></translation> </message> <message> - <location filename="packet_list.cpp" line="995"/> + <location filename="packet_list.cpp" line="1019"/> <source>Frame %1: %2 </source> <translation type="unfinished"></translation> </message> <message> - <location filename="packet_list.cpp" line="999"/> + <location filename="packet_list.cpp" line="1023"/> <source>[ Comment text exceeds %1. Stopping. ]</source> <translation type="unfinished"></translation> </message> @@ -10055,12 +10091,12 @@ a:hover { <context> <name>PathChooserDelegate</name> <message> - <location filename="manage_interfaces_dialog.cpp" line="812"/> + <location filename="manage_interfaces_dialog.cpp" line="814"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="manage_interfaces_dialog.cpp" line="865"/> + <location filename="manage_interfaces_dialog.cpp" line="867"/> <source>Open Pipe</source> <translation type="unfinished"></translation> </message> @@ -10083,8 +10119,8 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="preference_editor_frame.cpp" line="81"/> - <source>Open %1 preferences…</source> + <location filename="preference_editor_frame.cpp" line="82"/> + <source>Open %1 preferences</source> <translation type="unfinished"></translation> </message> </context> @@ -11027,12 +11063,12 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="main_welcome.cpp" line="402"/> + <location filename="main_welcome.cpp" line="436"/> <source>Show in Finder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_welcome.cpp" line="404"/> + <location filename="main_welcome.cpp" line="438"/> <source>Show in Folder</source> <translation type="unfinished"></translation> </message> @@ -13885,12 +13921,12 @@ a:hover { <context> <name>ShowPacketBytesTextEdit</name> <message> - <location filename="show_packet_bytes_dialog.cpp" line="689"/> + <location filename="show_packet_bytes_dialog.cpp" line="697"/> <source>Show Selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="show_packet_bytes_dialog.cpp" line="693"/> + <location filename="show_packet_bytes_dialog.cpp" line="701"/> <source>Show All</source> <translation type="unfinished"></translation> </message> |