[Automatic update for 2017-10-01]

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

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

1 files changed, 8 insertions, 259 deletions

diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 5e165a7dad..c26d1e73bb 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -4350,253 +4350,18 @@ PLEASE NOTE: One option MUST be selected.</source>
 </context>
 <context>
     <name>LBMUIMFlowDialog</name>
-    <message>
-        <source>LBM UIM Flows</source>
-        <translation type="vanished">LBM UIM流</translation>
-    </message>
-    <message>
-        <source>&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;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;
-
-&lt;h3&gt;有价值的节省时间的快捷键&lt;/h3&gt;
-&lt;table&gt;&lt;tbody&gt;
-
-&lt;tr&gt;&lt;th&gt;0&lt;/th&gt;&lt;td&gt;复位图形到初始状态&lt;/td&gt;&lt;/th&gt;
-
-&lt;tr&gt;&lt;th&gt;→&lt;/th&gt;&lt;td&gt;右移10个像素&lt;/td&gt;&lt;/th&gt;
-&lt;tr&gt;&lt;th&gt;←&lt;/th&gt;&lt;td&gt;左移10个像素&lt;/td&gt;&lt;/th&gt;
-&lt;tr&gt;&lt;th&gt;↑&lt;/th&gt;&lt;td&gt;上移10个像素&lt;/td&gt;&lt;/th&gt;
-&lt;tr&gt;&lt;th&gt;↓&lt;/th&gt;&lt;td&gt;下移10个像素&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;右移一个像素&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;左移一个像素&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;上移一个像素&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;下移一个像素&lt;/td&gt;&lt;/th&gt;
-
-&lt;tr&gt;&lt;th&gt;g&lt;/th&gt;&lt;td&gt;跳转到光标所在分组&lt;/td&gt;&lt;/th&gt;
-
-&lt;/tbody&gt;&lt;/table&gt;
-&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;small&gt;&lt;i&gt;A hint&lt;/i&gt;&lt;/small&gt;</source>
-        <translation type="vanished">&lt;small&gt;&lt;i&gt;提示&lt;/i&gt;&lt;/small&gt;</translation>
-    </message>
-    <message>
-        <source>Show:</source>
-        <translation type="vanished">显示:</translation>
-    </message>
-    <message>
-        <source>All packets</source>
-        <translation type="vanished">所有分组</translation>
-    </message>
-    <message>
-        <source>Displayed packets</source>
-        <translation type="vanished">显示的分组</translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="vanished">复位</translation>
-    </message>
-    <message>
-        <source>Reset Diagram</source>
-        <translation type="vanished">复位图表</translation>
-    </message>
-    <message>
-        <source>Reset the diagram to its initial state.</source>
-        <translation type="vanished">复位图表到初始状态。</translation>
-    </message>
-    <message>
-        <source>0</source>
-        <translation type="vanished">0</translation>
-    </message>
-    <message>
-        <source>Move Up 10 Pixels</source>
-        <translation type="vanished">上移10像素</translation>
-    </message>
-    <message>
-        <source>Move up 10 pixels</source>
-        <translation type="vanished">上移10像素</translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="vanished">上方向键</translation>
-    </message>
-    <message>
-        <source>Move Left 10 Pixels</source>
-        <translation type="vanished">左移10像素</translation>
-    </message>
-    <message>
-        <source>Move left 10 pixels</source>
-        <translation type="vanished">左移10像素</translation>
-    </message>
-    <message>
-        <source>Left</source>
-        <translation type="vanished">左方向键</translation>
-    </message>
-    <message>
-        <source>Move Right 10 Pixels</source>
-        <translation type="vanished">右移10像素</translation>
-    </message>
-    <message>
-        <source>Move right 10 pixels</source>
-        <translation type="vanished">右移10像素</translation>
-    </message>
-    <message>
-        <source>Right</source>
-        <translation type="vanished">右方向键</translation>
-    </message>
-    <message>
-        <source>Move Down 10 Pixels</source>
-        <translation type="vanished">下移10像素</translation>
-    </message>
-    <message>
-        <source>Move down 10 pixels</source>
-        <translation type="vanished">下移10像素</translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="vanished">下方向键</translation>
-    </message>
-    <message>
-        <source>Move Up 1 Pixel</source>
-        <translation type="vanished">上移1像素</translation>
-    </message>
-    <message>
-        <source>Move up 1 pixel</source>
-        <translation type="vanished">上移1像素</translation>
-    </message>
-    <message>
-        <source>Shift+Up</source>
-        <translation type="vanished">Shift+上方向键</translation>
-    </message>
-    <message>
-        <source>Move Left 1 Pixel</source>
-        <translation type="vanished">左移1像素</translation>
-    </message>
-    <message>
-        <source>Move left 1 pixel</source>
-        <translation type="vanished">左移1像素</translation>
-    </message>
-    <message>
-        <source>Shift+Left</source>
-        <translation type="vanished">Shift+右方向键</translation>
-    </message>
-    <message>
-        <source>Move Right 1 Pixel</source>
-        <translation type="vanished">右移1像素</translation>
-    </message>
-    <message>
-        <source>Move right 1 pixel</source>
-        <translation type="vanished">右移1像素</translation>
-    </message>
-    <message>
-        <source>Shift+Right</source>
-        <translation type="vanished">Shift+右方向键</translation>
-    </message>
-    <message>
-        <source>Move Down 1 Pixel</source>
-        <translation type="vanished">下移1像素</translation>
-    </message>
-    <message>
-        <source>Move down 1 pixel</source>
-        <translation type="vanished">下移1像素</translation>
-    </message>
-    <message>
-        <source>Shift+Down</source>
-        <translation type="vanished">Shift+下方向键</translation>
-    </message>
-    <message>
-        <source>Go To Packet Under Cursor</source>
-        <translation type="vanished">跳转到光标所在的分组</translation>
-    </message>
-    <message>
-        <source>Go to packet currently under the cursor</source>
-        <translation type="vanished">跳转到当前光标所在的分组</translation>
-    </message>
-    <message>
-        <source>G</source>
-        <translation type="vanished">G</translation>
-    </message>
-    <message>
-        <source>All Flows</source>
-        <translation type="vanished">所有流</translation>
-    </message>
-    <message>
-        <source>Show flows for all packets</source>
-        <translation type="vanished">显示所有分组</translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="vanished">1</translation>
-    </message>
-    <message>
-        <source>TCP Flows</source>
-        <translation type="vanished">TCP流</translation>
-    </message>
-    <message>
-        <source>Show only TCP flow information</source>
-        <translation type="vanished">只显示 TCP 流的信息</translation>
-    </message>
-    <message>
-        <source>Save As</source>
-        <oldsource>Save As...</oldsource>
-        <translation type="vanished">另存为</translation>
-    </message>
     <message numerus="yes">
         <source>%Ln node(s)</source>
