From b71c310203a264769292a502aefe0398f88b6fab Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald.combs@riverbed.com>
Date: Sun, 16 Dec 2018 08:24:12 +0000
Subject: [Automatic update for 2018-12-16]

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

Change-Id: Iafc95a8b4a651033480dc82de7ecd839cc8fa46c
Reviewed-on: https://code.wireshark.org/review/31060
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
 ui/qt/wireshark_fr.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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

diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index ab94367a52..0a70069b8b 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -3907,11 +3907,6 @@ NOTE: Une option DOIT être sélectionnée.</translation>
         <source>Maximum frame length:</source>
         <translation>Longueur maximale de la trame:</translation>
     </message>
-    <message>
-        <source>The maximum size of the frames to write to the import capture file (max 256kiB)</source>
-        <oldsource>The maximum size of the frames to write to the import capture file (max 64000)</oldsource>
-        <translation type="unfinished">La taille maximale des trames&apos;écrire dans le fichier de capture d&apos;import (max 64000)</translation>
-    </message>
     <message>
         <source>Encapsulation</source>
         <translation>Encapsulation</translation>
@@ -4036,6 +4031,10 @@ NOTE: Une option DOIT être sélectionnée.</translation>
         <source>IPv4</source>
         <translation>IPv4</translation>
     </message>
+    <message>
+        <source>The maximum size of the frames to write to the import capture file (max 256kiB)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Import From Hex Dump</source>
         <translation>Importer Hexdump</translation>
-- 
cgit v1.2.3