[Automatic update for 2016-05-29]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Id13bada7b6b5e5c9e697967e22c687d2f64e5329
Reviewed-on: https://code.wireshark.org/review/15605
Reviewed-by: Gerald Combs <gerald@wireshark.org>

1 files changed, 141 insertions, 79 deletions

diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 7e8a6453d7..474672dd62 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -2808,62 +2808,62 @@ for filter files: %2.</source>
         <translation>保存流的内容为</translation>
     </message>
     <message>
-        <location filename="follow_stream_dialog.cpp" line="540"/>
+        <location filename="follow_stream_dialog.cpp" line="544"/>
         <source>
 [Stream output truncated]</source>
         <translation>[流量输出截断]</translation>
     </message>
     <message>
-        <location filename="follow_stream_dialog.cpp" line="807"/>
+        <location filename="follow_stream_dialog.cpp" line="811"/>
         <source>No capture file.</source>
         <translation>无捕获文件。</translation>
     </message>
     <message>
-        <location filename="follow_stream_dialog.cpp" line="807"/>
+        <location filename="follow_stream_dialog.cpp" line="811"/>
         <source>Please make sure you have a capture file opened.</source>
         <translation>请确认您已经打开一个捕获文件。</translation>
     </message>
     <message>
-        <location filename="follow_stream_dialog.cpp" line="813"/>
-        <location filename="follow_stream_dialog.cpp" line="819"/>
+        <location filename="follow_stream_dialog.cpp" line="817"/>
+        <location filename="follow_stream_dialog.cpp" line="823"/>
         <source>Error following stream.</source>
         <translation>追踪流错误。</translation>
     </message>
     <message>
-        <location filename="follow_stream_dialog.cpp" line="813"/>
+        <location filename="follow_stream_dialog.cpp" line="817"/>
         <source>Capture file invalid.</source>
         <translation>捕获文件无效。</translation>
     </message>
     <message>
-        <location filename="follow_stream_dialog.cpp" line="819"/>
+        <location filename="follow_stream_dialog.cpp" line="823"/>
         <source>Please make sure you have a %1 packet selected.</source>
         <translation>请确保您已选中一个 %1 分组。</translation>
     </message>
     <message>
-        <location filename="follow_stream_dialog.cpp" line="935"/>
+        <location filename="follow_stream_dialog.cpp" line="939"/>
         <source>Follow %1 Stream (%2)</source>
         <translation>追踪 %1 流 (%2)</translation>
     </message>
     <message>
-        <location filename="follow_stream_dialog.cpp" line="841"/>
+        <location filename="follow_stream_dialog.cpp" line="845"/>
         <source>Error creating filter for this stream.</source>
         <translation>为这个流创建过滤器时出错。</translation>
     </message>
     <message>
-        <location filename="follow_stream_dialog.cpp" line="842"/>
+        <location filename="follow_stream_dialog.cpp" line="846"/>
         <source>A transport or network layer header is needed.</source>
         <translation>需要传输层或网络层头部。</translation>
     </message>
     <message numerus="yes">
-        <location filename="follow_stream_dialog.cpp" line="872"/>
-        <location filename="follow_stream_dialog.cpp" line="884"/>
+        <location filename="follow_stream_dialog.cpp" line="876"/>
+        <location filename="follow_stream_dialog.cpp" line="888"/>
         <source>%Ln total stream(s).</source>
         <translation>
             <numerusform>%Ln 全部流。</numerusform>
         </translation>
     </message>
     <message>
-        <location filename="follow_stream_dialog.cpp" line="955"/>
+        <location filename="follow_stream_dialog.cpp" line="959"/>
         <source>File closed.</source>
         <translation>文件关闭。</translation>
     </message>
@@ -6427,12 +6427,12 @@ for filter files: %2.</source>
     <message>
         <location filename="main_welcome.ui" line="130"/>
         <source>Recent capture files</source>
-        <translation type="unfinished"></translation>
+        <translation>最近的捕获文件</translation>
     </message>
     <message>
         <location filename="main_welcome.ui" line="133"/>
         <source>Capture files that have been opened previously</source>