-        <translation type="vanished">
-            <numerusform>%Ln 节点</numerusform>
+        <translation type="obsolete">
+            <numerusform>%Ln node</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%Ln item(s)</source>
-        <translation type="vanished">
-            <numerusform>%Ln 项目</numerusform>
+        <translation type="obsolete">
+            <numerusform>%Ln item</numerusform>
         </translation>
     </message>
-    <message>
-        <source>Portable Document Format (*.pdf)</source>
-        <translation type="vanished">便携式文档格式 (*.pdf)</translation>
-    </message>
-    <message>
-        <source>Portable Network Graphics (*.png)</source>
-        <translation type="vanished">便携式网络图形格式 (*.png)</translation>
-    </message>
-    <message>
-        <source>Windows Bitmap (*.bmp)</source>
-        <translation type="vanished">Windows 位图 (*.bmp)</translation>
-    </message>
-    <message>
-        <source>JPEG File Interchange Format (*.jpeg *.jpg)</source>
-        <translation type="vanished">JPEG 文件交换格式 (*.jpeg *.jpg)</translation>
-    </message>
-    <message>
-        <source>ASCII (*.txt)</source>
-        <translation type="vanished">ASCII (*.txt)</translation>
-    </message>
-    <message>
-        <source>Save Graph As</source>
-        <translation type="vanished">保存图形为</translation>
-    </message>
 </context>
 <context>
     <name>LayoutPreferencesFrame</name>
@@ -6319,10 +6084,6 @@ text-decoration: underline;
         <translation>流</translation>
     </message>
     <message>
-        <source>Stream Flow Graph</source>
-        <translation type="vanished">流图</translation>
-    </message>
-    <message>
         <source>LBT-RM</source>
         <translation>LBT-RM</translation>
     </message>
@@ -10788,18 +10549,6 @@ text-decoration: underline;
         <translation>&lt;small&gt;&lt;i&gt;提示&lt;/i&gt;&lt;/small&gt;</translation>
     </message>
     <message>
-        <source>Show:</source>
-        <translation type="vanished">显示:</translation>
-    </message>
-    <message>
-        <source>All packets</source>
-        <translation type="vanished">所有分组</translation>
-    </message>
-    <message>
-        <source>Displayed packets</source>
-        <translation type="vanished">显示的分组</translation>
-    </message>
-    <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Only show flows matching the current display filter&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11398,6 +11147,10 @@ text-decoration: underline;
         <translation>缩放</translation>
     </message>
     <message>
+        <source>Display Round Trip Time vs Sequence Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>RTT By Sequence Number</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11802,10 +11555,6 @@ text-decoration: underline;
         <source>Save Graph As</source>
         <translation>保存图形为</translation>
     </message>
-    <message>
-        <source>Display Round Trip Time vs Sequence Number</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>TapParameterDialog</name>