[Automatic update for 2016-06-12]

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

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

1 files changed, 252 insertions, 45 deletions

diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index f0b689c6c9..79b94c2a2a 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -151,6 +151,195 @@
     </message>
 </context>
 <context>
+    <name>BluetoothDeviceDialog</name>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="23"/>
+        <source>Bluetooth Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="78"/>
+        <source>BD_ADDR</source>
+        <translation type="unfinished">BD_ADDR</translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="83"/>
+        <source>OUI</source>
+        <translation type="unfinished">OUI</translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="88"/>
+        <source>Name</source>
+        <translation type="unfinished">Nom</translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="93"/>
+        <source>Class of Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="98"/>
+        <source>LMP Version</source>
+        <translation type="unfinished">Version LMP</translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="103"/>
+        <source>LMP Subverion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="108"/>
+        <source>Manufacturer</source>
+        <translation type="unfinished">Fabricant</translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="113"/>
+        <source>HCI Version</source>
+        <translation type="unfinished">Version HCI</translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="118"/>
+        <source>HCI Revision</source>
+        <translation type="unfinished">Révision HCI</translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="123"/>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="128"/>
+        <source>Authentication</source>
+        <translation type="unfinished">Authentification</translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="133"/>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="138"/>
+        <source>ACL MTU</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="143"/>
+        <source>ACL Total Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="148"/>
+        <source>SCO MTU</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="153"/>
+        <source>SCO Total Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="158"/>
+        <source>LE ACL MTU</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="163"/>
+        <source>LE ACL Total Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="168"/>
+        <source>Inquiry Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="173"/>
+        <source>Page Timeout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="178"/>
+        <source>Simple Pairing Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="183"/>
+        <source>Voice Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="188"/>
+        <source>Value</source>
+        <translation type="unfinished">Valeur</translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="193"/>
+        <source>Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="206"/>
+        <location filename="bluetooth_device_dialog.cpp" line="586"/>
+        <source>%1 changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="223"/>
+        <source>Copy Cell</source>
+        <translation type="unfinished">Copier la cellule</translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="228"/>
+        <source>Copy Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="233"/>
+        <source>Copy All</source>
+        <translation type="unfinished">Copier Tout</translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.ui" line="238"/>
+        <source>Save as image</source>
+        <translation type="unfinished">Enregistrer en tant qu&apos;image</translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.cpp" line="180"/>
+        <source>Unknown</source>
+        <translation type="unfinished">Inconnu</translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.cpp" line="189"/>
+        <source>Bluetooth Device - %1%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.cpp" line="521"/>
+        <source>enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.cpp" line="521"/>
+        <source>disabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.cpp" line="529"/>
+        <source>%1 ms (%2 slots)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.cpp" line="621"/>
+        <source>Save Table Image</source>
+        <translation type="unfinished">Sauvegarder Image Tableau</translation>
+    </message>
+    <message>
+        <location filename="bluetooth_device_dialog.cpp" line="623"/>
+        <source>PNG Image (*.png)</source>
+        <translation type="unfinished">Image PNG (*.png)</translation>
+    </message>
+</context>
+<context>
     <name>BluetoothDevicesDialog</name>
     <message>
         <location filename="bluetooth_devices_dialog.ui" line="20"/>
@@ -213,38 +402,44 @@
         <translation>Afficher étapes d&apos;information</translation>
     </message>
     <message>
-        <location filename="bluetooth_devices_dialog.ui" line="156"/>
+        <location filename="bluetooth_devices_dialog.ui" line="146"/>
+        <location filename="bluetooth_devices_dialog.cpp" line="329"/>
+        <source>%1 items; Right click for more option; Double click for device details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="bluetooth_devices_dialog.ui" line="163"/>
         <source>Copy Cell</source>
         <translation>Copier la cellule</translation>
     </message>
     <message>
-        <location filename="bluetooth_devices_dialog.ui" line="161"/>
+        <location filename="bluetooth_devices_dialog.ui" line="168"/>
         <source>Copy Rows</source>
         <translation>Copier les lignes</translation>
     </message>
     <message>
-        <location filename="bluetooth_devices_dialog.ui" line="166"/>
+        <location filename="bluetooth_devices_dialog.ui" line="173"/>
         <source>Copy All</source>
         <translation>Copier Tout</translation>
     </message>
     <message>
-        <location filename="bluetooth_devices_dialog.ui" line="171"/>
+        <location filename="bluetooth_devices_dialog.ui" line="178"/>
         <source>Save as image</source>
         <translation>Enregistrer en tant qu&apos;image</translation>
     </message>
     <message>
