First batch of French translations updates

1 files changed, 660 insertions, 254 deletions

diff --git a/translations/assistant_fr.ts b/translations/assistant_fr.ts
index e117663..8563c75 100644
--- a/translations/assistant_fr.ts
+++ b/translations/assistant_fr.ts
@@ -4,7 +4,6 @@
 <context>
     <name>AboutDialog</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/aboutdialog.cpp" line="+117"/>
         <source>&amp;Close</source>
         <translation>&amp;Fermer</translation>
     </message>
@@ -12,19 +11,16 @@
 <context>
     <name>AboutLabel</name>
     <message>
-        <location line="-15"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Unable to launch external application.
 </source>
         <translation>Impossible d&apos;ouvrir l&apos;application externe.
 </translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -32,17 +28,14 @@
 <context>
     <name>Assistant</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/main.cpp" line="+177"/>
         <source>Error registering documentation file &apos;%1&apos;: %2</source>
         <translation>Erreur lors de l&apos;enregistrement du fichier de documentation &apos;%1&apos; : %2</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>Error: %1</source>
         <translation>Erreur : %1</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>Could not register documentation file
 %1
 
@@ -55,12 +48,10 @@ Raison :
 %2</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Documentation successfully registered.</source>
         <translation>Documentation enregistrée avec succès.</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Could not unregister documentation file
 %1
 
@@ -73,27 +64,22 @@ Raison :
 %2</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Documentation successfully unregistered.</source>
         <translation>Documentation retirée avec succès.</translation>
     </message>
     <message>
-        <location line="+55"/>
         <source>Error reading collection file &apos;%1&apos;: %2.</source>
         <translation>Erreur lors de la lecture du fichier de collection &apos;%1&apos; : %2.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Error creating collection file &apos;%1&apos;: %2.</source>
         <translation>Erreur lors de la création du fichier de collection &apos;%1&apos; : %2.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Error reading collection file &apos;%1&apos;: %2</source>
-        <translation>Erreur lors de la lecture du fichier de collection &apos;%1&apos; : %2</translation>
+        <translation type="obsolete">Erreur lors de la lecture du fichier de collection &apos;%1&apos; : %2</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Cannot load sqlite database driver!</source>
         <translation>Impossible de charger le driver de la base de données sqlite !</translation>
     </message>
@@ -101,27 +87,22 @@ Raison :
 <context>
     <name>BookmarkDialog</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkdialog.ui"/>
         <source>Add Bookmark</source>
         <translation>Ajouter un signet</translation>
     </message>
     <message>
-        <location/>
         <source>Bookmark:</source>
         <translation>Signet :</translation>
     </message>
     <message>
-        <location/>
         <source>Add in Folder:</source>
         <translation>Ajouter dans le dossier :</translation>
     </message>
     <message>
-        <location/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location/>
         <source>New Folder</source>
         <translation>Nouveau dossier</translation>
     </message>
@@ -134,74 +115,72 @@ Raison :
         <translation type="obsolete">Supprimer le dossier</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkdialog.cpp" line="+227"/>
         <source>Rename Folder</source>
         <translation>Renommer le dossier</translation>
     </message>
 </context>
 <context>
+    <name>BookmarkItem</name>
+    <message>
+        <source>New Folder</source>
+        <translation type="unfinished">Nouveau dossier</translation>
+    </message>
+    <message>
+        <source>Untitled</source>
+        <translation type="unfinished">Sans titre</translation>
+    </message>
+</context>
+<context>
     <name>BookmarkManager</name>
     <message>
         <source>Bookmarks</source>
         <translation type="obsolete">Signets</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="+151"/>
         <source>Untitled</source>
         <translation>Sans titre</translation>
     </message>
     <message>
-        <location line="+65"/>
         <source>Remove</source>
         <translation>Suppression</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>You are going to delete a Folder, this will also&lt;br&gt;remove it&apos;s content. Are you sure to continue?</source>
         <translation>Vous allez supprimer un dossier, ceci va aussi&lt;br&gt;supprimer son contenu. Voulez-vous continuer ?</translation>
     </message>
     <message>
