lupdate QtShark.pro

Updating 'qtshark_de.ts'...
    Found 72 source text(s) (16 new and 56 already existing)
    Kept 13 obsolete entries
Updating 'qtshark_fr.ts'...
    Found 72 source text(s) (16 new and 56 already existing)
    Kept 10 obsolete entries
    Similar-text heuristic provided 3 translation(s)

Also remove $Id$, it is xml file (auto)generated by Qt (lupdate)

svn path=/trunk/; revision=44305

2 files changed, 164 insertions, 152 deletions

diff --git a/ui/qt/qtshark_de.ts b/ui/qt/qtshark_de.ts
index db7bc5abda..56abba1327 100644
--- a/ui/qt/qtshark_de.ts
+++ b/ui/qt/qtshark_de.ts
@@ -1,27 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.0" language="de_DE">
-<!--
-  $Id$
- 
-  Wireshark - Network traffic analyzer
-  By Gerald Combs <gerald@wireshark.org>
-  Copyright 1998 Gerald Combs
- 
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License
-  as published by the Free Software Foundation; either version 2
-  of the License, or (at your option) any later version.
- 
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
- 
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
--->
 <context>
     <name>ByteViewTab</name>
     <message>
@@ -40,23 +19,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable &amp;MAC name resolution</source>
+        <source>All Files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable &amp;transport name resolution</source>
+        <source>&amp;MAC name resolution</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable &amp;network name resolution</source>
+        <source>&amp;Transport name resolution</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use &amp;external name resolver</source>
+        <source>&amp;Network name resolution</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Files (*.*)</source>
+        <source>&amp;External name resolver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>unknown file format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error opening file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -112,16 +115,16 @@
         <translation></translation>
     </message>
     <message>
-        <source>&lt;h1&gt;Files&lt;/h1&gt;</source>
+        <source>&lt;h1&gt;Online&lt;/h1&gt;</source>
         <translation></translation>
     </message>
     <message>
-        <source>&lt;h1&gt;Online&lt;/h1&gt;</source>
-        <translation></translation>
+        <source>&lt;h1&gt;Recent Files&lt;/h1&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>not found)</source>
-        <translation></translation>
+        <source>not found</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -219,14 +222,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ManuelPages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wireshark Filter</source>
         <translation type="unfinished"></translation>
     </message>
@@ -271,11 +266,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About Wireshark</source>
+        <source>Ask (Q&amp;&amp;A)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ask (Q&amp;&amp;A)</source>
+        <source>Manual pages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Contents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;About Wireshark</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -305,22 +312,6 @@
         <translation></translation>
     </message>
     <message>
-        <source>Packets: %1 Displayed: %2 Marked: %3</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source> Dropped: %1</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source> Ignored: %1</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source> Load time: %1:%2.%3</source>
-        <translation></translation>
-    </message>
-    <message>
         <source>No Packets</source>
         <translation></translation>
     </message>
diff --git a/ui/qt/qtshark_fr.ts b/ui/qt/qtshark_fr.ts
index a0201a64c2..8c82696ff3 100644
--- a/ui/qt/qtshark_fr.ts
+++ b/ui/qt/qtshark_fr.ts
@@ -1,27 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.0" language="fr_FR">
-<!--
-  $Id$
- 
-  Wireshark - Network traffic analyzer
-  By Gerald Combs <gerald@wireshark.org>
-  Copyright 1998 Gerald Combs
- 
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License
-  as published by the Free Software Foundation; either version 2
-  of the License, or (at your option) any later version.
- 
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
- 
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
--->
 <context>
     <name>ByteViewTab</name>
     <message>
@@ -33,40 +12,76 @@
 <context>
     <name>CaptureFileDialog</name>
     <message>
-        <location filename="capture_file_dialog.cpp" line="123"/>
+        <location filename="capture_file_dialog.cpp" line="128"/>
         <source>Wireshark: Open Capture File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_file_dialog.cpp" line="138"/>
+        <location filename="capture_file_dialog.cpp" line="145"/>
         <source>Display Filter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_file_dialog.cpp" line="148"/>