-        <translation type="unfinished"></translation>
+        <translation>不久前打开过的捕获文件</translation>
     </message>
     <message>
         <location filename="main_welcome.ui" line="146"/>
@@ -6452,12 +6452,12 @@ for filter files: %2.</source>
     <message>
         <location filename="main_welcome.ui" line="197"/>
         <source>Interface list</source>
-        <translation type="unfinished"></translation>
+        <translation>接口列表</translation>
     </message>
     <message>
         <location filename="main_welcome.ui" line="200"/>
         <source>List of available capture interfaces</source>
-        <translation type="unfinished"></translation>
+        <translation>可用捕获接口的列表</translation>
     </message>
     <message>
         <location filename="main_welcome.ui" line="226"/>
@@ -8932,17 +8932,17 @@ text-decoration: underline;
         <translation>停止并继续，不保存(&amp;W)</translation>
     </message>
     <message>
-        <location filename="main_window.cpp" line="1923"/>
+        <location filename="main_window.cpp" line="1924"/>
         <source>(File name can&apos;t be mapped to UTF-8)</source>
         <translation>文件名不能映射到UTF-8</translation>
     </message>
     <message>
-        <location filename="main_window.cpp" line="1944"/>
+        <location filename="main_window.cpp" line="1945"/>
         <source>The Wireshark Network Analyzer</source>
         <translation>Wireshark 网络分析器</translation>
     </message>
     <message>
-        <location filename="main_window.cpp" line="1969"/>
+        <location filename="main_window.cpp" line="1970"/>
         <source>Capturing from %1</source>
         <translation>正在捕获 %1</translation>
     </message>
@@ -13283,68 +13283,78 @@ text-decoration: underline;
 <context>
     <name>SequenceDialog</name>
     <message>
-        <location filename="sequence_dialog.cpp" line="64"/>
+        <location filename="sequence_dialog.cpp" line="68"/>
         <source>Call Flow</source>
         <translation>呼叫流</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.cpp" line="123"/>
+        <location filename="sequence_dialog.cpp" line="102"/>
+        <source>Time</source>
+        <translation type="unfinished">时间</translation>
+    </message>
+    <message>
+        <location filename="sequence_dialog.cpp" line="110"/>
+        <source>Comment</source>
+        <translation type="unfinished">注释</translation>
+    </message>
+    <message>
+        <location filename="sequence_dialog.cpp" line="154"/>
         <source>Save As</source>
         <oldsource>Save As...</oldsource>
         <translation>另存为</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.cpp" line="274"/>
+        <location filename="sequence_dialog.cpp" line="302"/>
         <source>No data</source>
         <translation>无数据</translation>
     </message>
     <message numerus="yes">
-        <location filename="sequence_dialog.cpp" line="276"/>
+        <location filename="sequence_dialog.cpp" line="304"/>
         <source>%Ln node(s)</source>
         <translation>
             <numerusform>%Ln 节点</numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="sequence_dialog.cpp" line="277"/>
+        <location filename="sequence_dialog.cpp" line="305"/>
         <source>%Ln item(s)</source>
         <translation>
             <numerusform>%Ln 项目</numerusform>
         </translation>
     </message>
     <message>
-        <location filename="sequence_dialog.cpp" line="297"/>
+        <location filename="sequence_dialog.cpp" line="331"/>
         <source>Portable Document Format (*.pdf)</source>
         <translation>便携式文档格式 (*.pdf)</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.cpp" line="298"/>
+        <location filename="sequence_dialog.cpp" line="332"/>
         <source>Portable Network Graphics (*.png)</source>
         <translation>便携式网络图形格式 (*.png)</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.cpp" line="299"/>
+        <location filename="sequence_dialog.cpp" line="333"/>
         <source>Windows Bitmap (*.bmp)</source>
         <translation>Windows 位图 (*.bmp)</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.cpp" line="301"/>