-        <location line="+148"/>
         <source>Manage Bookmarks...</source>
         <translation>Gestion des signets...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Add Bookmark...</source>
         <translation>Ajouter un signet...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location line="+68"/>
         <source>Delete Folder</source>
         <translation>Supprimer le dossier</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Rename Folder</source>
         <translation>Renommer le dossier</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Show Bookmark</source>
         <translation>Afficher le signet</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Show Bookmark in New Tab</source>
         <translation>Afficher le signet dans un nouvel onglet</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Delete Bookmark</source>
         <translation>Supprimer le signet</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Rename Bookmark</source>
         <translation>Renommer le signet</translation>
     </message>
@@ -213,100 +192,78 @@ Raison :
 <context>
     <name>BookmarkManagerWidget</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanagerwidget.ui"/>
         <source>Manage Bookmarks</source>
         <translation>Gestion des signets</translation>
     </message>
     <message>
-        <location/>
         <source>Search:</source>
         <translation>Recherche :</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanagerwidget.cpp" line="+258"/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location/>
         <source>Import and Backup</source>
         <translation>Importation et sauvegarde</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanagerwidget.cpp" line="-30"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanagerwidget.cpp" line="-142"/>
         <source>Import...</source>
         <translation>Importer...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Export...</source>
         <translation>Exporter...</translation>
     </message>
     <message>
-        <location line="+112"/>
         <source>Open File</source>
         <translation>Ouvrir un fichier</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+16"/>
         <source>Files (*.xbel)</source>
         <translation>Fichiers (*.xbel)</translation>
     </message>
     <message>
-        <location line="-1"/>
         <source>Save File</source>
         <translation>Enregistrer le fichier</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Qt Assistant</source>
         <translation>Qt Assistant</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Unable to save bookmarks.</source>
         <translation>Impossible de sauvegarder les signets.</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>You are goingto delete a Folder, this will also&lt;br&gt; remove it&apos;s content. Are you sure to continue?</source>
         <translation>Vous êtes sur le point de supprimer un dossier, ceci supprimera&lt;br&gt; également son contenu. Voulez-vous continuer ?</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Delete Folder</source>
         <translation>Supprimer le dossier</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Rename Folder</source>
         <translation>Renommer le dossier</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Show Bookmark</source>
         <translation>Afficher le signet</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Show Bookmark in New Tab</source>
         <translation>Afficher le signet dans un nouvel onglet</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Delete Bookmark</source>
         <translation>Supprimer le signet</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Rename Bookmark</source>
         <translation>Renommer le signet</translation>
     </message>
@@ -314,17 +271,18 @@ Raison :
 <context>
     <name>BookmarkModel</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmodel.cpp" line="+88"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <source>Toolbar Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Bookmarks Menu</source>
         <translation>Menu signets</translation>
     </message>
@@ -356,22 +314,18 @@ Raison :
         <translation type="obsolete">Renommer le signet</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkwidget.ui"/>
         <source>Filter:</source>
         <translation>Filtre :</translation>
     </message>
     <message>
-        <location/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location/>
         <source>Remove</source>
         <translation>Retirer</translation>
     </message>
     <message>
-        <location/>
         <source>Bookmarks</source>
         <translation>Signets</translation>
     </message>
@@ -379,111 +333,122 @@ Raison :
 <context>
     <name>CentralWidget</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="+121"/>
         <source>Add new page</source>
-        <translation>Créer une nouvelle page</translation>
+        <translation type="obsolete">Créer une nouvelle page</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Close current page</source>
-        <translation>Fermer la page courante</translation>
+        <translation type="obsolete">Fermer la page courante</translation>
     </message>
     <message>
-        <location line="+287"/>
         <source>Print Document</source>
         <translation>Imprimer le document</translation>
     </message>
     <message>
-        <location line="+126"/>
-        <location line="+2"/>
         <source>unknown</source>
-        <translation>inconnu</translation>
+        <translation type="obsolete">inconnu</translation>
     </message>
     <message>
-        <location line="+101"/>
         <source>Add New Page</source>