-        <location filename="bluetooth_devices_dialog.cpp" line="274"/>
-        <location filename="bluetooth_devices_dialog.cpp" line="293"/>
+        <location filename="bluetooth_devices_dialog.cpp" line="290"/>
+        <location filename="bluetooth_devices_dialog.cpp" line="310"/>
         <source>true</source>
         <translation>vrai</translation>
     </message>
     <message>
-        <location filename="bluetooth_devices_dialog.cpp" line="378"/>
+        <location filename="bluetooth_devices_dialog.cpp" line="398"/>
         <source>Save Table Image</source>
         <translation>Sauvegarder Image Tableau</translation>
     </message>
     <message>
-        <location filename="bluetooth_devices_dialog.cpp" line="380"/>
+        <location filename="bluetooth_devices_dialog.cpp" line="400"/>
         <source>PNG Image (*.png)</source>
         <translation>Image PNG (*.png)</translation>
     </message>
@@ -323,8 +518,10 @@
         <location filename="bluetooth_hci_summary_dialog.ui" line="330"/>
         <location filename="bluetooth_hci_summary_dialog.ui" line="359"/>
         <location filename="bluetooth_hci_summary_dialog.ui" line="388"/>
+        <location filename="bluetooth_hci_summary_dialog.ui" line="417"/>
         <location filename="bluetooth_hci_summary_dialog.ui" line="446"/>
         <location filename="bluetooth_hci_summary_dialog.ui" line="475"/>
+        <location filename="bluetooth_hci_summary_dialog.ui" line="504"/>
         <location filename="bluetooth_hci_summary_dialog.ui" line="533"/>
         <source>0</source>
         <translation>0</translation>
@@ -455,37 +652,37 @@
         <translation>Enregistrer en tant qu&apos;image</translation>
     </message>
     <message>
-        <location filename="bluetooth_hci_summary_dialog.cpp" line="312"/>
+        <location filename="bluetooth_hci_summary_dialog.cpp" line="308"/>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
     <message>
-        <location filename="bluetooth_hci_summary_dialog.cpp" line="330"/>
+        <location filename="bluetooth_hci_summary_dialog.cpp" line="326"/>
         <source>Adapter %1</source>
         <translation>Adaptateur %1</translation>
     </message>
     <message>
-        <location filename="bluetooth_hci_summary_dialog.cpp" line="418"/>
-        <location filename="bluetooth_hci_summary_dialog.cpp" line="468"/>
-        <location filename="bluetooth_hci_summary_dialog.cpp" line="505"/>
-        <location filename="bluetooth_hci_summary_dialog.cpp" line="539"/>
-        <location filename="bluetooth_hci_summary_dialog.cpp" line="576"/>
-        <location filename="bluetooth_hci_summary_dialog.cpp" line="610"/>
+        <location filename="bluetooth_hci_summary_dialog.cpp" line="414"/>
+        <location filename="bluetooth_hci_summary_dialog.cpp" line="464"/>
+        <location filename="bluetooth_hci_summary_dialog.cpp" line="501"/>
+        <location filename="bluetooth_hci_summary_dialog.cpp" line="535"/>
+        <location filename="bluetooth_hci_summary_dialog.cpp" line="572"/>
+        <location filename="bluetooth_hci_summary_dialog.cpp" line="606"/>
         <source>Frame %1</source>
         <translation>Trame %1</translation>
     </message>
     <message>
-        <location filename="bluetooth_hci_summary_dialog.cpp" line="528"/>
+        <location filename="bluetooth_hci_summary_dialog.cpp" line="524"/>
         <source>Pending</source>
         <translation>En attente</translation>
     </message>
     <message>
-        <location filename="bluetooth_hci_summary_dialog.cpp" line="721"/>
+        <location filename="bluetooth_hci_summary_dialog.cpp" line="717"/>
         <source>Save Table Image</source>
         <translation>Sauvegarder Image Tableau</translation>
     </message>
     <message>
-        <location filename="bluetooth_hci_summary_dialog.cpp" line="723"/>
+        <location filename="bluetooth_hci_summary_dialog.cpp" line="719"/>
         <source>PNG Image (*.png)</source>
         <translation>Image PNG (*.png)</translation>
     </message>
@@ -2173,129 +2370,139 @@ si vous voulez utiliser des fichiers multiples.</translation>
     </message>
     <message>
         <location filename="expert_info_dialog.ui" line="32"/>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="expert_info_dialog.ui" line="37"/>
         <source>Group</source>
         <translation>Groupe</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.ui" line="37"/>
