From e86880bede5560066d8df1d47de5e1e3c78022b4 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Sun, 1 Sep 2019 08:21:50 +0000
Subject: [Automatic update for 2019-09-01]

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

Change-Id: I4a345c6e326c653b8e121126f1afe1005293725a
Reviewed-on: https://code.wireshark.org/review/34415
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
 ui/qt/wireshark_zh_CN.ts | 79 +++++++++++++++++++++++++++++++++---------------
 1 file changed, 55 insertions(+), 24 deletions(-)

(limited to 'ui/qt/wireshark_zh_CN.ts')

diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index cfb1baf455..b1f86a8941 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -1596,7 +1596,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
     </message>
     <message>
         <source>Copy from</source>
-        <translation>复制自</translation>
+        <translation type="vanished">复制自</translation>
     </message>
     <message>
         <source>Copy coloring rules from another profile.</source>
@@ -1758,7 +1758,15 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
     </message>
 </context>
 <context>
-    <name>CopyFromProfileMenu</name>
+    <name>CopyFromProfileButton</name>
+    <message>
+        <source>Copy from</source>
+        <translation type="unfinished">复制自</translation>
+    </message>
+    <message>
+        <source>Copy entries from another profile.</source>
+        <translation type="unfinished">从其他配置文件复制条目。</translation>
+    </message>
     <message>
         <source>System default</source>
         <translation type="unfinished"></translation>
@@ -1944,6 +1952,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
         <source>Manage saved bookmarks.</source>
         <translation>管理保存的书签。</translation>
     </message>
+    <message>
+        <source>Clear display filter</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Apply this filter string to the display.</source>
         <translation>将此过滤字符串应用于显示。</translation>
@@ -1980,14 +1992,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
         <source>Manage Filter Expressions</source>
         <translation>管理过滤器表达式</translation>
     </message>
-    <message>
-        <source>Selected</source>
-        <translation type="unfinished">选中</translation>
-    </message>
-    <message>
-        <source>Not Selected</source>
-        <translation type="unfinished">非选中</translation>
-    </message>
 </context>
 <context>
     <name>DisplayFilterExpressionDialog</name>
@@ -2146,6 +2150,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
         <source>Enabled Protocols</source>
         <translation>已启用的协议</translation>
     </message>
+    <message>
+        <source>Everywhere</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only Protocols</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only Description</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EnabledProtocolsModel</name>
@@ -2544,6 +2560,17 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
         <translation>大小</translation>
     </message>
 </context>
+<context>
+    <name>FilterAction</name>
+    <message>
+        <source>Selected</source>
+        <translation type="unfinished">选中</translation>
+    </message>
+    <message>
+        <source>Not Selected</source>
+        <translation type="unfinished">非选中</translation>
+    </message>
+</context>
 <context>
     <name>FilterDialog</name>
     <message>
@@ -3596,7 +3623,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
     </message>
     <message>
         <source>Copy from</source>
-        <translation>复制自</translation>
+        <translation type="vanished">复制自</translation>
     </message>
     <message>
         <source>Copy graphs from another profile.</source>
@@ -6185,15 +6212,15 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
     </message>
     <message>
         <source>&amp;Selected</source>
-        <translation>选中(&amp;S)</translation>
+        <translation type="vanished">选中(&amp;S)</translation>
     </message>
     <message>
         <source>&amp;Not Selected</source>
-        <translation>非选中(&amp;N)</translation>
+        <translation type="vanished">非选中(&amp;N)</translation>
     </message>
     <message>
         <source>Not Selected</source>
-        <translation>非选中</translation>
+        <translation type="vanished">非选中</translation>
     </message>
     <message>
         <source>Close this capture file</source>
@@ -6942,35 +6969,35 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
     </message>
     <message>
         <source>…&amp;and Selected</source>
-        <translation>…与选中(&amp;A)</translation>
+        <translation type="vanished">…与选中(&amp;A)</translation>
     </message>
     <message>
         <source>…and Selected</source>
-        <translation>…与选中</translation>
+        <translation type="vanished">…与选中</translation>
     </message>
     <message>
         <source>…&amp;or Selected</source>
-        <translation>…或选中(&amp;O)</translation>
+        <translation type="vanished">…或选中(&amp;O)</translation>
     </message>
     <message>
         <source>…or Selected</source>
-        <translation>…或选中</translation>
+        <translation type="vanished">…或选中</translation>
     </message>
     <message>
         <source>…a&amp;nd not Selected</source>
-        <translation>…与非选中(&amp;N)</translation>
+        <translation type="vanished">…与非选中(&amp;N)</translation>
     </message>
     <message>
         <source>…and not Selected</source>
-        <translation>…与非选中</translation>
+        <translation type="vanished">…与非选中</translation>
     </message>
     <message>
         <source>…o&amp;r not Selected</source>
-        <translation>…或非选中(&amp;R)</translation>
+        <translation type="vanished">…或非选中(&amp;R)</translation>
     </message>
     <message>
         <source>…or not Selected</source>
-        <translation>…或非选中</translation>
+        <translation type="vanished">…或非选中</translation>
     </message>
     <message>
         <source>Display Filter &amp;Macros…</source>
@@ -9079,6 +9106,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
         <source>Any </source>
         <translation>任何</translation>
     </message>
+    <message>
+        <source>Prepare as Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Don&apos;t show this message again.</source>
         <translation>不再显示此消息。</translation>
@@ -12875,11 +12906,11 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
     </message>
     <message>
         <source>Copy from</source>
-        <translation>复制自</translation>
+        <translation type="vanished">复制自</translation>
     </message>
     <message>
         <source>Copy entries from another profile.</source>
-        <translation>从其他配置文件复制条目。</translation>
+        <translation type="vanished">从其他配置文件复制条目。</translation>
     </message>
     <message>
         <source>Open </source>
-- 
cgit v1.2.3