-        <source>Enable &amp;MAC name resolution</source>
+        <location filename="capture_file_dialog.cpp" line="156"/>
+        <source>&amp;MAC name resolution</source>
+        <oldsource>Enable &amp;network name resolution</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_file_dialog.cpp" line="152"/>
-        <source>Enable &amp;transport name resolution</source>
+        <location filename="capture_file_dialog.cpp" line="160"/>
+        <source>&amp;Transport name resolution</source>
+        <oldsource>Use &amp;external name resolver</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_file_dialog.cpp" line="156"/>
-        <source>Enable &amp;network name resolution</source>
+        <location filename="capture_file_dialog.cpp" line="164"/>
+        <source>&amp;Network name resolution</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_file_dialog.cpp" line="160"/>
-        <source>Use &amp;external name resolver</source>
+        <location filename="capture_file_dialog.cpp" line="168"/>
+        <source>&amp;External name resolver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_file_dialog.cpp" line="248"/>
+        <location filename="capture_file_dialog.cpp" line="295"/>
         <source>All Files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="capture_file_dialog.cpp" line="333"/>
+        <location filename="capture_file_dialog.cpp" line="334"/>
+        <location filename="capture_file_dialog.cpp" line="335"/>
+        <location filename="capture_file_dialog.cpp" line="336"/>
+        <location filename="capture_file_dialog.cpp" line="337"/>
+        <source>-</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="capture_file_dialog.cpp" line="344"/>
+        <source>directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="capture_file_dialog.cpp" line="351"/>
+        <source>unknown file format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="capture_file_dialog.cpp" line="353"/>
+        <source>error opening file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="capture_file_dialog.cpp" line="421"/>
+        <source>?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="capture_file_dialog.cpp" line="427"/>
+        <source>unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DisplayFilterCombo</name>
@@ -103,12 +118,12 @@
 <context>
     <name>InterfaceTree</name>
     <message>
-        <location filename="interface_tree.cpp" line="49"/>
+        <location filename="interface_tree.cpp" line="54"/>
         <source>Welcome screen list</source>
         <translation>Page de bienvenue</translation>
     </message>
     <message>
-        <location filename="interface_tree.cpp" line="63"/>
+        <location filename="interface_tree.cpp" line="74"/>
         <source>&lt;h3&gt;No interfaces found&lt;/h3&gt;%1</source>
         <translation>&lt;h3&gt;Interface non trouvée&lt;/h3&gt;%1</translation>
     </message>
@@ -132,196 +147,206 @@
     </message>
     <message>
         <location filename="main_welcome.cpp" line="118"/>
-        <source>&lt;h1&gt;Files&lt;/h1&gt;</source>
-        <translation>&lt;h1&gt;Fichiers&lt;/h1&gt;</translation>
+        <source>&lt;h1&gt;Recent Files&lt;/h1&gt;</source>
+        <oldsource>&lt;h1&gt;Files&lt;/h1&gt;</oldsource>
+        <translation type="unfinished">&lt;h1&gt;Fichiers&lt;/h1&gt;</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="136"/>
+        <location filename="main_welcome.cpp" line="155"/>
         <source>&lt;h1&gt;Online&lt;/h1&gt;</source>
         <translation>&lt;h1&gt;En Ligne&lt;/h1&gt;</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="174"/>
+        <location filename="main_welcome.cpp" line="193"/>
+        <source>not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>not found)</source>
-        <translation>non trouvé)</translation>
+        <translation type="obsolete">non trouvé)</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="main_window.ui" line="14"/>
-        <location filename="main_window.ui" line="237"/>
-        <location filename="main_window.ui" line="247"/>
+        <location filename="main_window.ui" line="36"/>
+        <location filename="main_window.ui" line="269"/>
+        <location filename="main_window.ui" line="279"/>
         <source>Wireshark</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="55"/>
+        <location filename="main_window.ui" line="77"/>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="59"/>
+        <location filename="main_window.ui" line="81"/>
         <source>Open Recent</source>
         <translation>Dernier fichier ouvert</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="71"/>
+        <location filename="main_window.ui" line="93"/>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="76"/>
+        <location filename="main_window.ui" line="98"/>
         <source>Capture</source>
         <translation>Capture</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="84"/>
+        <location filename="main_window.ui" line="106"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="88"/>
-        <source>ManuelPages</source>
+        <location filename="main_window.ui" line="110"/>
+        <source>Manual pages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="153"/>
+        <location filename="main_window.ui" line="175"/>
         <source>toolBar</source>
         <translation>Barre d&apos;outils</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="164"/>
+        <location filename="main_window.ui" line="186"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="167"/>
+        <location filename="main_window.ui" line="189"/>
         <source>Ctrl+O</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="172"/>
+        <location filename="main_window.ui" line="194"/>
         <source>Quit</source>
         <translation>Quitter</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="175"/>
+        <location filename="main_window.ui" line="197"/>
         <source>Ctrl+Q</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="180"/>
+        <location filename="main_window.ui" line="202"/>
         <source>Interfaces</source>
         <translation>Interfaces</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="193"/>
+        <location filename="main_window.ui" line="215"/>
         <source>Start</source>
         <translation>Démarrer</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="196"/>
