[Automatic update for 2017-11-12]

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

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

7 files changed, 177 insertions, 144 deletions

diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index ab3f63d781..e62363045e 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -611,15 +611,7 @@
     <name>ByteViewText</name>
     <message>
         <source>Show bytes as hexadecimal</source>
-        <translation>Bytes in Hexadezimal anzeigen</translation>
-    </message>
-    <message>
-        <source>Byte %1</source>
-        <translation type="vanished">Bytes %1</translation>
-    </message>
-    <message>
-        <source>Bytes %1-%2</source>
-        <translation type="vanished">Bytes %1-%2</translation>
+        <translation type="vanished">Bytes in Hexadezimal anzeigen</translation>
     </message>
 </context>
 <context>
@@ -4889,6 +4881,22 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
         <translation>Keine Experten-Informationen</translation>
     </message>
     <message>
+        <source>, 1 byte</source>
+        <translation type="unfinished">, 1 Byte</translation>
+    </message>
+    <message>
+        <source>, %1 bytes</source>
+        <translation type="unfinished">, %1 Bytes</translation>
+    </message>
+    <message>
+        <source>Byte %1</source>
+        <translation type="unfinished">Byte %1</translation>
+    </message>
+    <message>
+        <source>Bytes %1-%2</source>
+        <translation type="unfinished">Bytes %1-%2</translation>
+    </message>
+    <message>
         <source>Profile: </source>
         <translation>Profil:</translation>
     </message>
@@ -7087,11 +7095,11 @@ text-decoration: underline;
     </message>
     <message>
         <source>Byte %1</source>
-        <translation type="unfinished">Bytes %1</translation>
+        <translation type="vanished">Byte %1</translation>
     </message>
     <message>
         <source>Bytes %1-%2</source>
