[Automatic update for 2019-07-28]

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

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

1 files changed, 77 insertions, 37 deletions

diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 4377bdf354..19a74570b7 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -1758,6 +1758,13 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
     </message>
 </context>
 <context>
+    <name>CopyFromProfileMenu</name>
+    <message>
+        <source>System default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CredentialsDialog</name>
     <message>
         <source>Wireshark - Credentials</source>
@@ -5662,6 +5669,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
         <translation type="unfinished">导入</translation>
     </message>
     <message>
+        <source>Export</source>
+        <translation type="unfinished">导出</translation>
+    </message>
+    <message>
         <source>New</source>
         <oldsource>New...</oldsource>
         <translation>新建</translation>
@@ -8529,12 +8540,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
         <translation>复制该配置文件。</translation>
     </message>
     <message>
+        <source>Configuration Profiles</source>
+        <translation>配置文件</translation>
+    </message>
+    <message>
         <source>Import</source>
+        <comment>noun</comment>
         <translation type="unfinished">导入</translation>
     </message>
     <message>
-        <source>Configuration Profiles</source>
-        <translation>配置文件</translation>
+        <source>Export</source>
+        <comment>noun</comment>
+        <translation type="unfinished">导出</translation>
     </message>
     <message>
         <source>All Profiles</source>
@@ -8549,6 +8566,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>An import of profiles is not allowed, while changes are pending.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>New profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8557,31 +8578,57 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
         <translation>配置文件错误</translation>
     </message>
     <message>
-        <source>Select zip file for import</source>
+        <source>Exporting profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Zip File (*.zip)</source>
+        <source>No profiles found for export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No profiles found for import in %1</source>
+        <source>Select zip file for export</source>
         <translation type="unfinished"></translation>
     </message>
+    <message numerus="yes">
+        <source>%Ln profile(s) have been exported</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
     <message>
-        <source>, %1 profile(s) skipped</source>
+        <source>An error has occured while exporting profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Importing profiles</source>
+        <source>Select zip file for import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>%Ln profile(s) imported</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>, %Ln profile(s) skipped</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Select directory for import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>One profile has been imported</source>
+        <source>Zip File (*.zip)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 profiles have been imported</source>
+        <source>No profiles found for import in %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Importing profiles</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8604,72 +8651,65 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Will be reset to default values</source>
+        <source>system provided</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Created from %1</source>
+        <source>deleted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(system provided)</source>
+        <source>copy</source>
+        <comment>noun</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(deleted)</source>
+        <source>Exporting profiles while changes are pending is not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default</source>
-        <translation type="unfinished">默认</translation>
-    </message>
-    <message>
-        <source>System</source>
-        <translation type="unfinished">系统</translation>
-    </message>
-    <message>
-        <source>Renamed from: </source>
+        <source>No profiles found to export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is a system provided profile.</source>
+        <source>A profile name cannot contain the following characters: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The profile will be reset to default values.</source>
+        <source>A profile name cannot contain the &apos;/&apos; character.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A profile already exists with this name.</source>
+        <source>A profile cannot start or end with a period (.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A profile already exists with this name</source>
-        <translation type="unfinished"></translation>
+        <source>Default</source>
+        <translation type="unfinished">默认</translation>
     </message>
     <message>
-        <source>Profile</source>
-        <translation type="unfinished"></translation>
+        <source>System</source>
+        <translation type="unfinished">系统</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation type="unfinished">类型</translation>
+        <source>Renamed from: </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation type="unfinished">路径</translation>
+        <source>This is a system provided profile.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>copy</source>
+        <source>A profile already exists with this name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A profile must not contain any of the following characters: %1</source>
+        <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A profile must not start or end with a period (.)</source>
-        <translation type="unfinished"></translation>
+        <source>Type</source>
+        <translation type="unfinished">类型</translation>
     </message>
 </context>
 <context>