+        <location filename="sequence_dialog.cpp" line="335"/>
         <source>JPEG File Interchange Format (*.jpeg *.jpg)</source>
         <translation>JPEG 文件交换格式 (*.jpeg *.jpg)</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.cpp" line="302"/>
+        <location filename="sequence_dialog.cpp" line="336"/>
         <source>ASCII (*.txt)</source>
         <translation>ASCII (*.txt)</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.cpp" line="313"/>
+        <location filename="sequence_dialog.cpp" line="347"/>
         <source>Save Graph As</source>
         <oldsource>Wireshark: Save Graph As...</oldsource>
         <translation>保存图形为</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.cpp" line="64"/>
+        <location filename="sequence_dialog.cpp" line="68"/>
         <source>Flow</source>
         <translation>流</translation>
     </message>
@@ -13367,10 +13377,32 @@ text-decoration: underline;
 &lt;tr&gt;&lt;th&gt;&lt;i&gt;Shift+&lt;/i&gt;↓&lt;/th&gt;&lt;td&gt;Move down 1 pixel&lt;/td&gt;&lt;/th&gt;
 
 &lt;tr&gt;&lt;th&gt;g&lt;/th&gt;&lt;td&gt;Go to packet under cursor&lt;/td&gt;&lt;/th&gt;
+&lt;tr&gt;&lt;th&gt;n&lt;/th&gt;&lt;td&gt;Go to the next packet&lt;/td&gt;&lt;/th&gt;
+&lt;tr&gt;&lt;th&gt;p&lt;/th&gt;&lt;td&gt;Go to the previous packet&lt;/td&gt;&lt;/th&gt;
 
 &lt;/tbody&gt;&lt;/table&gt;
 &lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
+        <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
+
+&lt;h3&gt;Valuable and amazing time-saving keyboard shortcuts&lt;/h3&gt;
+&lt;table&gt;&lt;tbody&gt;
+
+&lt;tr&gt;&lt;th&gt;0&lt;/th&gt;&lt;td&gt;Reset graph to its initial state&lt;/td&gt;&lt;/th&gt;
+
+&lt;tr&gt;&lt;th&gt;→&lt;/th&gt;&lt;td&gt;Move right 10 pixels&lt;/td&gt;&lt;/th&gt;
+&lt;tr&gt;&lt;th&gt;←&lt;/th&gt;&lt;td&gt;Move left 10 pixels&lt;/td&gt;&lt;/th&gt;
+&lt;tr&gt;&lt;th&gt;↑&lt;/th&gt;&lt;td&gt;Move up 10 pixels&lt;/td&gt;&lt;/th&gt;
+&lt;tr&gt;&lt;th&gt;↓&lt;/th&gt;&lt;td&gt;Move down 10 pixels&lt;/td&gt;&lt;/th&gt;
+&lt;tr&gt;&lt;th&gt;&lt;i&gt;Shift+&lt;/i&gt;→&lt;/th&gt;&lt;td&gt;Move right 1 pixel&lt;/td&gt;&lt;/th&gt;
+&lt;tr&gt;&lt;th&gt;&lt;i&gt;Shift+&lt;/i&gt;←&lt;/th&gt;&lt;td&gt;Move left 1 pixel&lt;/td&gt;&lt;/th&gt;
+&lt;tr&gt;&lt;th&gt;&lt;i&gt;Shift+&lt;/i&gt;↑&lt;/th&gt;&lt;td&gt;Move up 1 pixel&lt;/td&gt;&lt;/th&gt;
+&lt;tr&gt;&lt;th&gt;&lt;i&gt;Shift+&lt;/i&gt;↓&lt;/th&gt;&lt;td&gt;Move down 1 pixel&lt;/td&gt;&lt;/th&gt;
+
+&lt;tr&gt;&lt;th&gt;g&lt;/th&gt;&lt;td&gt;Go to packet under cursor&lt;/td&gt;&lt;/th&gt;
+
+&lt;/tbody&gt;&lt;/table&gt;
+&lt;/body&gt;&lt;/html&gt;</oldsource>
+        <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 
 &lt;h3&gt;Valuable and amazing time-saving keyboard shortcuts&lt;/h3&gt;
 &lt;table&gt;&lt;tbody&gt;