-        <translation>Créer une nouvelle page</translation>
+        <translation type="obsolete">Créer une nouvelle page</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Close This Page</source>
-        <translation>Fermer cette page</translation>
+        <translation type="obsolete">Fermer cette page</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Close Other Pages</source>
-        <translation>Fermer les autres pages</translation>
+        <translation type="obsolete">Fermer les autres pages</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Add Bookmark for this Page...</source>
-        <translation>Ajouter un signet pour cette page...</translation>
+        <translation type="obsolete">Ajouter un signet pour cette page...</translation>
     </message>
     <message>
-        <location line="+264"/>
         <source>Search</source>
-        <translation>Recherche</translation>
+        <translation type="obsolete">Recherche</translation>
     </message>
 </context>
 <context>
     <name>CmdLineParser</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="+137"/>
+        <source>Usage: assistant [Options]
+
+-collectionFile file       Uses the specified collection
+                           file instead of the default one
+-showUrl url               Shows the document with the
+                           url.
+-enableRemoteControl       Enables Assistant to be
+                           remotely controlled.
+-show widget               Shows the specified dockwidget
+                           which can be &quot;contents&quot;, &quot;index&quot;,
+                           &quot;bookmarks&quot; or &quot;search&quot;.
+-activate widget           Activates the specified dockwidget
+                           which can be &quot;contents&quot;, &quot;index&quot;,
+                           &quot;bookmarks&quot; or &quot;search&quot;.
+-hide widget               Hides the specified dockwidget
+                           which can be &quot;contents&quot;, &quot;index&quot;
+                           &quot;bookmarks&quot; or &quot;search&quot;.
+-register helpFile         Registers the specified help file
+                           (.qch) in the given collection
+                           file.
+-unregister helpFile       Unregisters the specified help file
+                           (.qch) from the give collection
+                           file.
+-setCurrentFilter filter   Set the filter as the active filter.
+-remove-search-index       Removes the full text search index.
+-rebuild-search-index      Re-builds the full text search index (potentially slow).
+-quiet                     Does not display any error or
+                           status message.
+-help                      Displays this help.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Unknown option: %1</source>
         <translation>Option inconnue : %1</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>The collection file &apos;%1&apos; does not exist.</source>
         <translation>Le fichier de collection &apos;%1&apos; n&apos;existe pas.</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Missing collection file.</source>
         <translation>Fichier de collection manquant.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Invalid URL &apos;%1&apos;.</source>
         <translation>URL invalide &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Missing URL.</source>
         <translation>URL manquante.</translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>Unknown widget: %1</source>
         <translation>Widget inconnu : %1</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Missing widget.</source>
         <translation>Widget manquant.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>The Qt help file &apos;%1&apos; does not exist.</source>
         <translation>Le fichier d&apos;aide Qt &apos;%1&apos; n&apos;existe pas.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Missing help file.</source>
         <translation>Fichier d&apos;aide manquant.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Missing filter argument.</source>
         <translation>Argument de filtre manquant.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Notice</source>
         <translation>Avertissement</translation>
     </message>
@@ -491,43 +456,146 @@ Raison :
 <context>
     <name>ContentWindow</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/contentwindow.cpp" line="+173"/>
         <source>Open Link</source>
         <translation>Ouvrir le lien</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Open Link in New Tab</source>
         <translation>Ouvrir le lien dans un nouvel onglet</translation>
     </message>
 </context>
 <context>
+    <name>ConversionWizard</name>
+    <message>
+        <source>Help Conversion Wizard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converting %1...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Writing help collection file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done.</source>
+        <translation type="unfinished">Terminé.</translation>
+    </message>
+</context>
+<context>
+    <name>FilesPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Files:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unreferenced Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove files which are neither referenced by a keyword nor by the TOC.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Warning:&lt;/b&gt; When removing images or stylesheets, be aware that those files are not directly referenced by the .adp or .dcf file.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>FilterNameDialogClass</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/filternamedialog.ui"/>
         <source>Add Filter Name</source>
         <translation>Ajouter un filtre</translation>
     </message>
     <message>
-        <location/>
         <source>Filter Name:</source>
         <translation>Nom du filtre :</translation>
     </message>
 </context>
 <context>