+        <location filename="expert_info_dialog.ui" line="42"/>
         <source>Protocol</source>
         <translation>Protocole</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.ui" line="42"/>
+        <location filename="expert_info_dialog.ui" line="47"/>
         <source>Count</source>
         <translation>Compteur</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.ui" line="50"/>
+        <location filename="expert_info_dialog.ui" line="55"/>
         <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>
     <message>
-        <location filename="expert_info_dialog.ui" line="59"/>
+        <location filename="expert_info_dialog.ui" line="64"/>
         <source>Limit to Display Filter</source>
         <translation>Limiter au Filtre d&apos;Affichage</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.ui" line="79"/>
-        <location filename="expert_info_dialog.ui" line="89"/>
+        <location filename="expert_info_dialog.ui" line="84"/>
+        <source>Group by summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="expert_info_dialog.ui" line="107"/>
+        <location filename="expert_info_dialog.ui" line="117"/>
         <source>Search expert summaries.</source>
         <translation>Cherche dans les résumés expert.</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.ui" line="82"/>
+        <location filename="expert_info_dialog.ui" line="110"/>
         <source>Search:</source>
         <translation>Recherche:</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.ui" line="109"/>
+        <location filename="expert_info_dialog.ui" line="137"/>
         <source>Show…</source>
         <oldsource>Show...</oldsource>
         <translation>Afficher...</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.ui" line="131"/>
+        <location filename="expert_info_dialog.ui" line="159"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.ui" line="134"/>
+        <location filename="expert_info_dialog.ui" line="162"/>
         <source>Show error packets.</source>
         <translation>Afficher les paquets d&apos;erreur.</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.ui" line="142"/>
+        <location filename="expert_info_dialog.ui" line="170"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.ui" line="145"/>
+        <location filename="expert_info_dialog.ui" line="173"/>
         <source>Show warning packets.</source>
         <translation>Afficher les paquets d&apos;avertissement.</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.ui" line="153"/>
+        <location filename="expert_info_dialog.ui" line="181"/>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.ui" line="156"/>
+        <location filename="expert_info_dialog.ui" line="184"/>
         <source>Show note packets.</source>
         <translation>Afficher les paquets de note.</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.ui" line="164"/>
+        <location filename="expert_info_dialog.ui" line="192"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.ui" line="167"/>
+        <location filename="expert_info_dialog.ui" line="195"/>
         <source>Show chat packets.</source>
         <translation>Afficher les paquets du chat.</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.ui" line="175"/>
+        <location filename="expert_info_dialog.ui" line="203"/>
         <source>Comment</source>
         <translation>Commentaire</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.ui" line="178"/>
+        <location filename="expert_info_dialog.ui" line="206"/>
         <source>Show comment packets.</source>
         <translation>Montre paquets de commentaires</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.cpp" line="142"/>
+        <location filename="expert_info_dialog.cpp" line="193"/>
         <source>Expert Information</source>
         <translation>Information Expert</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.cpp" line="257"/>
+        <location filename="expert_info_dialog.cpp" line="308"/>
         <source>Endpoint expert failed to set filter</source>
         <translation>L&apos;expert endpoint n&apos;a pas pu appliquer le filtre</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.cpp" line="458"/>
-        <location filename="expert_info_dialog.cpp" line="459"/>
+        <location filename="expert_info_dialog.cpp" line="529"/>
+        <location filename="expert_info_dialog.cpp" line="530"/>
         <source>Capture file closed.</source>
         <translation>Fichier de capture fermé</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.cpp" line="461"/>
+        <location filename="expert_info_dialog.cpp" line="532"/>
         <source>No display filter</source>
         <translation>Pas de filtre d&apos;affichage.</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.cpp" line="462"/>
+        <location filename="expert_info_dialog.cpp" line="533"/>
         <source>No display filter set.</source>
         <translation>Filtre d&apos;affichage non défini.</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.cpp" line="464"/>
+        <location filename="expert_info_dialog.cpp" line="535"/>
         <source>Limit information to &quot;%1&quot;.</source>
         <translation>Limiter l&apos;information à &quot;%1&quot;.</translation>
     </message>
     <message>
-        <location filename="expert_info_dialog.cpp" line="465"/>
+        <location filename="expert_info_dialog.cpp" line="536"/>
         <source>Display filter: &quot;%1&quot;</source>
         <translation>Filtre d&apos;affichage: &quot;%1&quot;</translation>
     </message>