@@ -13392,194 +13424,224 @@ text-decoration: underline;
 &lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="70"/>
+        <location filename="sequence_dialog.ui" line="72"/>
         <source>&lt;small&gt;&lt;i&gt;A hint&lt;/i&gt;&lt;/small&gt;</source>
         <translation>&lt;small&gt;&lt;i&gt;提示&lt;/i&gt;&lt;/small&gt;</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="103"/>
+        <location filename="sequence_dialog.ui" line="105"/>
         <source>Show:</source>
         <translation>显示:</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="111"/>
+        <location filename="sequence_dialog.ui" line="113"/>
         <source>All packets</source>
         <translation>所有分组</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="116"/>
+        <location filename="sequence_dialog.ui" line="118"/>
         <source>Displayed packets</source>
         <translation>显示的分组</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="137"/>
+        <location filename="sequence_dialog.ui" line="139"/>
         <source>Flow type:</source>
         <translation>流类型:</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="160"/>
+        <location filename="sequence_dialog.ui" line="162"/>
         <source>Addresses:</source>
         <translation>地址:</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="168"/>
+        <location filename="sequence_dialog.ui" line="170"/>
         <source>Any</source>
         <translation>任何</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="173"/>
+        <location filename="sequence_dialog.ui" line="175"/>
         <source>Network</source>
         <translation>网络</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="198"/>
+        <location filename="sequence_dialog.ui" line="200"/>
         <source>Reset</source>
         <translation>复位</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="220"/>
+        <location filename="sequence_dialog.ui" line="222"/>
         <source>Reset Diagram</source>
         <translation>复位图表</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="223"/>
+        <location filename="sequence_dialog.ui" line="225"/>
         <source>Reset the diagram to its initial state.</source>
         <translation>复位图表到初始状态。</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="226"/>
+        <location filename="sequence_dialog.ui" line="228"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="231"/>
-        <location filename="sequence_dialog.ui" line="234"/>
+        <location filename="sequence_dialog.ui" line="233"/>
+        <location filename="sequence_dialog.ui" line="236"/>
         <source>Move Up 10 Pixels</source>
         <translation>上移10像素</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="237"/>
+        <location filename="sequence_dialog.ui" line="239"/>
         <source>Up</source>
         <translation>上键</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="242"/>
-        <location filename="sequence_dialog.ui" line="245"/>
+        <location filename="sequence_dialog.ui" line="244"/>
+        <location filename="sequence_dialog.ui" line="247"/>
         <source>Move Left 10 Pixels</source>
         <translation>左移10像素</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="248"/>
+        <location filename="sequence_dialog.ui" line="250"/>
         <source>Left</source>
         <translation>左键</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="253"/>
-        <location filename="sequence_dialog.ui" line="256"/>
+        <location filename="sequence_dialog.ui" line="255"/>
+        <location filename="sequence_dialog.ui" line="258"/>
         <source>Move Right 10 Pixels</source>
         <translation>右移10像素</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="259"/>
+        <location filename="sequence_dialog.ui" line="261"/>
         <source>Right</source>
         <translation>右键</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="264"/>
-        <location filename="sequence_dialog.ui" line="267"/>
+        <location filename="sequence_dialog.ui" line="266"/>
+        <location filename="sequence_dialog.ui" line="269"/>
         <source>Move Down 10 Pixels</source>
         <translation>下移10像素</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="270"/>
+        <location filename="sequence_dialog.ui" line="272"/>
         <source>Down</source>
         <translation>下键</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="275"/>
-        <location filename="sequence_dialog.ui" line="278"/>
+        <location filename="sequence_dialog.ui" line="277"/>
+        <location filename="sequence_dialog.ui" line="280"/>
         <source>Move Up 1 Pixel</source>
         <translation>上移1像素</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="281"/>
+        <location filename="sequence_dialog.ui" line="283"/>
         <source>Shift+Up</source>
         <translation>Shift+上键</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="286"/>