+    <name>FilterPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter attributes for current documentation (comma separated list):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom Filters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</source>
+        <translation type="unfinished">1</translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished">2</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished">Ajouter</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the filter attributes for the documentation. If filter attributes are used, also define a custom filter for it. Both the filter attributes and the custom filters are optional.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The custom filter &apos;%1&apos; is defined multiple times.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The attributes for custom filter &apos;%1&apos; are defined multiple times.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>unfiltered</source>
+        <comment>list of available documentation</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>FindWidget</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/findwidget.cpp" line="+85"/>
         <source>Previous</source>
         <translation>Précédent</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Next</source>
         <translation>Suivant</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Case Sensitive</source>
         <translation>Sensible à la casse</translation>
     </message>
@@ -536,54 +604,152 @@ Raison :
         <translation type="obsolete">Mots complets</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>&lt;img src=&quot;:/trolltech/assistant/images/wrap.png&quot;&gt;&amp;nbsp;Search wrapped</source>
         <translation>&lt;img src=&quot;:/trolltech/assistant/images/wrap.png&quot;&gt;&amp;nbsp;Recherche à partir du début</translation>
     </message>
 </context>
 <context>
+    <name>FinishPage</name>
+    <message>
+        <source>Converting File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating the new Qt help files from the old ADP file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>FontPanel</name>
     <message>
-        <location filename="../tools/shared/fontpanel/fontpanel.cpp" line="+63"/>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>&amp;Writing system</source>
         <translation>&amp;Système d&apos;écriture</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Family</source>
         <translation>&amp;Famille</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Style</source>
         <translation>&amp;Style</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Point size</source>
         <translation>&amp;Taille en points</translation>
     </message>
 </context>
 <context>
+    <name>GeneralPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Namespace:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Virtual Folder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the namespace and the virtual folder for the documentation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Namespace Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The namespace contains some invalid characters.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Virtual Folder Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The virtual folder contains some invalid characters.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GlobalActions</name>
+    <message>
+        <source>&amp;Back</source>
+        <translation type="unfinished">&amp;Précédent</translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished">&amp;Suivant</translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished">&amp;Accueil</translation>
+    </message>
+    <message>
+        <source>ALT+Home</source>
+        <translation type="unfinished">ALT+Home</translation>
+    </message>
+    <message>
+        <source>Zoom &amp;in</source>
+        <translation type="unfinished">Zoom &amp;avant</translation>
+    </message>
+    <message>
+        <source>Zoom &amp;out</source>
+        <translation type="unfinished">Zoom a&amp;rrière</translation>
+    </message>
+    <message>
+        <source>&amp;Copy selected Text</source>
+        <translation type="unfinished">&amp;Copier le texte selectionné</translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished">&amp;Imprimer...</translation>
+    </message>
+    <message>
+        <source>&amp;Find in Text...</source>
+        <translation type="unfinished">&amp;Rechercher dans le texte...</translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished">&amp;Rechercher</translation>
+    </message>
+</context>
+<context>
+    <name>HelpEngineWrapper</name>
+    <message>
+        <source>Unfiltered</source>
+        <translation type="unfinished">Non-filtré</translation>
+    </message>
+</context>
+<context>
+    <name>HelpGenerator</name>
+    <message>
+        <source>Warning: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>HelpViewer</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/helpviewer_qwv.cpp" line="+260"/>
         <source>Open Link in New Tab</source>
-        <translation>Ouvrir le lien dans un nouvel onglet</translation>
+        <translation type="obsolete">Ouvrir le lien dans un nouvel onglet</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/helpviewer.cpp" line="+58"/>
         <source>&lt;title&gt;about:blank&lt;/title&gt;</source>
         <translatorcomment>y&apos;a t&apos;il une autre traduction dans Firefox &amp; cie ?</translatorcomment>
         <translation>&lt;title&gt;about:blank&lt;/title&gt;</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&lt;title&gt;Error 404...&lt;/title&gt;&lt;div align=&quot;center&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;h1&gt;The page could not be found&lt;/h1&gt;&lt;br&gt;&lt;h3&gt;&apos;%1&apos;&lt;/h3&gt;&lt;/div&gt;</source>
         <translation>&lt;title&gt;Erreur 404...&lt;/title&gt;&lt;div align=&quot;center&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;h1&gt;La page n&apos;a pas pu être trouvée&lt;/h1&gt;&lt;br&gt;&lt;h3&gt;&apos;%1&apos;&lt;/h3&gt;&lt;/div&gt;</translation>
     </message>