+        <location filename="main_window.ui" line="218"/>
         <source>Start capturing packets</source>
         <translation>Démarrer la capture de paquet</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="199"/>
+        <location filename="main_window.ui" line="221"/>
         <source>Ctrl+K</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="208"/>
+        <location filename="main_window.ui" line="230"/>
         <source>Stop</source>
         <translation>Arrêter</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="211"/>
+        <location filename="main_window.ui" line="233"/>
         <source>Stop capturing packets</source>
         <translation>Arrêter la capturer de paquet</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="216"/>
+        <location filename="main_window.ui" line="238"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="219"/>
+        <location filename="main_window.ui" line="241"/>
         <source>Ctrl+W</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="227"/>
+        <location filename="main_window.ui" line="249"/>
         <source>No files found</source>
         <translation>Pas de fichier trouvé</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="232"/>
-        <source>Contents</source>
+        <location filename="main_window.ui" line="258"/>
+        <source>&amp;Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="242"/>
+        <location filename="main_window.ui" line="261"/>
+        <source>F1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main_window.ui" line="345"/>
+        <source>&amp;About Wireshark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main_window.ui" line="274"/>
         <source>Wireshark Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="252"/>
+        <location filename="main_window.ui" line="284"/>
         <source>RawShark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="257"/>
+        <location filename="main_window.ui" line="289"/>
         <source>Dumpcap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="262"/>
+        <location filename="main_window.ui" line="294"/>
         <source>Mergecap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="267"/>
+        <location filename="main_window.ui" line="299"/>
         <source>Editcap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="272"/>
+        <location filename="main_window.ui" line="304"/>
         <source>Text2cap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="277"/>
+        <location filename="main_window.ui" line="309"/>
         <source>Website</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="282"/>
+        <location filename="main_window.ui" line="314"/>
         <source>FAQ&apos;s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="287"/>
+        <location filename="main_window.ui" line="319"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="292"/>
+        <location filename="main_window.ui" line="328"/>
         <source>Wiki</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="297"/>
+        <location filename="main_window.ui" line="336"/>
         <source>Sample Captures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="302"/>
-        <source>About Wireshark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="main_window.ui" line="307"/>
+        <location filename="main_window.ui" line="353"/>
         <source>Ask (Q&amp;&amp;A)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -331,12 +356,12 @@
         <translation>Chargement: %1</translation>
     </message>
     <message>
-        <location filename="main_window.cpp" line="259"/>
+        <location filename="main_window.cpp" line="262"/>
         <source>Invalid Display Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window.cpp" line="368"/>
+        <location filename="main_window.cpp" line="373"/>
         <source>Clear Menu</source>
         <translation>Effacer les fichiers récemment ouverts</translation>
     </message>
@@ -362,37 +387,33 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="main_status_bar.cpp" line="42"/>
+        <location filename="main_status_bar.cpp" line="45"/>
         <source> Ready to load or capture</source>
         <translation> Prêt pour ouvrir ou capturer</translation>
     </message>
     <message>
-        <location filename="main_status_bar.cpp" line="44"/>
+        <location filename="main_status_bar.cpp" line="47"/>
         <source> Ready to load file</source>
         <translation> Prêt pour ouvrir un fichier</translation>
     </message>
     <message>
-        <location filename="main_status_bar.cpp" line="97"/>
         <source>Packets: %1 Displayed: %2 Marked: %3</source>
-        <translation>Paquets: %1 Affichés: %2 Marqués: %3</translation>
+        <translation type="obsolete">Paquets: %1 Affichés: %2 Marqués: %3</translation>
     </message>
     <message>
-        <location filename="main_status_bar.cpp" line="102"/>
         <source> Dropped: %1</source>
-        <translation> Supprimé: %1</translation>
+        <translation type="obsolete"> Supprimé: %1</translation>
     </message>
     <message>
-        <location filename="main_status_bar.cpp" line="105"/>
         <source> Ignored: %1</source>
-        <translation> Ignoré: %1</translation>
+        <translation type="obsolete"> Ignoré: %1</translation>
     </message>
     <message>
-        <location filename="main_status_bar.cpp" line="110"/>
         <source> Load time: %1:%2.%3</source>
-        <translation> Temps de Chargement: %1:%2.%3</translation>
+        <translation type="obsolete"> Temps de Chargement: %1:%2.%3</translation>
     </message>
     <message>
-        <location filename="main_status_bar.cpp" line="121"/>
+        <location filename="main_status_bar.cpp" line="125"/>
         <source>No Packets</source>
         <translation>Pas de paquets</translation>
     </message>