[Automatic update for 2018-02-25]

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

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

6 files changed, 14 insertions, 130 deletions

diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 836d396a22..eb9869cafc 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -1457,7 +1457,7 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
     <name>ColoringRulesDelegate</name>
     <message>
         <source>the &quot;@&quot; symbol will be ignored.</source>
-        <translation type="unfinished">das &quot;@&quot; Symbol wird ignoriert.</translation>
+        <translation>das &quot;@&quot; Symbol wird ignoriert.</translation>
     </message>
 </context>
 <context>
@@ -1467,14 +1467,6 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
         <translation>Dialog</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation type="vanished">Name</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="vanished">Filter</translation>
-    </message>
-    <message>
         <source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
         <translation>&lt;small&gt;&lt;i&gt;Hinweis&lt;/i&gt;&lt;/small&gt;</translation>
     </message>
@@ -1515,10 +1507,6 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
         <translation>Als Filter anwenden</translation>
     </message>
     <message>
-        <source>Coloring Rules</source>
-        <translation type="vanished">Einfärbungsregeln</translation>
-    </message>
-    <message>
         <source>Import</source>
         <translation>Importieren</translation>
     </message>
@@ -1535,12 +1523,8 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
         <translation>Filter in eine Datei sichern.</translation>
     </message>
     <message>
-        <source>the &quot;@&quot; symbol will be ignored.</source>
-        <translation type="vanished">das &quot;@&quot; Symbol wird ignoriert.</translation>
-    </message>
-    <message>
         <source>Coloring Rules %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Einfärbungsregeln %1</translation>
     </message>
     <message>
         <source>Double click to edit. Drag to move. Rules are processed in order until a match is found.</source>
@@ -1562,24 +1546,20 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
         <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. They have been disabled.</source>
         <translation>Wireshark erkennt eine oder mehrere der Einfärbungsregeln nicht. Diese wurden deaktiviert.</translation>
     </message>
-    <message>
-        <source>Unable to save coloring rules: %s</source>
-        <translation type="vanished">Einfärbungsregeln können nicht gespeichert werden: %s</translation>
-    </message>
 </context>
 <context>
     <name>ColoringRulesModel</name>
     <message>
         <source>Unable to save coloring rules: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Einfärbungsregeln können nicht gespeichert werden: %1</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation>Name</translation>
     </message>
     <message>
         <source>Filter</source>
-        <translation type="unfinished">Filter</translation>
+        <translation>Filter</translation>
     </message>
 </context>
 <context>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index cf0ecfe385..d049f0007e 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -1434,7 +1434,7 @@ NOTE: Une option DOIT être sélectionnée.</translation>
     <name>ColoringRulesDelegate</name>
     <message>
         <source>the &quot;@&quot; symbol will be ignored.</source>
-        <translation type="unfinished">le caractère &quot;@&quot; sera ignoré.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1444,14 +1444,6 @@ NOTE: Une option DOIT être sélectionnée.</translation>
         <translation>Dialogue</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation type="vanished">Nom</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="vanished">Filtre</translation>
-    </message>
-    <message>
         <source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
         <translation>&lt;small&gt;&lt;i&gt;Un indice.&lt;/i&gt;&lt;/small&gt;</translation>
     </message>
@@ -1492,10 +1484,6 @@ NOTE: Une option DOIT être sélectionnée.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Coloring Rules</source>
-        <translation type="vanished">Règles de coloration</translation>
-    </message>
-    <message>
         <source>Import</source>
         <translation>Importer</translation>
     </message>
@@ -1512,10 +1500,6 @@ NOTE: Une option DOIT être sélectionnée.</translation>
         <translation>Sauvegarder les filtres dans un fichier.</translation>
     </message>
     <message>
-        <source>the &quot;@&quot; symbol will be ignored.</source>
-        <translation type="vanished">le caractère &quot;@&quot; sera ignoré.</translation>
-    </message>
-    <message>
         <source>Coloring Rules %1</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index c5f8e745e4..e46284210f 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -1457,7 +1457,7 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
     <name>ColoringRulesDelegate</name>
     <message>
         <source>the &quot;@&quot; symbol will be ignored.</source>
-        <translation type="unfinished">il simbolo &quot;@&quot; sarà ignorato.</translation>
+        <translation>il simbolo &quot;@&quot; sarà ignorato.</translation>
     </message>
 </context>
 <context>
@@ -1467,14 +1467,6 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
         <translation>Finestra</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation type="vanished">Nome</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="vanished">Filtro</translation>
-    </message>
-    <message>
         <source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
         <translation>&lt;small&gt;&lt;i&gt;Un suggerimento.&lt;/i&gt;&lt;/small&gt;</translation>
     </message>
@@ -1515,10 +1507,6 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
         <translation>Applica come filtro</translation>
     </message>
     <message>
-        <source>Coloring Rules</source>
-        <translation type="vanished">Regole di colorazione</translation>
-    </message>
-    <message>
         <source>Import</source>
         <translation>Importa</translation>
     </message>
@@ -1535,12 +1523,8 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
         <translation>Salva i filtri in un file.</translation>
     </message>
     <message>
-        <source>the &quot;@&quot; symbol will be ignored.</source>
-        <translation type="vanished">il simbolo &quot;@&quot; sarà ignorato.</translation>
-    </message>
-    <message>
         <source>Coloring Rules %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Regole di colorazione %1</translation>
     </message>
     <message>
         <source>Double click to edit. Drag to move. Rules are processed in order until a match is found.</source>
@@ -1562,24 +1546,20 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
         <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. They have been disabled.</source>
         <translation>Wireshark non riconosce una o più delle tue regole di colorazione. Sono state disabilitate.</translation>
     </message>