@@ -602,129 +768,198 @@ Raison :
         <translation type="obsolete">OK</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/helpviewer_qtb.cpp" line="+230"/>
+        <source>Open Link</source>
+        <translation type="unfinished">Ouvrir le lien</translation>
+    </message>
+    <message>
         <source>Copy &amp;Link Location</source>
         <translation>Copier l&apos;&amp;adresse cible</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reload</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Open Link in New Tab	Ctrl+LMB</source>
         <translatorcomment>LMB? ← ouais exactement pareil...</translatorcomment>
         <translation>Ouvrir dans un nouvel onglet	Ctrl+clic gauche</translation>
     </message>
+    <message>
+        <source>Open Link in New Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Wizard Assistant&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IdentifierPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create identifiers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Global prefix:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Inherit prefix from file names</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Identifiers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page allows you to create identifiers from the keywords found in the .adp or .dcf file.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IndexWindow</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/indexwindow.cpp" line="+68"/>
         <source>&amp;Look for:</source>
         <translation>&amp;Rechercher :</translation>
     </message>
     <message>
-        <location line="+74"/>
         <source>Open Link</source>
         <translation>Ouvrir le lien</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Open Link in New Tab</source>
         <translation>Ouvrir le lien dans un nouvel onglet</translation>
     </message>
 </context>
 <context>
+    <name>InputPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <source>Input File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the .adp or .dcf file you want to convert to the new Qt help project format and/or collection format.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qt Help Files (*.adp *.dcf)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Open Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The specified file could not be opened!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Parsing Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parsing error in line %1!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InstallDialog</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.ui"/>
-        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="+78"/>
         <source>Install Documentation</source>
         <translation>Installer la documentation</translation>
     </message>
     <message>
-        <location/>
         <source>Available Documentation:</source>
         <translation>Documentation disponible :</translation>
     </message>
     <message>
-        <location/>
         <source>Install</source>
         <translation>Installer</translation>
     </message>
     <message>
-        <location/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location/>
         <source>Installation Path:</source>
         <translation>Chemin d&apos;installation :</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="+33"/>
         <source>Downloading documentation info...</source>
         <translation>Téléchargement des informations de la documentation...</translation>
     </message>
     <message>
-        <location line="+51"/>
         <source>Download canceled.</source>
         <translation>Téléchargement annulé.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+79"/>
-        <location line="+27"/>
         <source>Done.</source>
         <translation>Terminé.</translation>
     </message>
     <message>
-        <location line="-91"/>
         <source>The file %1 already exists. Do you want to overwrite it?</source>
         <translation>Le fichier %1 existe déjà. Voulez-vous l&apos;écraser ?</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Unable to save the file %1: %2.</source>
         <translation>Impossible de sauver le fichier %1 : %2.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Downloading %1...</source>
         <translation>Téléchargement de %1 en cours...</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+42"/>
-        <location line="+40"/>
         <source>Download failed: %1.</source>
         <translation>Échec du téléchargement : %1.</translation>
     </message>
     <message>
-        <location line="-72"/>
         <source>Documentation info file is corrupt!</source>
         <translation>Le fichier d&apos;information de documentation est corrompu !</translation>
     </message>
     <message>
-        <location line="+37"/>
         <source>Download failed: Downloaded file is corrupted.</source>
         <translation>Échec du téléchargement : le fichier téléchargé est corrompu.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Installing documentation %1...</source>
         <translation>Installation de la documentation %1...</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Error while installing documentation:
 %1</source>
         <translation>Erreur durant l&apos;installation de la documentation :
@@ -734,27 +969,22 @@ Raison :
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="+123"/>
-        <location line="+369"/>
         <source>Index</source>
         <translation>Index</translation>
     </message>
     <message>
-        <location line="-363"/>
-        <location line="+361"/>
         <source>Contents</source>
         <translation>Sommaire</translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+358"/>
         <source>Bookmarks</source>
         <translation>Signets</translation>
     </message>
     <message>
