[Automatic update for 2017-09-17]

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

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

9 files changed, 100 insertions, 122 deletions

diff --git a/enterprises.tsv b/enterprises.tsv
index 6739b2086e..6e88d51aa7 100644
--- a/enterprises.tsv
+++ b/enterprises.tsv
@@ -5,7 +5,7 @@
 # The format used here is: <NUMERICAL_ID><SPACE><NAME>
 # Where SPACE can be any sequence of spaces and tabs.
 #
-# (last updated 2017-09-09)
+# (last updated 2017-09-16)
 
 0	Reserved
 1	NxNetworks
@@ -2506,7 +2506,7 @@
 2501	Yago Systems, Inc.
 2502	LunarWave Communications
 2503	Bangkok Pattaya Hospital
-2504	Roke Manor Research Limited Keith
+2504	Roke Manor Research Limited
 2505	New Oak Communications, Inc.
 2506	Bug Free Development
 2507	ARC Technologies Group, Inc.
@@ -50495,3 +50495,26 @@
 50675	TRANSMASH-TOMSK
 50676	Essenjay Technology
 50677	datacrumbs
+50678	Cihan Aydin
+50679	Hanssens Telecom
+50680	SomaLogic Inc.
+50681	IPHolders Inc.
+50682	SKB Prominform
+50683	NETMA
+50684	Xantaro
+50685	OSZ Informations- und Medizintechnik
+50686	Blue Cedar
+50687	Energyfive
+50688	GRIDNET
+50689	Uila Inc.
+50690	Space Exploration Technologies
+50691	Janus Technology Ltda.
+50692	Embrapa Sede
+50693	ATEA Baltic
+50694	Symanitron-electronics
+50695	ENLITEON Limited
+50696	Brightways Corporation
+50697	Cafari Inc.
+50698	North Central Texas Council of Governments
+50699	ASiO
+50700	Ulrich Busch
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index b0c617bee1..d212411e44 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -2818,6 +2818,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x1e71, "NZXT" },
     { 0x1e74, "Coby Electronics Corporation" },
     { 0x1e7d, "ROCCAT" },
+    { 0x1ea7, "SHARKOON Technologies GmbH" },
     { 0x1ebb, "NuCORE Technology, Inc." },
     { 0x1eda, "AirTies Wireless Networks" },
     { 0x1edb, "Blackmagic design" },
