[Automatic update for 2016-07-31]

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

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

7 files changed, 34 insertions, 27 deletions

diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 0cbe5759c5..2c7293d60c 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -1806,8 +1806,9 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
     </message>
     <message>
         <location filename="coloring_rules_dialog.cpp" line="362"/>
-        <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</source>
-        <translation>Wireshark erkennt eine oder mehrere der Einfärbungsregeln nicht. Speichern verwirft diese.</translation>
+        <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
+        <oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
+        <translation type="unfinished">Wireshark erkennt eine oder mehrere der Einfärbungsregeln nicht. Speichern verwirft diese.</translation>
     </message>
     <message>
         <location filename="coloring_rules_dialog.cpp" line="375"/>
@@ -2640,12 +2641,12 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
 <context>
     <name>ExtcapArgumentFileSelection</name>
     <message>
-        <location filename="extcap_argument_file.cpp" line="112"/>
+        <location filename="extcap_argument_file.cpp" line="113"/>
         <source>All Files (</source>
         <translation>Alle Dateien (</translation>
     </message>
     <message>
-        <location filename="extcap_argument_file.cpp" line="121"/>
+        <location filename="extcap_argument_file.cpp" line="122"/>
         <source>Open File</source>
         <translation>Öffne Datei</translation>
     </message>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index d49dc732e2..cc36f08edb 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -1798,7 +1798,8 @@ PLEASE NOTE: One option MUST be selected.</source>
     </message>
     <message>
         <location filename="coloring_rules_dialog.cpp" line="362"/>
-        <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</source>
+        <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
+        <oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2625,12 +2626,12 @@ PLEASE NOTE: One option MUST be selected.</source>
 <context>
     <name>ExtcapArgumentFileSelection</name>
     <message>
-        <location filename="extcap_argument_file.cpp" line="112"/>
+        <location filename="extcap_argument_file.cpp" line="113"/>
         <source>All Files (</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="extcap_argument_file.cpp" line="121"/>
+        <location filename="extcap_argument_file.cpp" line="122"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index f701906029..6e70f2fdcc 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -1807,8 +1807,9 @@ si vous voulez utiliser des fichiers multiples.</translation>
     </message>
     <message>
         <location filename="coloring_rules_dialog.cpp" line="362"/>
-        <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</source>
-        <translation>Wireshark ne reconnaît pas une ou plusieurs de vos règles de coloriage. Sauvegarder les supprimera.</translation>
+        <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
+        <oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
+        <translation type="unfinished">Wireshark ne reconnaît pas une ou plusieurs de vos règles de coloriage. Sauvegarder les supprimera.</translation>
     </message>
     <message>
         <location filename="coloring_rules_dialog.cpp" line="375"/>
@@ -2641,12 +2642,12 @@ si vous voulez utiliser des fichiers multiples.</translation>
 <context>
     <name>ExtcapArgumentFileSelection</name>
     <message>
-        <location filename="extcap_argument_file.cpp" line="112"/>
+        <location filename="extcap_argument_file.cpp" line="113"/>
         <source>All Files (</source>
         <translation>Tous les Fichiers (</translation>
     </message>
     <message>
-        <location filename="extcap_argument_file.cpp" line="121"/>
+        <location filename="extcap_argument_file.cpp" line="122"/>
         <source>Open File</source>
         <translation>Ouvrir un fichier</translation>
     </message>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index 4d3fedcd3f..aa79f166e8 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -1806,8 +1806,9 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
     </message>
     <message>
         <location filename="coloring_rules_dialog.cpp" line="362"/>
-        <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</source>
-        <translation>Wireshark non riconosce una o più delle tue regole di colorazione. Il salvataggio le rimuoverà.</translation>
+        <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
+        <oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
+        <translation type="unfinished">Wireshark non riconosce una o più delle tue regole di colorazione. Il salvataggio le rimuoverà.</translation>
     </message>
     <message>
         <location filename="coloring_rules_dialog.cpp" line="375"/>
@@ -2640,12 +2641,12 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
 <context>
     <name>ExtcapArgumentFileSelection</name>
     <message>
-        <location filename="extcap_argument_file.cpp" line="112"/>
+        <location filename="extcap_argument_file.cpp" line="113"/>
         <source>All Files (</source>
         <translation>Tutti i file (</translation>
     </message>
     <message>
-        <location filename="extcap_argument_file.cpp" line="121"/>
+        <location filename="extcap_argument_file.cpp" line="122"/>
         <source>Open File</source>
         <translation>Apri file</translation>
     </message>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index 852f68eeed..a62c054c9b 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -1803,8 +1803,9 @@ PLEASE NOTE: One option MUST be selected.</source>
     </message>
     <message>
         <location filename="coloring_rules_dialog.cpp" line="362"/>
-        <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</source>
-        <translation>Wiresharkはひとつかそれ以上の色付けルールを認識できません。保存は破棄されます。</translation>
+        <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
+        <oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
+        <translation type="unfinished">Wiresharkはひとつかそれ以上の色付けルールを認識できません。保存は破棄されます。</translation>
     </message>
     <message>
         <location filename="coloring_rules_dialog.cpp" line="375"/>
@@ -2636,12 +2637,12 @@ PLEASE NOTE: One option MUST be selected.</source>
 <context>
     <name>ExtcapArgumentFileSelection</name>
     <message>
-        <location filename="extcap_argument_file.cpp" line="112"/>
+        <location filename="extcap_argument_file.cpp" line="113"/>
         <source>All Files (</source>
         <translation>すべてのファイル(</translation>
     </message>
     <message>
-        <location filename="extcap_argument_file.cpp" line="121"/>
+        <location filename="extcap_argument_file.cpp" line="122"/>
         <source>Open File</source>
         <translation>ファイルを開く</translation>
     </message>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index 4dc8ec2ffe..85c970c91c 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -1805,8 +1805,9 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
     </message>
     <message>
         <location filename="coloring_rules_dialog.cpp" line="362"/>
-        <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</source>
-        <translation>Wireshark nie rozpoznał jednej lub wększej ilości twoich reguł kolorowania.Zapis spowoduje usunięcie ich.</translation>
+        <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
+        <oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
+        <translation type="unfinished">Wireshark nie rozpoznał jednej lub wększej ilości twoich reguł kolorowania.Zapis spowoduje usunięcie ich.</translation>
     </message>
     <message>
         <location filename="coloring_rules_dialog.cpp" line="375"/>
@@ -2639,12 +2640,12 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
 <context>
     <name>ExtcapArgumentFileSelection</name>
     <message>
-        <location filename="extcap_argument_file.cpp" line="112"/>
+        <location filename="extcap_argument_file.cpp" line="113"/>
         <source>All Files (</source>
         <translation>Wszystkie pliki (</translation>
     </message>
     <message>
-        <location filename="extcap_argument_file.cpp" line="121"/>
+        <location filename="extcap_argument_file.cpp" line="122"/>
         <source>Open File</source>
         <translation>Otwórz plik</translation>
     </message>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 9932914c78..ffc143b801 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -1805,8 +1805,9 @@ PLEASE NOTE: One option MUST be selected.</source>
     </message>
     <message>
         <location filename="coloring_rules_dialog.cpp" line="362"/>
-        <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</source>
-        <translation>Wireshark 无法识别您的一个或多个着色规则。保存将会丢弃它们。</translation>
+        <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
+        <oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
+        <translation type="unfinished">Wireshark 无法识别您的一个或多个着色规则。保存将会丢弃它们。</translation>
     </message>
     <message>
         <location filename="coloring_rules_dialog.cpp" line="375"/>
@@ -2639,12 +2640,12 @@ PLEASE NOTE: One option MUST be selected.</source>
 <context>
     <name>ExtcapArgumentFileSelection</name>
     <message>
-        <location filename="extcap_argument_file.cpp" line="112"/>
+        <location filename="extcap_argument_file.cpp" line="113"/>
         <source>All Files (</source>
         <translation>所有文件 (</translation>
     </message>
     <message>
-        <location filename="extcap_argument_file.cpp" line="121"/>
+        <location filename="extcap_argument_file.cpp" line="122"/>
         <source>Open File</source>
         <translation>打开文件</translation>
     </message>