-        <translation type="unfinished">Bytes %1-%2</translation>
+        <translation type="vanished">Bytes %1-%2</translation>
     </message>
     <message>
         <source>SSL Session Keys (*.keys *.txt);;All Files (</source>
@@ -7552,7 +7560,11 @@ text-decoration: underline;
     <name>PacketCommentDialog</name>
     <message>
         <source>Packet Comment</source>
-        <translation>Paketkommentar</translation>
+        <translation type="vanished">Paketkommentar</translation>
+    </message>
+    <message>
+        <source>Packet %1 Comment</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7575,11 +7587,11 @@ text-decoration: underline;
     </message>
     <message>
         <source>Byte %1</source>
-        <translation type="unfinished">Bytes %1</translation>
+        <translation>Byte %1</translation>
     </message>
     <message>
         <source>Bytes %1-%2</source>
-        <translation type="unfinished">Bytes %1-%2</translation>
+        <translation>Bytes %1-%2</translation>
     </message>
 </context>
 <context>
@@ -7956,11 +7968,11 @@ text-decoration: underline;
     </message>
     <message>
         <source>, 1 byte</source>
-        <translation>, 1 Byte</translation>
+        <translation type="vanished">, 1 Byte</translation>
     </message>
     <message>
         <source>, %1 bytes</source>
-        <translation>, %1 Bytes</translation>
+        <translation type="vanished">, %1 Bytes</translation>
     </message>
 </context>
 <context>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index 6cf616d92c..63bf0d9b9c 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -608,13 +608,6 @@
     </message>
 </context>
 <context>
-    <name>ByteViewText</name>
-    <message>
-        <source>Show bytes as hexadecimal</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>CaptureFile</name>
     <message>
         <source> [closing]</source>
@@ -4821,6 +4814,22 @@ PLEASE NOTE: One option MUST be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>, 1 byte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, %1 bytes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Byte %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bytes %1-%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Profile: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -6988,14 +6997,6 @@ a:hover {
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Byte %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bytes %1-%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>SSL Session Keys (*.keys *.txt);;All Files (</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7453,7 +7454,7 @@ a:hover {
 <context>
     <name>PacketCommentDialog</name>
     <message>
-        <source>Packet Comment</source>
+        <source>Packet %1 Comment</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -7854,14 +7855,6 @@ a:hover {
         <source>Colorize with Filter</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>, 1 byte</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, %1 bytes</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>ProtocolHierarchyDialog</name>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index b4cee455ce..8b53e127e2 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -611,15 +611,7 @@
     <name>ByteViewText</name>
     <message>
         <source>Show bytes as hexadecimal</source>
-        <translation>Afficher les octets en hexadécimal</translation>
-    </message>
-    <message>
-        <source>Byte %1</source>
-        <translation type="vanished">Octets %1</translation>
-    </message>
-    <message>
-        <source>Bytes %1-%2</source>
-        <translation type="vanished">Octets %1-%2</translation>
+        <translation type="vanished">Afficher les octets en hexadécimal</translation>
     </message>
 </context>
 <context>
@@ -4888,6 +4880,22 @@ NOTE: Une option DOIT être sélectionnée.</translation>
         <translation>Pas d&apos;information expert</translation>
     </message>
     <message>
+        <source>, 1 byte</source>
+        <translation type="unfinished">, 1 octet</translation>
+    </message>
+    <message>
+        <source>, %1 bytes</source>
+        <translation type="unfinished">, %1 octets</translation>
+    </message>
+    <message>
+        <source>Byte %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bytes %1-%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Profile: </source>
         <translation>Profil: </translation>
     </message>
@@ -7055,14 +7063,6 @@ a:hover {
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Byte %1</source>
-        <translation type="unfinished">Octets %1</translation>
-    </message>
-    <message>
-        <source>Bytes %1-%2</source>
-        <translation type="unfinished">Octets %1-%2</translation>
-    </message>
-    <message>
         <source>SSL Session Keys (*.keys *.txt);;All Files (</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7523,7 +7523,11 @@ a:hover {
     <name>PacketCommentDialog</name>
     <message>
         <source>Packet Comment</source>
-        <translation>Commentaire du paquet</translation>
+        <translation type="vanished">Commentaire du paquet</translation>
+    </message>
+    <message>
+        <source>Packet %1 Comment</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7546,11 +7550,11 @@ a:hover {
     </message>
     <message>
         <source>Byte %1</source>
-        <translation type="unfinished">Octets %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bytes %1-%2</source>
-        <translation type="unfinished">Octets %1-%2</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7927,11 +7931,11 @@ a:hover {
     </message>
     <message>
         <source>, 1 byte</source>
-        <translation>, 1 octet</translation>
+        <translation type="vanished">, 1 octet</translation>
     </message>
     <message>
         <source>, %1 bytes</source>
-        <translation>, %1 octets</translation>
+        <translation type="vanished">, %1 octets</translation>
     </message>
 </context>
 <context>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index 62a23fd7e0..cad104867e 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -611,15 +611,7 @@
     <name>ByteViewText</name>
     <message>
         <source>Show bytes as hexadecimal</source>
-        <translation>Mostra byte in esadecimale</translation>
-    </message>
-    <message>
-        <source>Byte %1</source>
-        <translation type="vanished">Byte %1</translation>
-    </message>
-    <message>
-        <source>Bytes %1-%2</source>
-        <translation type="vanished">Byte %1-%2</translation>
+        <translation type="vanished">Mostra byte in esadecimale</translation>
     </message>
 </context>
 <context>
@@ -4888,6 +4880,22 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
         <translation>Nessuna informazione per esperti</translation>
     </message>
     <message>
+        <source>, 1 byte</source>
+        <translation type="unfinished">, 1 byte</translation>
+    </message>
+    <message>
+        <source>, %1 bytes</source>
+        <translation type="unfinished">, %1 byte</translation>
+    </message>
+    <message>
+        <source>Byte %1</source>
+        <translation type="unfinished">Byte %1</translation>
+    </message>
+    <message>
+        <source>Bytes %1-%2</source>
+        <translation type="unfinished">Byte %1-%2</translation>
+    </message>
+    <message>
         <source>Profile: </source>
         <translation>Profilo: </translation>
     </message>
@@ -7086,11 +7094,11 @@ a:hover {
     </message>
     <message>
         <source>Byte %1</source>
-        <translation type="unfinished">Byte %1</translation>
+        <translation type="vanished">Byte %1</translation>
     </message>
     <message>
         <source>Bytes %1-%2</source>
-        <translation type="unfinished">Byte %1-%2</translation>
+        <translation type="vanished">Byte %1-%2</translation>
     </message>
     <message>
         <source>SSL Session Keys (*.keys *.txt);;All Files (</source>
@@ -7551,7 +7559,11 @@ a:hover {
     <name>PacketCommentDialog</name>
     <message>
         <source>Packet Comment</source>
-        <translation>Commento del Pacchetto</translation>
+        <translation type="vanished">Commento del Pacchetto</translation>
+    </message>
+    <message>
+        <source>Packet %1 Comment</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7574,11 +7586,11 @@ a:hover {
     </message>
     <message>
         <source>Byte %1</source>
-        <translation type="unfinished">Byte %1</translation>
+        <translation>Byte %1</translation>
     </message>
     <message>
         <source>Bytes %1-%2</source>
-        <translation type="unfinished">Byte %1-%2</translation>
+        <translation>Byte %1-%2</translation>
     </message>
 </context>
 <context>
@@ -7955,11 +7967,11 @@ a:hover {
     </message>
     <message>
         <source>, 1 byte</source>
-        <translation>, 1 byte</translation>
+        <translation type="vanished">, 1 byte</translation>
     </message>
     <message>
         <source>, %1 bytes</source>
-        <translation>, %1 byte</translation>
+        <translation type="vanished">, %1 byte</translation>
     </message>
 </context>
 <context>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index f311826f82..e683f57113 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -611,15 +611,7 @@
     <name>ByteViewText</name>
     <message>
         <source>Show bytes as hexadecimal</source>
-        <translation>16進数でバイト列を表示</translation>
-    </message>
-    <message>
-        <source>Byte %1</source>
-        <translation type="vanished">バイト %1</translation>
-    </message>
-    <message>
-        <source>Bytes %1-%2</source>
-        <translation type="vanished">バイト %1-%2</translation>
+        <translation type="vanished">16進数でバイト列を表示</translation>
     </message>
 </context>
 <context>
@@ -4876,6 +4868,22 @@ PLEASE NOTE: One option MUST be selected.</source>
         <translation>エキスパート情報はありません</translation>
     </message>
     <message>
+        <source>, 1 byte</source>
+        <translation type="unfinished">, 1 バイト</translation>
+    </message>
+    <message>
+        <source>, %1 bytes</source>
+        <translation type="unfinished">, %1 バイト</translation>
+    </message>
+    <message>
+        <source>Byte %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bytes %1-%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Profile: </source>
         <translation>プロファイル:</translation>
     </message>
@@ -7041,14 +7049,6 @@ a:hover {
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Byte %1</source>
-        <translation type="unfinished">バイト %1</translation>
-    </message>
-    <message>
-        <source>Bytes %1-%2</source>
-        <translation type="unfinished">バイト %1-%2</translation>
-    </message>
-    <message>
         <source>SSL Session Keys (*.keys *.txt);;All Files (</source>
         <translation>SSLセッション鍵 (*.keys *.txt);;すべてのファイル (</translation>
     </message>
@@ -7507,7 +7507,11 @@ a:hover {
     <name>PacketCommentDialog</name>
     <message>
         <source>Packet Comment</source>
-        <translation>パケットコメント</translation>
+        <translation type="vanished">パケットコメント</translation>
+    </message>
+    <message>
+        <source>Packet %1 Comment</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7530,11 +7534,11 @@ a:hover {
     </message>
     <message>
         <source>Byte %1</source>
-        <translation type="unfinished">バイト %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bytes %1-%2</source>
-        <translation type="unfinished">バイト %1-%2</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7911,11 +7915,11 @@ a:hover {
     </message>
     <message>
         <source>, 1 byte</source>
-        <translation>, 1 バイト</translation>
+        <translation type="vanished">, 1 バイト</translation>
     </message>
     <message>
         <source>, %1 bytes</source>
-        <translation>, %1 バイト</translation>
+        <translation type="vanished">, %1 バイト</translation>
     </message>
 </context>
 <context>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index 7cd2455e58..322a58b95b 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -611,15 +611,7 @@
     <name>ByteViewText</name>
     <message>
         <source>Show bytes as hexadecimal</source>
-        <translation>Pokaż szesnastkowo</translation>
-    </message>
-    <message>
-        <source>Byte %1</source>
-        <translation type="vanished">Bajt %1</translation>
-    </message>
-    <message>
-        <source>Bytes %1-%2</source>
-        <translation type="vanished">Bajty %1-%2</translation>
+        <translation type="vanished">Pokaż szesnastkowo</translation>
     </message>
 </context>
 <context>
@@ -4889,6 +4881,22 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
         <translation>Brak informacji eksperckiej</translation>
     </message>
     <message>
+        <source>, 1 byte</source>
+        <translation type="unfinished">, 1 bajt</translation>
+    </message>
+    <message>
+        <source>, %1 bytes</source>
+        <translation type="unfinished">, %1 bajtów</translation>
+    </message>
+    <message>
+        <source>Byte %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bytes %1-%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Profile: </source>
         <translation>Profil: </translation>
     </message>
@@ -7088,14 +7096,6 @@ text-decoration: underline;
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Byte %1</source>
-        <translation type="unfinished">Bajt %1</translation>
-    </message>
-    <message>
-        <source>Bytes %1-%2</source>
-        <translation type="unfinished">Bajty %1-%2</translation>
-    </message>
-    <message>
         <source>SSL Session Keys (*.keys *.txt);;All Files (</source>
         <translation>Klucze sesji SSL (*.keys *.txt);; Dowolny plik (</translation>
     </message>
@@ -7554,7 +7554,11 @@ text-decoration: underline;
     <name>PacketCommentDialog</name>
     <message>
         <source>Packet Comment</source>
-        <translation>Komentarz pakietu</translation>
+        <translation type="vanished">Komentarz pakietu</translation>
+    </message>
+    <message>
+        <source>Packet %1 Comment</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7577,11 +7581,11 @@ text-decoration: underline;
     </message>
     <message>
         <source>Byte %1</source>
-        <translation type="unfinished">Bajt %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bytes %1-%2</source>
-        <translation type="unfinished">Bajty %1-%2</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7957,11 +7961,11 @@ text-decoration: underline;
     </message>
     <message>
         <source>, 1 byte</source>
-        <translation>, 1 bajt</translation>
+        <translation type="vanished">, 1 bajt</translation>
     </message>
     <message>
         <source>, %1 bytes</source>
-        <translation>, %1 bajtów</translation>
+        <translation type="vanished">, %1 bajtów</translation>
     </message>
 </context>
 <context>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index ce2c0875ba..396c05fc3a 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -611,15 +611,7 @@
     <name>ByteViewText</name>
     <message>
         <source>Show bytes as hexadecimal</source>
-        <translation>以十六进制显示字节</translation>
-    </message>
-    <message>
-        <source>Byte %1</source>
-        <translation type="vanished">字节 %1</translation>
-    </message>
-    <message>
-        <source>Bytes %1-%2</source>
-        <translation type="vanished">字节 %1-%2</translation>
+        <translation type="vanished">以十六进制显示字节</translation>
     </message>
 </context>
 <context>
@@ -4873,6 +4865,22 @@ PLEASE NOTE: One option MUST be selected.</source>
         <translation>无专家信息</translation>
     </message>
     <message>
+        <source>, 1 byte</source>
+        <translation type="unfinished">, 1 字节</translation>
+    </message>
+    <message>
+        <source>, %1 bytes</source>
+        <translation type="unfinished">, %1 字节</translation>
+    </message>
+    <message>
+        <source>Byte %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bytes %1-%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Profile: </source>
         <translation>配置文件: </translation>
     </message>
@@ -7068,14 +7076,6 @@ text-decoration: underline;
         <translation>合并文件</translation>
     </message>
     <message>
-        <source>Byte %1</source>
-        <translation type="unfinished">字节 %1</translation>
-    </message>
-    <message>
-        <source>Bytes %1-%2</source>
-        <translation type="unfinished">字节 %1-%2</translation>
-    </message>
-    <message>
         <source>SSL Session Keys (*.keys *.txt);;All Files (</source>
         <translation>SSL 会话密钥 (*.keys *.txt);;所有文件 (</translation>
     </message>
@@ -7534,7 +7534,11 @@ text-decoration: underline;
     <name>PacketCommentDialog</name>
     <message>
         <source>Packet Comment</source>
-        <translation>分组注释</translation>
+        <translation type="vanished">分组注释</translation>
+    </message>
+    <message>
+        <source>Packet %1 Comment</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7557,11 +7561,11 @@ text-decoration: underline;
     </message>
     <message>
         <source>Byte %1</source>
-        <translation type="unfinished">字节 %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bytes %1-%2</source>
-        <translation type="unfinished">字节 %1-%2</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7937,11 +7941,11 @@ text-decoration: underline;
     </message>
     <message>
         <source>, 1 byte</source>
-        <translation>, 1 字节</translation>
+        <translation type="vanished">, 1 字节</translation>
     </message>
     <message>
         <source>, %1 bytes</source>
-        <translation>, %1 字节</translation>
+        <translation type="vanished">, %1 字节</translation>
     </message>
 </context>
 <context>