[Automatic update for 2020-07-26]

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

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

1 files changed, 32 insertions, 43 deletions

diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 1b0c5a7041..f49e278b75 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -135,12 +135,9 @@
         <translation>Nom :</translation>
     </message>
     <message>
-        <source>Can&apos;t assign %1 to %2</source>
-        <translation type="vanished">Impossible d&apos;affecter %1 à %2</translation>
-    </message>
-    <message>
         <source>Can&apos;t assign %1 to %2.</source>
-        <translation type="unfinished">Impossible d&apos;affecter %1 à %2. {1 ?}</translation>
+        <oldsource>Can&apos;t assign %1 to %2</oldsource>
+        <translation type="unfinished">Impossible d&apos;affecter %1 à %2</translation>
     </message>
 </context>
 <context>
@@ -7866,10 +7863,6 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Merging files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
@@ -7878,12 +7871,14 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
         <translation>Sauvegarde en cours %1</translation>
     </message>
     <message>
-        <source>No interface selected</source>
-        <translation type="vanished">Aucune interface sélectionnée</translation>
+        <source>No interface selected.</source>
+        <oldsource>No interface selected</oldsource>
+        <translation type="unfinished">Aucune interface sélectionnée</translation>
     </message>
     <message>
-        <source>Invalid capture filter</source>
-        <translation type="vanished">Filtre de capture invalide</translation>
+        <source>Invalid capture filter.</source>
+        <oldsource>Invalid capture filter</oldsource>
+        <translation type="unfinished">Filtre de capture invalide</translation>
     </message>
     <message>
         <source>Clear Menu</source>
@@ -7910,6 +7905,11 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Merging files.</source>
+        <oldsource>Merging files</oldsource>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Couldn&apos;t copy text. Try another item.</source>
         <translation>Impossible de copier le texte. Essayer un autre item.</translation>
     </message>
@@ -7926,8 +7926,25 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No filter available. Try another </source>
-        <translation type="vanished">Aucun filtre disponible. Essayer un autre</translation>
+        <source>No filter available. Try another %1.</source>
+        <oldsource>No filter available. Try another </oldsource>
+        <translation type="unfinished">Aucun filtre disponible. Essayer un autre</translation>
+    </message>
+    <message>
+        <source>column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The &quot;%1&quot; column already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The &quot;%1&quot; column already exists as &quot;%2&quot;.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error compiling filter for this conversation.</source>
@@ -7942,14 +7959,6 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
         <translation type="vanished">Aucune Interface Sélectionnée</translation>
     </message>
     <message>
-        <source>No interface selected.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid capture filter.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source> before starting a new capture</source>
         <translation>avant de commencer une nouvelle capture</translation>
     </message>
@@ -7969,26 +7978,6 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No filter available. Try another %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>item</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The &quot;%1&quot; column already exists.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The &quot;%1&quot; column already exists as &quot;%2&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>No Interface Selected.</source>
         <translation type="unfinished"></translation>
     </message>