@@ -18880,6 +18881,8 @@ static const value_string usb_products_vals[] = {
     { 0x1e7d2d50, "Kova+ Mouse" },
     { 0x1e7d2d51, "Kone+ Mouse" },
     { 0x1e7d30d4, "Arvo Keyboard" },
+    { 0x1ea70066, "[Mediatrack Edge Mini Keyboard]" },
+    { 0x1ea72007, "SHARK ZONE K30 Illuminated Gaming Keyboard" },
     { 0x1eda2012, "Air2210 54 Mbps Wireless Adapter" },
     { 0x1eda2210, "Air2210 54 Mbps Wireless Adapter" },
     { 0x1eda2310, "Air2310 150 Mbps Wireless Adapter" },
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 338b7d83e9..7d2f2235c7 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -1518,39 +1518,39 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
     <name>DecodeAsDialog</name>
     <message>
         <source>Field</source>
-        <translation>Feld</translation>
+        <translation type="vanished">Feld</translation>
     </message>
     <message>
         <source>Match using this field</source>
-        <translation>Übereinstimmend mit diesem Feld</translation>
+        <translation type="vanished">Übereinstimmend mit diesem Feld</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Wert</translation>
+        <translation type="vanished">Wert</translation>
     </message>
     <message>
         <source>Current &quot;Decode As&quot; behavior</source>
-        <translation>Aktuelles &quot;Dekodieren als&quot;-Verhalten</translation>
+        <translation type="vanished">Aktuelles &quot;Dekodieren als&quot;-Verhalten</translation>
     </message>
     <message>
         <source>Type</source>
-        <translation>Typ</translation>
+        <translation type="vanished">Typ</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation>Standard</translation>
+        <translation type="vanished">Standard</translation>
     </message>
     <message>
         <source>Default &quot;Decode As&quot; behavior</source>
-        <translation>Standard &quot;Dekodieren als&quot;-Verhalten</translation>
+        <translation type="vanished">Standard &quot;Dekodieren als&quot;-Verhalten</translation>
     </message>
     <message>
         <source>Current</source>
-        <translation>Aktuell</translation>
+        <translation type="vanished">Aktuell</translation>
     </message>
     <message>
         <source>Change behavior when the protocol field matches this value</source>
-        <translation>Wenn dieser Wert auf das Protokollfeld zutrifft, soll das Verhalten geändert werden</translation>
+        <translation type="vanished">Wenn dieser Wert auf das Protokollfeld zutrifft, soll das Verhalten geändert werden</translation>
     </message>
     <message>
         <source>Change the dissection behavior for a protocol.</source>
@@ -1570,15 +1570,15 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
     </message>
     <message>
         <source>String</source>
-        <translation>Zeichenkette</translation>
+        <translation type="vanished">Zeichenkette</translation>
     </message>
     <message>
         <source>Integer, base </source>
-        <translation>Integer, base</translation>
+        <translation type="vanished">Integer, base</translation>
     </message>
     <message>
         <source>unknown</source>
-        <translation>unbekannt</translation>
+        <translation type="vanished">unbekannt</translation>
     </message>
 </context>
 <context>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index d7592541ac..6e87b5cf47 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -1514,42 +1514,6 @@ PLEASE NOTE: One option MUST be selected.</source>
 <context>
     <name>DecodeAsDialog</name>
     <message>
-        <source>Field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Match using this field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current &quot;Decode As&quot; behavior</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default &quot;Decode As&quot; behavior</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change behavior when the protocol field matches this value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Change the dissection behavior for a protocol.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1565,18 +1529,6 @@ PLEASE NOTE: One option MUST be selected.</source>
         <source>Decode As</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>String</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Integer, base </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DisplayFilterExpressionDialog</name>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 0f57ac7a95..dbf1062edf 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -1518,39 +1518,39 @@ NOTE: Une option DOIT être sélectionnée.</translation>
     <name>DecodeAsDialog</name>
     <message>
         <source>Field</source>
-        <translation>Champs</translation>
+        <translation type="vanished">Champs</translation>
     </message>
     <message>
         <source>Match using this field</source>
-        <translation>Correspondre à l&apos;utilisation de ce champs</translation>
+        <translation type="vanished">Correspondre à l&apos;utilisation de ce champs</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Valeur</translation>
+        <translation type="vanished">Valeur</translation>
     </message>
     <message>
         <source>Current &quot;Decode As&quot; behavior</source>
-        <translation>Status &quot;Decoder comme&quot; </translation>
+        <translation type="vanished">Status &quot;Decoder comme&quot; </translation>
     </message>
     <message>
         <source>Type</source>
-        <translation>Type</translation>
+        <translation type="vanished">Type</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation>Défaut</translation>
+        <translation type="vanished">Défaut</translation>
     </message>
     <message>
         <source>Default &quot;Decode As&quot; behavior</source>
-        <translation>&quot;Decodé comme&quot; : défaut</translation>
+        <translation type="vanished">&quot;Decodé comme&quot; : défaut</translation>
     </message>
     <message>
         <source>Current</source>
-        <translation>actuel</translation>
+        <translation type="vanished">actuel</translation>
     </message>
     <message>
         <source>Change behavior when the protocol field matches this value</source>
-        <translation>Modifer le comportement lorsque le champ de protocole correspond à cette valeur</translation>
+        <translation type="vanished">Modifer le comportement lorsque le champ de protocole correspond à cette valeur</translation>
     </message>
     <message>
         <source>Change the dissection behavior for a protocol.</source>
@@ -1570,15 +1570,15 @@ NOTE: Une option DOIT être sélectionnée.</translation>
     </message>
     <message>
         <source>String</source>
-        <translation>Chaine de Caractères</translation>
+        <translation type="vanished">Chaine de Caractères</translation>
     </message>
     <message>
         <source>Integer, base </source>
-        <translation>Nombre</translation>
+        <translation type="vanished">Nombre</translation>
     </message>
     <message>
         <source>unknown</source>
-        <translation>inconnu</translation>
+        <translation type="vanished">inconnu</translation>
     </message>
 </context>
 <context>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index dcd0537709..3f3d2afea3 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -1518,39 +1518,39 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
     <name>DecodeAsDialog</name>
     <message>
         <source>Field</source>
-        <translation>Campo</translation>
+        <translation type="vanished">Campo</translation>
     </message>
     <message>
         <source>Match using this field</source>
-        <translation>Cerca usando questo campo</translation>
+        <translation type="vanished">Cerca usando questo campo</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Valore</translation>
+        <translation type="vanished">Valore</translation>
     </message>
     <message>
         <source>Current &quot;Decode As&quot; behavior</source>
-        <translation>Comportamento corrente di &quot;Decodifica come&quot;</translation>
+        <translation type="vanished">Comportamento corrente di &quot;Decodifica come&quot;</translation>
     </message>
     <message>
         <source>Type</source>
-        <translation>Tipo</translation>
+        <translation type="vanished">Tipo</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation>Predefinito</translation>
+        <translation type="vanished">Predefinito</translation>
     </message>
     <message>
         <source>Default &quot;Decode As&quot; behavior</source>
-        <translation>Comportamento predefinito di &quot;Decodifica come&quot;</translation>
+        <translation type="vanished">Comportamento predefinito di &quot;Decodifica come&quot;</translation>
     </message>
     <message>
         <source>Current</source>
-        <translation>Attuale</translation>
+        <translation type="vanished">Attuale</translation>
     </message>
     <message>
         <source>Change behavior when the protocol field matches this value</source>
-        <translation>Cambia il comportamento quando il campo del protocollo corrisponde a questo valore</translation>
+        <translation type="vanished">Cambia il comportamento quando il campo del protocollo corrisponde a questo valore</translation>
     </message>
     <message>
         <source>Change the dissection behavior for a protocol.</source>
@@ -1570,15 +1570,15 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
     </message>
     <message>
         <source>String</source>
-        <translation>Stringa</translation>
+        <translation type="vanished">Stringa</translation>
     </message>
     <message>
         <source>Integer, base </source>
-        <translation>Intero, base </translation>
+        <translation type="vanished">Intero, base </translation>
     </message>
     <message>
         <source>unknown</source>
-        <translation>sconosciuto</translation>
+        <translation type="vanished">sconosciuto</translation>
     </message>
 </context>
 <context>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index eda279846e..f9a3eafc31 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -1513,39 +1513,39 @@ PLEASE NOTE: One option MUST be selected.</source>
     <name>DecodeAsDialog</name>
     <message>
         <source>Field</source>
-        <translation>フィールド</translation>
+        <translation type="vanished">フィールド</translation>
     </message>
     <message>
         <source>Match using this field</source>
-        <translation>このフィールドを利用して照合します</translation>
+        <translation type="vanished">このフィールドを利用して照合します</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>値</translation>
+        <translation type="vanished">値</translation>
     </message>
     <message>
         <source>Current &quot;Decode As&quot; behavior</source>
-        <translation>現在の &quot;としてデコード&quot; の振る舞い</translation>
+        <translation type="vanished">現在の &quot;としてデコード&quot; の振る舞い</translation>
     </message>
     <message>
         <source>Type</source>
-        <translation>種別</translation>
+        <translation type="vanished">種別</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation>デフォルト</translation>
+        <translation type="vanished">デフォルト</translation>
     </message>
     <message>
         <source>Default &quot;Decode As&quot; behavior</source>
-        <translation>デフォルトの &quot;としてデコード &quot; の振る舞い</translation>
+        <translation type="vanished">デフォルトの &quot;としてデコード &quot; の振る舞い</translation>
     </message>
     <message>
         <source>Current</source>
-        <translation>現在</translation>
+        <translation type="vanished">現在</translation>
     </message>
     <message>
         <source>Change behavior when the protocol field matches this value</source>
-        <translation>プロトコルフィールドがこの値に一致した際の振る舞いを変更します</translation>
+        <translation type="vanished">プロトコルフィールドがこの値に一致した際の振る舞いを変更します</translation>
     </message>
     <message>
         <source>Change the dissection behavior for a protocol.</source>
@@ -1565,15 +1565,15 @@ PLEASE NOTE: One option MUST be selected.</source>
     </message>
     <message>
         <source>String</source>
-        <translation>文字列</translation>
+        <translation type="vanished">文字列</translation>
     </message>
     <message>
         <source>Integer, base </source>
-        <translation>整数型, 基数</translation>
+        <translation type="vanished">整数型, 基数</translation>
     </message>
     <message>
         <source>unknown</source>
-        <translation>不明</translation>
+        <translation type="vanished">不明</translation>
     </message>
 </context>
 <context>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index 4608472257..1a8079b775 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -1519,39 +1519,39 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
     <name>DecodeAsDialog</name>
     <message>
         <source>Field</source>
-        <translation>Pole</translation>
+        <translation type="vanished">Pole</translation>
     </message>
     <message>
         <source>Match using this field</source>
-        <translation>Porówuje używając tego pola</translation>
+        <translation type="vanished">Porówuje używając tego pola</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>Wartość</translation>
+        <translation type="vanished">Wartość</translation>
     </message>
     <message>
         <source>Current &quot;Decode As&quot; behavior</source>
-        <translation>Obecne ustawienia dekodowania</translation>
+        <translation type="vanished">Obecne ustawienia dekodowania</translation>
     </message>
     <message>
         <source>Type</source>
-        <translation>Typ</translation>
+        <translation type="vanished">Typ</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation>Domyślne</translation>
+        <translation type="vanished">Domyślne</translation>
     </message>
     <message>
         <source>Default &quot;Decode As&quot; behavior</source>
-        <translation>Obecne ustawiania dekodowania</translation>
+        <translation type="vanished">Obecne ustawiania dekodowania</translation>
     </message>
     <message>
         <source>Current</source>
-        <translation>Obecnie</translation>
+        <translation type="vanished">Obecnie</translation>
     </message>
     <message>
         <source>Change behavior when the protocol field matches this value</source>
-        <translation>Zmienia dekodowanie gdy pole protokołu będzie mieć zadaną wartość</translation>
+        <translation type="vanished">Zmienia dekodowanie gdy pole protokołu będzie mieć zadaną wartość</translation>
     </message>
     <message>
         <source>Change the dissection behavior for a protocol.</source>
@@ -1571,15 +1571,15 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
     </message>
     <message>
         <source>String</source>
-        <translation>String</translation>
+        <translation type="vanished">String</translation>
     </message>
     <message>
         <source>Integer, base </source>
-        <translation>Integer, o podstawie </translation>
+        <translation type="vanished">Integer, o podstawie </translation>
     </message>
     <message>
         <source>unknown</source>
-        <translation>nieznany</translation>
+        <translation type="vanished">nieznany</translation>
     </message>
 </context>
 <context>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 8ee7d77e70..56f9c94281 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -1514,39 +1514,39 @@ PLEASE NOTE: One option MUST be selected.</source>
     <name>DecodeAsDialog</name>
     <message>
         <source>Field</source>
-        <translation>字段</translation>
+        <translation type="vanished">字段</translation>
     </message>
     <message>
         <source>Match using this field</source>
-        <translation>使用此字段匹配</translation>
+        <translation type="vanished">使用此字段匹配</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation>值</translation>
+        <translation type="vanished">值</translation>
     </message>
     <message>
         <source>Current &quot;Decode As&quot; behavior</source>
-        <translation>当前“解码”行为</translation>
+        <translation type="vanished">当前“解码”行为</translation>
     </message>
     <message>
         <source>Type</source>
-        <translation>类型</translation>
+        <translation type="vanished">类型</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation>默认</translation>
+        <translation type="vanished">默认</translation>
     </message>
     <message>
         <source>Default &quot;Decode As&quot; behavior</source>
-        <translation>默认“解码”行为</translation>
+        <translation type="vanished">默认“解码”行为</translation>
     </message>
     <message>
         <source>Current</source>
-        <translation>当前</translation>
+        <translation type="vanished">当前</translation>
     </message>
     <message>
         <source>Change behavior when the protocol field matches this value</source>
-        <translation>当协议字段匹配此值时变更行为</translation>
+        <translation type="vanished">当协议字段匹配此值时变更行为</translation>
     </message>
     <message>
         <source>Change the dissection behavior for a protocol.</source>
@@ -1566,15 +1566,15 @@ PLEASE NOTE: One option MUST be selected.</source>
     </message>
     <message>
         <source>String</source>
-        <translation>字符串</translation>
+        <translation type="vanished">字符串</translation>
     </message>
     <message>
         <source>Integer, base </source>
-        <translation>整数，底数 </translation>
+        <translation type="vanished">整数，底数 </translation>
     </message>
     <message>
         <source>unknown</source>
-        <translation>未知</translation>
+        <translation type="vanished">未知</translation>
     </message>
 </context>
 <context>