-        <location line="-336"/>
-        <location line="+680"/>
-        <location line="+284"/>
+        <source>Open Pages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Qt Assistant</source>
         <translation>Qt Assistant</translation>
     </message>
@@ -763,197 +993,170 @@ Raison :
         <translation type="obsolete">Non-filtré</translation>
     </message>
     <message>
-        <location line="-772"/>
         <source>Looking for Qt Documentation...</source>
         <translation>Recherche la documentation de Qt...</translation>
     </message>
     <message>
-        <location line="+60"/>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Page Set&amp;up...</source>
         <translation>&amp;Mise en page...</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Print Preview...</source>
         <translation>Aperçu avant impression...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Print...</source>
-        <translation>&amp;Imprimer...</translation>
+        <translation type="obsolete">&amp;Imprimer...</translation>
     </message>
     <message>
-        <location line="-10"/>
         <source>New &amp;Tab</source>
         <translation>Nouvel ongle&amp;t</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>&amp;Close Tab</source>
         <translation>&amp;Fermer l&apos;onglet</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>CTRL+Q</source>
         <translation>CTRL+Q</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Edit</source>
         <translation>&amp;Édition</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Copy selected Text</source>
-        <translation>&amp;Copier le texte selectionné</translation>
+        <translation type="obsolete">&amp;Copier le texte selectionné</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;Find in Text...</source>
-        <translation>&amp;Rechercher dans le texte...</translation>
+        <translation type="obsolete">&amp;Rechercher dans le texte...</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Find</source>
-        <translation>&amp;Rechercher</translation>
+        <translation type="obsolete">&amp;Rechercher</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Find &amp;Next</source>
         <translation>Rechercher le suiva&amp;nt</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Find &amp;Previous</source>
         <translation>Rechercher le &amp;précédent</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Preferences...</source>
         <translation>Préférences...</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;View</source>
         <translation>&amp;Affichage</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zoom &amp;in</source>
-        <translation>Zoom &amp;avant</translation>
+        <translation type="obsolete">Zoom &amp;avant</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Zoom &amp;out</source>
-        <translation>Zoom a&amp;rrière</translation>
+        <translation type="obsolete">Zoom a&amp;rrière</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Normal &amp;Size</source>
         <translation>&amp;Taille normale</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Ctrl+0</source>
         <translation>Ctrl+0</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>ALT+C</source>
         <translation>ALT+C</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>ALT+I</source>
         <translation>ALT+I</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>ALT+O</source>
         <translation>ALT+O</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Search</source>
         <translation>Recherche</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <source>Bookmark Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>ALT+S</source>
         <translation>ALT+S</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <source>ALT+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&amp;Go</source>
         <translation>A&amp;ller</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Home</source>
-        <translation>&amp;Accueil</translation>
+        <translation type="obsolete">&amp;Accueil</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ALT+Home</source>
-        <translation>ALT+Home</translation>
+        <translation type="obsolete">ALT+Home</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Back</source>
-        <translation>&amp;Précédent</translation>
+        <translation type="obsolete">&amp;Précédent</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Forward</source>
-        <translation>&amp;Suivant</translation>
+        <translation type="obsolete">&amp;Suivant</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Sync with Table of Contents</source>
         <translation>Synchroniser la table des matières</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Sync</source>
         <translation>Rafraîchir</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Next Page</source>
         <translation>Page suivante</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ctrl+Alt+Right</source>
         <translation>Ctrl+Alt+Right</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Previous Page</source>
         <translation>Page précédente</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ctrl+Alt+Left</source>
         <translation>Ctrl+Alt+Left</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Bookmarks</source>
         <translation>Si&amp;gnets</translation>
     </message>
     <message>
-        <location line="+592"/>
         <source>Could not register file &apos;%1&apos;: %2</source>
         <translation>Impossible d&apos;enregistrer le fichier &apos;%1&apos; : %2</translation>
     </message>
@@ -966,127 +1169,201 @@ Raison :
         <translation type="obsolete">CTRL+D</translation>
     </message>
     <message>