-    <message>
-        <source>Unable to save coloring rules: %s</source>
-        <translation type="vanished">Impossibile salvare le regole di colorazione: %s</translation>
-    </message>
 </context>
 <context>
     <name>ColoringRulesModel</name>
     <message>
         <source>Unable to save coloring rules: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile salvare le regole di colorazione: %1</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <source>Filter</source>
-        <translation type="unfinished">Filtro</translation>
+        <translation>Filtro</translation>
     </message>
 </context>
 <context>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index 256d091889..30e8f3ce63 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -1429,7 +1429,7 @@ PLEASE NOTE: One option MUST be selected.</source>
     <name>ColoringRulesDelegate</name>
     <message>
         <source>the &quot;@&quot; symbol will be ignored.</source>
-        <translation type="unfinished">この &quot;@&quot; シンボルは無視されます</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1439,14 +1439,6 @@ PLEASE NOTE: One option MUST be selected.</source>
         <translation>ダイアログ</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation type="vanished">名前</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="vanished">フィルタ</translation>
-    </message>
-    <message>
         <source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
         <translation>&lt;small&gt;&lt;i&gt;ヒント&lt;/i&gt;&lt;/small&gt;</translation>
     </message>
@@ -1487,10 +1479,6 @@ PLEASE NOTE: One option MUST be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Coloring Rules</source>
-        <translation type="vanished">色付けルール</translation>
-    </message>
-    <message>
         <source>Import</source>
         <translation>インポート</translation>
     </message>
@@ -1507,10 +1495,6 @@ PLEASE NOTE: One option MUST be selected.</source>
         <translation>ファイルにフィルタを保存します</translation>
     </message>
     <message>
-        <source>the &quot;@&quot; symbol will be ignored.</source>
-        <translation type="vanished">この &quot;@&quot; シンボルは無視されます</translation>
-    </message>
-    <message>
         <source>Coloring Rules %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1534,10 +1518,6 @@ PLEASE NOTE: One option MUST be selected.</source>
         <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. They have been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Unable to save coloring rules: %s</source>
-        <translation type="vanished">色付けルール %s を保存できません</translation>
-    </message>
 </context>
 <context>
     <name>ColoringRulesModel</name>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index 6825a52f72..2c4f8ee01b 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -1435,7 +1435,7 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
     <name>ColoringRulesDelegate</name>
     <message>
         <source>the &quot;@&quot; symbol will be ignored.</source>
-        <translation type="unfinished">Symbol &quot;@&quot; będzie zignorowany.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1445,14 +1445,6 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
         <translation>Okno</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation type="vanished">Nazwa</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="vanished">Filtr</translation>
-    </message>
-    <message>
         <source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
         <translation>&lt;small&gt;&lt;i&gt;Podpowiedź.&lt;/i&gt;&lt;/small&gt;</translation>
     </message>
@@ -1493,10 +1485,6 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
         <translation>Zastosuj filtr</translation>
     </message>
     <message>
-        <source>Coloring Rules</source>
-        <translation type="vanished">Reguły kolorowania</translation>
-    </message>
-    <message>
         <source>Import</source>
         <translation>Importuj</translation>
     </message>
@@ -1513,10 +1501,6 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
         <translation>Zapisz filtry w pliku.</translation>
     </message>
     <message>
-        <source>the &quot;@&quot; symbol will be ignored.</source>
-        <translation type="vanished">Symbol &quot;@&quot; będzie zignorowany.</translation>
-    </message>
-    <message>
         <source>Coloring Rules %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1540,10 +1524,6 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
         <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. They have been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Unable to save coloring rules: %s</source>
-        <translation type="vanished">Nie można zapisać reguł kolorowania: %s</translation>
-    </message>
 </context>
 <context>
     <name>ColoringRulesModel</name>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 3e4e0d5536..e913fcfe49 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -1450,7 +1450,7 @@ PLEASE NOTE: One option MUST be selected.</source>
     <name>ColoringRulesDelegate</name>
     <message>
         <source>the &quot;@&quot; symbol will be ignored.</source>
-        <translation type="unfinished">忽略&quot;@&quot;符号。</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1460,14 +1460,6 @@ PLEASE NOTE: One option MUST be selected.</source>
         <translation>对话框</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation type="vanished">名称</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="vanished">过滤器</translation>
-    </message>
-    <message>
         <source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
         <translation>&lt;small&gt;&lt;i&gt;提示&lt;/i&gt;&lt;/small&gt;</translation>
     </message>
@@ -1508,10 +1500,6 @@ PLEASE NOTE: One option MUST be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Coloring Rules</source>
-        <translation type="vanished">着色规则</translation>
-    </message>
-    <message>
         <source>Import</source>
         <translation>导入</translation>
     </message>
@@ -1528,10 +1516,6 @@ PLEASE NOTE: One option MUST be selected.</source>
         <translation>保存过滤器到文件。</translation>
     </message>
     <message>
-        <source>the &quot;@&quot; symbol will be ignored.</source>
-        <translation type="vanished">忽略&quot;@&quot;符号。</translation>
-    </message>
-    <message>
         <source>Coloring Rules %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1555,10 +1539,6 @@ PLEASE NOTE: One option MUST be selected.</source>
         <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. They have been disabled.</source>
         <translation>Wireshark 无法识别您的一个或多个着色规则。它们已被禁用。</translation>
     </message>
-    <message>
-        <source>Unable to save coloring rules: %s</source>
-        <translation type="vanished">无法保存着色规则: %s</translation>
-    </message>
 </context>
 <context>
     <name>ColoringRulesModel</name>