From 83df30ee53e9a7ec77e07e4566fd5ec0f67c0cf4 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Sun, 9 Oct 2016 08:12:24 -0700
Subject: [Automatic update for 2016-10-09]

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

Change-Id: I84adcfee2652783d1b3b7d7e3ff9b209f8b23d96
Reviewed-on: https://code.wireshark.org/review/18130
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
 ui/qt/wireshark_fr.ts | 80 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 36 deletions(-)

(limited to 'ui/qt/wireshark_fr.ts')

diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 611efe6bf8..680e29d435 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -23,32 +23,32 @@
         <translation>Wireshark</translation>
     </message>
     <message>
-        <location filename="about_dialog.ui" line="72"/>
+        <location filename="about_dialog.ui" line="75"/>
         <source>&lt;span size=\&quot;x-large\&quot; weight=\&quot;bold\&quot;&gt;Network Protocol Analyzer&lt;/span&gt;</source>
         <translation>&lt;span size=\&quot;x-large\&quot; weight=\&quot;bold\&quot;&gt;Analyseur de Protocole réseau&lt;/span&gt;</translation>
     </message>
     <message>
-        <location filename="about_dialog.ui" line="153"/>
+        <location filename="about_dialog.ui" line="156"/>
         <source>Authors</source>
         <translation>Auteurs</translation>
     </message>
     <message>
-        <location filename="about_dialog.ui" line="167"/>
+        <location filename="about_dialog.ui" line="170"/>
         <source>Folders</source>
         <translation>Dossiers</translation>
     </message>
     <message>
-        <location filename="about_dialog.ui" line="193"/>
+        <location filename="about_dialog.ui" line="196"/>
         <source>Plugins</source>
         <translation>Modules complémentaires</translation>
     </message>
     <message>
-        <location filename="about_dialog.ui" line="210"/>
+        <location filename="about_dialog.ui" line="213"/>
         <source>Keyboard Shortcuts</source>
         <translation>Raccourcis clavier</translation>
     </message>
     <message>
-        <location filename="about_dialog.ui" line="227"/>
+        <location filename="about_dialog.ui" line="230"/>
         <source>License</source>
         <translation>Licence</translation>
     </message>
@@ -1789,33 +1789,37 @@ si vous voulez utiliser des fichiers multiples.</translation>
         <translation>le caractère &quot;@&quot; sera ignoré.</translation>
     </message>
     <message>
-        <location filename="coloring_rules_dialog.cpp" line="201"/>
+        <location filename="coloring_rules_dialog.cpp" line="202"/>
         <source>Double click to edit. Drag to move. Rules are processed in order until a match is found.</source>
         <translation>Double-cliquer pour éditer. Glisser pour déplacer. Les règles sont traitées dans l&apos;ordre jusqu&apos;à trouver une correspondance.</translation>
     </message>
     <message>
-        <location filename="coloring_rules_dialog.cpp" line="324"/>
+        <location filename="coloring_rules_dialog.cpp" line="326"/>
         <source>Import Coloring Rules</source>
         <translation>Importer des règles de coloration</translation>
     </message>
     <message>
-        <location filename="coloring_rules_dialog.cpp" line="340"/>
+        <location filename="coloring_rules_dialog.cpp" line="342"/>
         <source>Export %1 Coloring Rules</source>
         <translation>Exporter %1 règles de coloration</translation>
     </message>
     <message>
-        <location filename="coloring_rules_dialog.cpp" line="361"/>
+        <location filename="coloring_rules_dialog.cpp" line="363"/>
         <source>Your coloring rules file contains unknown rules</source>
         <translation>Votre fichier de règles de coloriage contient des règles inconnues.</translation>
     </message>
     <message>
-        <location filename="coloring_rules_dialog.cpp" line="362"/>
+        <location filename="coloring_rules_dialog.cpp" line="364"/>
+        <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>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>
+        <translation type="obsolete">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"/>
+        <location filename="coloring_rules_dialog.cpp" line="376"/>
         <source>Unable to save coloring rules: %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2006,22 +2010,22 @@ si vous voulez utiliser des fichiers multiples.</translation>
         <translation>Copier la dissection.</translation>
     </message>
     <message>
-        <location filename="decode_as_dialog.cpp" line="84"/>
+        <location filename="decode_as_dialog.cpp" line="86"/>
         <source>Decode As</source>
         <translation>Décoder comme</translation>
     </message>
     <message>
-        <location filename="decode_as_dialog.cpp" line="383"/>
+        <location filename="decode_as_dialog.cpp" line="385"/>
         <source>String</source>
         <translation>Chaine de Caractères</translation>
     </message>
     <message>
-        <location filename="decode_as_dialog.cpp" line="385"/>
+        <location filename="decode_as_dialog.cpp" line="387"/>
         <source>Integer, base </source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="decode_as_dialog.cpp" line="397"/>
+        <location filename="decode_as_dialog.cpp" line="399"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
@@ -4649,12 +4653,11 @@ pour fichiers de filtre : %2.</translation>
     </message>
     <message>
         <location filename="interface_frame.ui" line="44"/>