-        <location line="-590"/>
         <source>&amp;Help</source>
         <translation>Ai&amp;de</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>About...</source>
         <translation>À propos...</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Navigation Toolbar</source>
         <translation>Barre d&apos;outils de navigation</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>&amp;Window</source>
         <translation>&amp;Fenêtre</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Minimize</source>
         <translation>Minimiser</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location line="+43"/>
         <source>Toolbars</source>
         <translation>Barres d&apos;outils</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Filter Toolbar</source>
         <translation>Barre d&apos;outils de filtrage</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Filtered by:</source>
         <translation>Filtre :</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Address Toolbar</source>
         <translation>Barre d&apos;outils d&apos;adresse</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Address:</source>
         <translation>Adresse :</translation>
     </message>
     <message>
-        <location line="+112"/>
         <source>Could not find the associated content item.</source>
         <translatorcomment>what is item in this context? ← same question here</translatorcomment>
         <translation>Impossible de trouver l&apos;élément de contenu associé.</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <source>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;Version %2&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>About %1</source>
         <translation>À propos de %1</translation>
     </message>
     <message>
-        <location line="+175"/>
         <source>Updating search index</source>
         <translation>Mise à jour de l&apos;index de recherche</translation>
     </message>
 </context>
 <context>
+    <name>OpenPagesWidget</name>
+    <message>
+        <source>Close %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close All Except %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OutputPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Project file name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Collection file name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Output File Names</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the file names for the output files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qt Help Project File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qt Help Collection Project File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The specified file %1 already exist.
+
+Do you want to remove it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>PathPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File filters:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Documentation source file paths:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished">Ajouter</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source File Paths</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the paths where the sources files are located. By default, all files in those directories matched by the file filter will be included.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source File Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.cpp" line="+252"/>
-        <location line="+44"/>
         <source>Add Documentation</source>
         <translation>Ajouter de la documentation</translation>
     </message>
     <message>
-        <location line="-44"/>
         <source>Qt Compressed Help Files (*.qch)</source>
         <translation>Fichiers d&apos;aide Qt compressés (*.qch)</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>The namespace %1 is already registered!</source>
         <translation>L&apos;espace de nom %1 existe déjà !</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>The specified file is not a valid Qt Help File!</source>
         <translation>Le fichier spécifié n&apos;est pas un fichier d&apos;aide Qt valide !</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Remove Documentation</source>
         <translation>Supprimer la documentation</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents.</source>
         <translation>Certains documents ouverts dans Assistant ont des références vers la documentation que vous allez supprimer. Supprimer la documentation fermera ces documents.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location line="+83"/>
         <source>Use custom settings</source>
         <translation>Utiliser des paramètres personnalisés</translation>
     </message>
@@ -1094,121 +1371,238 @@ Raison :
 <context>
     <name>PreferencesDialogClass</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui"/>
         <source>Preferences</source>
         <translation>Préférences</translation>
     </message>
     <message>
-        <location/>
         <source>Fonts</source>
         <translation>Polices</translation>
     </message>
     <message>
-        <location/>
         <source>Font settings:</source>
         <translation>Configuration des polices :</translation>
     </message>
     <message>
-        <location/>
         <source>Browser</source>
         <translation>Navigateur</translation>
     </message>
     <message>
-        <location/>
         <source>Application</source>
         <translation>Application</translation>
     </message>
     <message>
-        <location/>
         <source>Filters</source>
         <translation>Filtres</translation>
     </message>
     <message>
-        <location/>
         <source>Filter:</source>
         <translation>Filtre :</translation>
     </message>
     <message>
-        <location/>
         <source>Attributes:</source>
         <translation>Attributs :</translation>
     </message>
     <message>
-        <location/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location/>
         <source>Documentation</source>
         <translation>Documentation</translation>
     </message>
     <message>
-        <location/>
         <source>Registered Documentation:</source>
         <translatorcomment>documentation enregistrée ? ← je préfère référencée pour les deux...</translatorcomment>
         <translation>Documentation référencée :</translation>
     </message>
     <message>
-        <location/>
         <source>Add...</source>
         <translation>Ajouter...</translation>
     </message>
     <message>
-        <location/>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
-        <location/>
         <source>On help start:</source>
         <translation>Au démarrage :</translation>
     </message>
     <message>
-        <location/>
         <source>Show my home page</source>
         <translation>Afficher ma page d&apos;accueil</translation>
     </message>
     <message>