-        <location filename="sequence_dialog.ui" line="289"/>
+        <location filename="sequence_dialog.ui" line="288"/>
+        <location filename="sequence_dialog.ui" line="291"/>
         <source>Move Left 1 Pixel</source>
         <translation>左移1像素</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="292"/>
+        <location filename="sequence_dialog.ui" line="294"/>
         <source>Shift+Left</source>
         <translation>Shift+右键</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="297"/>
-        <location filename="sequence_dialog.ui" line="300"/>
+        <location filename="sequence_dialog.ui" line="299"/>
+        <location filename="sequence_dialog.ui" line="302"/>
         <source>Move Right 1 Pixel</source>
         <translation>右移1像素</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="303"/>
+        <location filename="sequence_dialog.ui" line="305"/>
         <source>Shift+Right</source>
         <translation>Shift+右键</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="308"/>
-        <location filename="sequence_dialog.ui" line="311"/>
+        <location filename="sequence_dialog.ui" line="310"/>
+        <location filename="sequence_dialog.ui" line="313"/>
         <source>Move Down 1 Pixel</source>
         <translation>下移1像素</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="314"/>
+        <location filename="sequence_dialog.ui" line="316"/>
         <source>Shift+Down</source>
         <translation>Shift+下键</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="319"/>
+        <location filename="sequence_dialog.ui" line="321"/>
         <source>Go To Packet Under Cursor</source>
         <translation>跳转到光标所在的分组</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="322"/>
+        <location filename="sequence_dialog.ui" line="324"/>
         <source>Go to packet currently under the cursor</source>
         <translation>跳转到当前光标所在的分组</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="325"/>
+        <location filename="sequence_dialog.ui" line="327"/>
         <source>G</source>
         <translation>G</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="330"/>
+        <location filename="sequence_dialog.ui" line="332"/>
         <source>All Flows</source>
         <translation>所有流</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="333"/>
+        <location filename="sequence_dialog.ui" line="335"/>
         <source>Show flows for all packets</source>
         <translation>显示所有分组</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="336"/>
-        <location filename="sequence_dialog.ui" line="347"/>
+        <location filename="sequence_dialog.ui" line="338"/>
+        <location filename="sequence_dialog.ui" line="349"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="341"/>
+        <location filename="sequence_dialog.ui" line="343"/>
         <source>TCP Flows</source>
         <translation>TCP流</translation>
     </message>
     <message>
-        <location filename="sequence_dialog.ui" line="344"/>
+        <location filename="sequence_dialog.ui" line="346"/>
         <source>Show only TCP flow information</source>
         <translation>只显示 TCP 流的信息</translation>
     </message>
+    <message>
+        <location filename="sequence_dialog.ui" line="354"/>
+        <source>Go To Next Packet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sequence_dialog.ui" line="357"/>
+        <source>Go to the next packet</source>
+        <translation type="unfinished">转到下一分组</translation>
+    </message>
+    <message>
+        <location filename="sequence_dialog.ui" line="360"/>
+        <source>N</source>
+        <translation type="unfinished">N</translation>
+    </message>
+    <message>
+        <location filename="sequence_dialog.ui" line="365"/>
+        <source>Go To Previous Packet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sequence_dialog.ui" line="368"/>
+        <source>Go to the previous packet</source>
+        <translation type="unfinished">转到前一分组</translation>
+    </message>
+    <message>
+        <location filename="sequence_dialog.ui" line="371"/>
+        <source>P</source>
+        <translation type="unfinished">P</translation>
+    </message>
 </context>
 <context>
     <name>ShowPacketBytesDialog</name>
@@ -13648,7 +13710,7 @@ text-decoration: underline;
     <message>
         <location filename="show_packet_bytes_dialog.cpp" line="72"/>
         <source>Quoted-Printable</source>
-        <translation type="unfinished"></translation>
+        <translation>可打印引用</translation>
     </message>
     <message>
         <location filename="show_packet_bytes_dialog.cpp" line="73"/>