-        <location filename="interface_frame.cpp" line="161"/>
         <source>No interfaces found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="interface_frame.ui" line="66"/>
+        <location filename="interface_frame.ui" line="79"/>
         <source>Show Interfaces</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4747,32 +4750,37 @@ pour fichiers de filtre : %2.</translation>
 <context>
     <name>InterfaceTreeModel</name>
     <message>
-        <location filename="interface_tree_model.cpp" line="180"/>
+        <location filename="interface_tree_model.cpp" line="79"/>
+        <source>No Interfaces found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="interface_tree_model.cpp" line="233"/>
         <source>Addresses</source>
         <translation type="unfinished">Adresses</translation>
     </message>
     <message>
-        <location filename="interface_tree_model.cpp" line="180"/>
+        <location filename="interface_tree_model.cpp" line="233"/>
         <source>Address</source>
         <translation type="unfinished">Adresse</translation>
     </message>
     <message>
-        <location filename="interface_tree_model.cpp" line="187"/>
+        <location filename="interface_tree_model.cpp" line="240"/>
         <source>Extcap interface: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="interface_tree_model.cpp" line="192"/>
+        <location filename="interface_tree_model.cpp" line="245"/>
         <source>No addresses</source>
         <translation type="unfinished">Pas d&apos;adresse</translation>
     </message>
     <message>
-        <location filename="interface_tree_model.cpp" line="199"/>
+        <location filename="interface_tree_model.cpp" line="252"/>
         <source>No capture filter</source>
         <translation type="unfinished">Pas de filtre de capture</translation>
     </message>
     <message>
-        <location filename="interface_tree_model.cpp" line="204"/>
+        <location filename="interface_tree_model.cpp" line="257"/>
         <source>Capture filter</source>
         <translation type="unfinished">Filtre de capture</translation>
     </message>
@@ -10277,7 +10285,7 @@ a:hover {
         <translation>une préférence</translation>
     </message>
     <message>
-        <location filename="preference_editor_frame.cpp" line="77"/>
+        <location filename="preference_editor_frame.cpp" line="79"/>
         <source>Open %1 preferences</source>
         <translation>Ouvrir les préférences %1</translation>
     </message>
@@ -10346,7 +10354,7 @@ a:hover {
         <translation>Valeur</translation>
     </message>
     <message>
-        <location filename="preferences_dialog.cpp" line="441"/>
+        <location filename="preferences_dialog.cpp" line="452"/>
         <source>Preferences</source>
         <translation>Préférences</translation>
     </message>
@@ -10659,22 +10667,22 @@ a:hover {
 <context>
     <name>QObject</name>
     <message>
-        <location filename="preferences_dialog.cpp" line="109"/>
+        <location filename="preferences_dialog.cpp" line="111"/>
         <source>Default</source>
         <translation type="unfinished">Défaut</translation>
     </message>
     <message>
-        <location filename="preferences_dialog.cpp" line="111"/>
+        <location filename="preferences_dialog.cpp" line="113"/>
         <source>Changed</source>
         <translation type="unfinished">Modifier</translation>
     </message>
     <message>
-        <location filename="preferences_dialog.cpp" line="129"/>
+        <location filename="preferences_dialog.cpp" line="131"/>
         <source>Has this preference been changed?</source>
         <translation>Cette préférence a été changé?</translation>
     </message>
     <message>
-        <location filename="preferences_dialog.cpp" line="139"/>
+        <location filename="preferences_dialog.cpp" line="141"/>
         <source>Default value is empty</source>
         <translation>La valeur par défaut est vide</translation>
     </message>
@@ -10951,12 +10959,12 @@ a:hover {
         <translation>%1 entrées.</translation>
     </message>
     <message>
-        <location filename="module_preferences_scroll_area.cpp" line="182"/>
+        <location filename="module_preferences_scroll_area.cpp" line="184"/>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
-        <location filename="module_preferences_scroll_area.cpp" line="209"/>
+        <location filename="module_preferences_scroll_area.cpp" line="211"/>
         <source>Browse</source>
         <translation>Parcourir</translation>
     </message>
@@ -11207,7 +11215,7 @@ a:hover {
     </message>
     <message>
         <location filename="lte_rlc_statistics_dialog.cpp" line="176"/>
-        <location filename="preferences_dialog.cpp" line="107"/>
+        <location filename="preferences_dialog.cpp" line="109"/>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
@@ -15306,12 +15314,12 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
         <translation>Ouvrir </translation>
     </message>
     <message>
-        <location filename="uat_dialog.cpp" line="417"/>
+        <location filename="uat_dialog.cpp" line="419"/>
         <source>Uneven number of chars hex string (%1)</source>
         <translation>Nombre impair de caractères dans la chaine hex (%1)</translation>
     </message>
     <message>
-        <location filename="uat_dialog.cpp" line="424"/>
+        <location filename="uat_dialog.cpp" line="426"/>
         <source>Error parsing hex string</source>
         <translation>Erreur de conversion de la chaine hex</translation>
     </message>
-- 
cgit v1.2.1