-        <location/>
         <source>Show a blank page</source>
         <translation>Afficher une page blanche</translation>
     </message>
     <message>
-        <location/>
         <source>Show my tabs from last session</source>
         <translation>Afficher mes onglets de la dernière session</translation>
     </message>
     <message>
-        <location/>
         <source>Homepage</source>
         <translation>Page d&apos;accueil</translation>
     </message>
     <message>
-        <location/>
         <source>Current Page</source>
         <translation>Page courante</translation>
     </message>
     <message>
-        <location/>
         <source>Blank Page</source>
         <translation>Page blanche</translation>
     </message>
     <message>
-        <location/>
         <source>Restore to default</source>
         <translation>Restaurer les valeurs par défaut</translation>
     </message>
+    <message>
+        <source>Appearance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show tabs for each individual page</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QCollectionGenerator</name>
+    <message>
+        <source>Unknown token at line %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown token at line %1. Expected &quot;QtHelpCollectionProject&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Missing end tags.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Missing input or output file for help file generation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Missing output file name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qt Collection Generator version 1.0 (Qt %1)
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Missing collection config file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+Usage:
+
+qcollectiongenerator &lt;collection-config-file&gt; [options]
+
+  -o &lt;collection-file&gt;   Generates a collection file
+                         called &lt;collection-file&gt;. If
+                         this option is not specified
+                         a default name will be used.
+  -v                     Displays the version of
+                         qcollectiongenerator.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open %1.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reading collection config file...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Collection config file error: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generating help for %1...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating collection file...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The file %1 cannot be overwritten.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open referenced image file %1.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QHelpGenerator</name>
+    <message>
+        <source>Missing output file name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qt Help Generator version 1.0 (Qt %1)
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Missing Qt help project file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+Usage:
+
+qhelpgenerator &lt;help-project-file&gt; [options]
+
+  -o &lt;compressed-file&gt;   Generates a Qt compressed help
+                         file called &lt;compressed-file&gt;.
+                         If this option is not specified
+                         a default name will be used.
+  -c                     Checks whether all links in HTML files
+                         point to files in this help project.
+  -v                     Displays the version of 
+                         qhelpgenerator.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open %1.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not create output directory: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1300,12 +1694,10 @@ Raison :
 <context>
     <name>RemoteControl</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/remotecontrol.cpp" line="+165"/>
         <source>Debugging Remote Control</source>
         <translation>Débogage du contrôle à distance</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Received Command: %1 %2</source>
         <translation>Commande reçue : %1 %2</translation>
     </message>
@@ -1313,50 +1705,64 @@ Raison :
 <context>
     <name>SearchWidget</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/searchwidget.cpp" line="+210"/>
         <source>&amp;Copy</source>
         <translation>&amp;Copier</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Copy &amp;Link Location</source>
         <translation>Copier &amp;l&apos;adresse du lien</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Open Link in New Tab</source>
         <translation>Ouvrir le lien dans un nouvel onglet</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Select All</source>
         <translation>Sélectionner tout</translation>
     </message>
 </context>
 <context>
+    <name>TabBar</name>
+    <message>
+        <source>(Untitled)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New &amp;Tab</source>
+        <translation type="unfinished">Nouvel ongle&amp;t</translation>
+    </message>
+    <message>
+        <source>&amp;Close Tab</source>
+        <translation type="unfinished">&amp;Fermer l&apos;onglet</translation>
+    </message>
+    <message>
+        <source>Close Other Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark for this Page...</source>
+        <translation type="unfinished">Ajouter un signet pour cette page...</translation>
+    </message>
+</context>
+<context>
     <name>TopicChooser</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/topicchooser.ui"/>
         <source>Choose Topic</source>
         <translation>Choisir le domaine</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Topics</source>
         <translation>&amp;Domaines</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Display</source>
         <translation>&amp;Afficher</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Close</source>
         <translation>&amp;Fermer</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/topicchooser.cpp" line="+53"/>
         <source>Choose a topic for &lt;b&gt;%1&lt;/b&gt;:</source>
         <translation>Choisir le domaine pour &lt;b&gt;%1&lt;/b&gt; :</translation>
     </message>