Merge remote branch 'mainline/4.6' into 4.6

2 files changed, 605 insertions, 221 deletions

diff --git a/translations/assistant_fr.ts b/translations/assistant_fr.ts
index 91fcc1a11f..9c5d651ff4 100644
--- a/translations/assistant_fr.ts
+++ b/translations/assistant_fr.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AboutDialog</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/aboutdialog.cpp" line="110"/>
+        <location filename="../tools/assistant/tools/assistant/aboutdialog.cpp" line="+110"/>
         <source>&amp;Close</source>
         <translation>&amp;Fermer</translation>
     </message>
@@ -12,19 +12,19 @@
 <context>
     <name>AboutLabel</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/aboutdialog.cpp" line="96"/>
+        <location line="-14"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/aboutdialog.cpp" line="97"/>
+        <location line="+1"/>
         <source>Unable to launch external application.
 </source>
         <translation>Impossible d&apos;ouvrir l&apos;application externe.
 </translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/aboutdialog.cpp" line="98"/>
+        <location line="+1"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -32,46 +32,46 @@
 <context>
     <name>BookmarkDialog</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkdialog.ui" line="19"/>
+        <location filename="../tools/assistant/tools/assistant/bookmarkdialog.ui"/>
         <source>Add Bookmark</source>
         <translation>Ajouter un signet</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkdialog.ui" line="29"/>
+        <location/>
         <source>Bookmark:</source>
         <translation>Signet :</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkdialog.ui" line="36"/>
+        <location/>
         <source>Add in Folder:</source>
         <translation>Ajouter dans le dossier :</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkdialog.ui" line="65"/>
+        <location/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkdialog.ui" line="93"/>
+        <location/>
         <source>New Folder</source>
         <translation>Nouveau dossier</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="184"/>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="202"/>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="241"/>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="259"/>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="289"/>
+        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="+184"/>
+        <location line="+18"/>
+        <location line="+39"/>
+        <location line="+18"/>
+        <location line="+30"/>
         <source>Bookmarks</source>
         <translation>Signets</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="228"/>
+        <location line="-61"/>
         <source>Delete Folder</source>
         <translation>Supprimer le dossier</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="229"/>
+        <location line="+1"/>
         <source>Rename Folder</source>
         <translation>Renommer le dossier</translation>
     </message>
@@ -79,23 +79,23 @@
 <context>
     <name>BookmarkManager</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="663"/>
+        <location line="+435"/>
         <source>Bookmarks</source>
         <translation>Signets</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="700"/>
+        <location line="+37"/>
         <source>Remove</source>
         <translation>Suppression</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="701"/>
+        <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 filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="844"/>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="853"/>
+        <location line="+143"/>
+        <location line="+9"/>
         <source>New Folder</source>
         <translation>Nouveau dossier</translation>
     </message>
@@ -103,47 +103,47 @@
 <context>
     <name>BookmarkWidget</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="391"/>
+        <location line="-463"/>
         <source>Delete Folder</source>
         <translation>Supprimer le dossier</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="392"/>
+        <location line="+1"/>
         <source>Rename Folder</source>
         <translation>Renommer le dossier</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="394"/>
+        <location line="+2"/>
         <source>Show Bookmark</source>
         <translation>Afficher le signet</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="395"/>
+        <location line="+1"/>
         <source>Show Bookmark in New Tab</source>
         <translation>Afficher le signet dans un nouvel onglet</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="398"/>
+        <location line="+3"/>
         <source>Delete Bookmark</source>
         <translation>Supprimer le signet</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="399"/>
+        <location line="+1"/>
         <source>Rename Bookmark</source>
         <translation>Renommer le signet</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="437"/>
+        <location line="+38"/>
         <source>Filter:</source>
         <translation>Filtre :</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="461"/>
+        <location line="+24"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/bookmarkmanager.cpp" line="470"/>
+        <location line="+9"/>
         <source>Remove</source>
         <translation>Retirer</translation>
     </message>
@@ -151,48 +151,48 @@
 <context>
     <name>CentralWidget</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="238"/>
+        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="+239"/>
         <source>Add new page</source>
         <translation>Créer une nouvelle page</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="247"/>
+        <location line="+9"/>
         <source>Close current page</source>
         <translation>Fermer la page courante</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="559"/>
+        <location line="+312"/>
         <source>Print Document</source>
         <translation>Imprimer le document</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="707"/>
-        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="709"/>
+        <location line="+130"/>
+        <location line="+2"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="802"/>
+        <location line="+93"/>
         <source>Add New Page</source>
         <translation>Créer une nouvelle page</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="805"/>
+        <location line="+3"/>
         <source>Close This Page</source>
         <translation>Fermer cette page</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="808"/>
+        <location line="+3"/>
         <source>Close Other Pages</source>
         <translation>Fermer les autres pages</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="813"/>
+        <location line="+5"/>
         <source>Add Bookmark for this Page...</source>
         <translation>Ajouter un signet pour cette page...</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="1068"/>
+        <location line="+235"/>
         <source>Search</source>
         <translation>Recherche</translation>
     </message>
@@ -200,12 +200,12 @@
 <context>
     <name>ContentWindow</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/contentwindow.cpp" line="158"/>
+        <location filename="../tools/assistant/tools/assistant/contentwindow.cpp" line="+158"/>
         <source>Open Link</source>
         <translation>Ouvrir le lien</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/contentwindow.cpp" line="159"/>
+        <location line="+1"/>
         <source>Open Link in New Tab</source>
         <translation>Ouvrir le lien dans un nouvel onglet</translation>
     </message>
@@ -213,12 +213,12 @@
 <context>
     <name>FilterNameDialogClass</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/filternamedialog.ui" line="13"/>
+        <location filename="../tools/assistant/tools/assistant/filternamedialog.ui"/>
         <source>Add Filter Name</source>
         <translation>Ajouter un filtre</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/filternamedialog.ui" line="25"/>
+        <location/>
         <source>Filter Name:</source>
         <translation>Nom du filtre :</translation>
     </message>
@@ -226,27 +226,27 @@
 <context>
     <name>FindWidget</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="113"/>
+        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="-918"/>
         <source>Previous</source>
         <translation>Précédent</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="117"/>
+        <location line="+4"/>
         <source>Next</source>
         <translation>Suivant</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="121"/>
+        <location line="+4"/>
         <source>Case Sensitive</source>
         <translation>Sensible à la casse</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="124"/>
+        <location line="+3"/>
         <source>Whole words</source>
         <translation>Mots complets</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/centralwidget.cpp" line="136"/>
+        <location line="+12"/>
         <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>
@@ -254,27 +254,27 @@
 <context>
     <name>FontPanel</name>
     <message>
-        <location filename="../tools/shared/fontpanel/fontpanel.cpp" line="63"/>
+        <location filename="../tools/shared/fontpanel/fontpanel.cpp" line="+63"/>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
-        <location filename="../tools/shared/fontpanel/fontpanel.cpp" line="74"/>
+        <location line="+11"/>
         <source>&amp;Writing system</source>
         <translation>&amp;Système d&apos;écriture</translation>
     </message>
     <message>
-        <location filename="../tools/shared/fontpanel/fontpanel.cpp" line="77"/>
+        <location line="+3"/>
         <source>&amp;Family</source>
         <translation>&amp;Famille</translation>
     </message>
     <message>
-        <location filename="../tools/shared/fontpanel/fontpanel.cpp" line="81"/>
+        <location line="+4"/>
         <source>&amp;Style</source>
         <translation>&amp;Style</translation>
     </message>
     <message>
-        <location filename="../tools/shared/fontpanel/fontpanel.cpp" line="85"/>
+        <location line="+4"/>
         <source>&amp;Point size</source>
         <translation>&amp;Taille en points</translation>
     </message>
@@ -282,39 +282,39 @@
 <context>
     <name>HelpViewer</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/helpviewer.cpp" line="284"/>
+        <location filename="../tools/assistant/tools/assistant/helpviewer.cpp" line="+281"/>
         <source>Open Link in New Tab</source>
         <translation>Ouvrir le lien dans un nouvel onglet</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/helpviewer.cpp" line="431"/>
+        <location line="+147"/>
         <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>
     <message>
-        <location filename="../tools/assistant/tools/assistant/helpviewer.cpp" line="492"/>
+        <location line="+61"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/helpviewer.cpp" line="493"/>
+        <location line="+1"/>
         <source>Unable to launch external application.
 </source>
         <translation>Impossible de lancer l&apos;application externe.
 </translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/helpviewer.cpp" line="493"/>
+        <location line="+0"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/helpviewer.cpp" line="556"/>
+        <location line="+63"/>
         <source>Copy &amp;Link Location</source>
         <translation>Copier l&apos;&amp;adresse cible</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/helpviewer.cpp" line="559"/>
+        <location line="+3"/>
         <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>
@@ -323,17 +323,17 @@
 <context>
     <name>IndexWindow</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/indexwindow.cpp" line="66"/>
+        <location filename="../tools/assistant/tools/assistant/indexwindow.cpp" line="+66"/>
         <source>&amp;Look for:</source>
         <translation>&amp;Rechercher :</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/indexwindow.cpp" line="134"/>
+        <location line="+68"/>
         <source>Open Link</source>
         <translation>Ouvrir le lien</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/indexwindow.cpp" line="135"/>
+        <location line="+1"/>
         <source>Open Link in New Tab</source>
         <translation>Ouvrir le lien dans un nouvel onglet</translation>
     </message>
@@ -341,97 +341,97 @@
 <context>
     <name>InstallDialog</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.ui" line="13"/>
-        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="76"/>
+        <location filename="../tools/assistant/tools/assistant/installdialog.ui"/>
+        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="+76"/>
         <source>Install Documentation</source>
         <translation>Installer la documentation</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.ui" line="19"/>
+        <location/>
         <source>Available Documentation:</source>
         <translation>Documentation disponible :</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.ui" line="29"/>
+        <location/>
         <source>Install</source>
         <translation>Installer</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.ui" line="36"/>
+        <location/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.ui" line="43"/>
+        <location/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.ui" line="63"/>
+        <location/>
         <source>Installation Path:</source>
         <translation>Chemin d&apos;installation :</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.ui" line="73"/>
+        <location/>
         <source>...</source>
         <translation>…</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="106"/>
+        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="+30"/>
         <source>Downloading documentation info...</source>
         <translation>Téléchargement des informations de la documentation…</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="154"/>
+        <location line="+48"/>
         <source>Download canceled.</source>
         <translation>Téléchargement annulé.</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="180"/>
-        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="258"/>
-        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="285"/>
+        <location line="+26"/>
+        <location line="+78"/>
+        <location line="+27"/>
         <source>Done.</source>
         <translation>Terminé.</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="195"/>
+        <location line="-90"/>
         <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 filename="../tools/assistant/tools/assistant/installdialog.cpp" line="206"/>
+        <location line="+11"/>
         <source>Unable to save the file %1: %2.</source>
         <translation>Impossible de sauver le fichier %1 : %2.</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="214"/>
+        <location line="+8"/>
         <source>Downloading %1...</source>
         <translation>Téléchargement de %1 en cours…</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="233"/>
-        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="275"/>
-        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="313"/>
+        <location line="+19"/>
+        <location line="+42"/>
+        <location line="+38"/>
         <source>Download failed: %1.</source>
         <translation>Échec du téléchargement : %1.</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="243"/>
+        <location line="-70"/>
         <source>Documentation info file is corrupt!</source>
         <translation>Le fichier d&apos;information de documentation est corrompu!</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="280"/>
+        <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 filename="../tools/assistant/tools/assistant/installdialog.cpp" line="282"/>
+        <location line="+2"/>
         <source>Installing documentation %1...</source>
         <translation>Installation de la documentation %1…</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/installdialog.cpp" line="304"/>
+        <location line="+22"/>
         <source>Error while installing documentation:
 %1</source>
         <translation>Erreur durant l&apos;installation de la documentation :
@@ -441,294 +441,304 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="110"/>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="501"/>
+        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="+110"/>
+        <location line="+383"/>
         <source>Index</source>
         <translation>Index</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="116"/>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="499"/>
+        <location line="-377"/>
+        <location line="+375"/>
         <source>Contents</source>
         <translation>Sommaire</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="121"/>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="503"/>
+        <location line="-370"/>
+        <location line="+374"/>
         <source>Bookmarks</source>
         <translation>Signets</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="133"/>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="348"/>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="860"/>
+        <location line="-362"/>
+        <location line="+207"/>
+        <location line="+514"/>
         <source>Qt Assistant</source>
         <translation>Qt Assistant</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="316"/>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="321"/>
+        <location line="-546"/>
+        <location line="+5"/>
         <source>Unfiltered</source>
         <translation>Non-filtré</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="342"/>
+        <location line="+21"/>
         <source>Looking for Qt Documentation...</source>
         <translation>Recherche la documentation de Qt…</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="426"/>
+        <location line="+84"/>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="428"/>
+        <location line="+2"/>
         <source>Page Set&amp;up...</source>
         <translation>&amp;Mise en page…</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="430"/>
+        <location line="+2"/>
         <source>Print Preview...</source>
         <translation>Aperçu avant impression…</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="433"/>
+        <location line="+3"/>
         <source>&amp;Print...</source>
         <translation>&amp;Imprimer…</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="440"/>
+        <location line="+7"/>
         <source>New &amp;Tab</source>
         <translation>Nouvel ongle&amp;t</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="443"/>
+        <location line="+3"/>
         <source>&amp;Close Tab</source>
         <translation>&amp;Fermer l&apos;onglet</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="447"/>
+        <location line="+4"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="451"/>
+        <location line="+4"/>
         <source>&amp;Edit</source>
         <translation>&amp;Édition</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="452"/>
+        <location line="+1"/>
         <source>&amp;Copy selected Text</source>
         <translation>&amp;Copier le texte selectionné</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="460"/>
+        <location line="+8"/>
         <source>&amp;Find in Text...</source>
-        <translation>&amp;Trouver dans le texte…</translation>
+        <translation>&amp;Rechercher dans le texte…</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="466"/>
+        <location line="+2"/>
+        <source>&amp;Find</source>
+        <translation>&amp;Rechercher</translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Find &amp;Next</source>
         <translation>Rechercher le suiva&amp;nt</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="470"/>
+        <location line="+4"/>
         <source>Find &amp;Previous</source>
         <translation>Rechercher le &amp;précédent</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="475"/>
+        <location line="+5"/>
         <source>Preferences...</source>
         <translation>Préférences…</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="478"/>
+        <location line="+3"/>
         <source>&amp;View</source>
         <translation>&amp;Affichage</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="479"/>
+        <location line="+1"/>
         <source>Zoom &amp;in</source>
         <translation>Zoom &amp;avant</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="485"/>
+        <location line="+6"/>
         <source>Zoom &amp;out</source>
         <translation>Zoom a&amp;rrière</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="491"/>
+        <location line="+6"/>
         <source>Normal &amp;Size</source>
         <translation>&amp;Taille normale</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="495"/>
+        <location line="+4"/>
         <source>Ctrl+0</source>
         <translation>Ctrl+0</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="500"/>
+        <location line="+5"/>
         <source>ALT+C</source>
         <translation>ALT+C</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="502"/>
+        <location line="+2"/>
         <source>ALT+I</source>
         <translation>ALT+I</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="504"/>
+        <location line="+2"/>
         <source>ALT+O</source>
         <translation>ALT+O</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="505"/>
+        <location line="+1"/>
         <source>Search</source>
         <translation>Recherche</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="506"/>
+        <location line="+1"/>
         <source>ALT+S</source>
         <translation>ALT+S</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="508"/>
+        <location line="+2"/>
         <source>&amp;Go</source>
         <translation>&amp;Aller</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="509"/>
+        <location line="+1"/>
         <source>&amp;Home</source>
         <translation>&amp;Accueil</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="510"/>
+        <location line="+1"/>
         <source>ALT+Home</source>
         <translation>ALT+Home</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="513"/>
+        <location line="+3"/>
         <source>&amp;Back</source>
         <translation>&amp;Précédent</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="518"/>
+        <location line="+5"/>
         <source>&amp;Forward</source>
         <translation>&amp;Suivant</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="524"/>
+        <location line="+6"/>
         <source>Sync with Table of Contents</source>
         <translation>Synchroniser la table des matières</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="531"/>
+        <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 filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="532"/>
+        <location line="+1"/>
         <source>Ctrl+Alt+Right</source>
         <translation>Ctrl+Alt+Right</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="535"/>
+        <location line="+3"/>
         <source>Previous Page</source>
         <translation>Page précédente</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="536"/>
+        <location line="+1"/>
         <source>Ctrl+Alt+Left</source>
         <translation>Ctrl+Alt+Left</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="539"/>
+        <location line="+3"/>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Signets</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="540"/>
+        <location line="+1"/>
         <source>Add Bookmark...</source>
         <translation>Ajouter un signet…</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="542"/>
+        <location line="+2"/>
         <source>CTRL+D</source>
         <translation>CTRL+D</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="544"/>
+        <location line="+2"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="545"/>
+        <location line="+1"/>
         <source>About...</source>
         <translation>À propos…</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="561"/>
+        <location line="+16"/>
         <source>Navigation Toolbar</source>
         <translation>Barre d&apos;outils de navigation</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="583"/>
+        <location line="+22"/>
         <source>&amp;Window</source>
         <translation>&amp;Fenêtre</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="585"/>
+        <location line="+2"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="586"/>
+        <location line="+1"/>
         <source>Minimize</source>
         <translation>Minimiser</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="587"/>
+        <location line="+1"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="637"/>
+        <location line="+50"/>
         <source>Toolbars</source>
         <translation>Barres d&apos;outils</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="652"/>
+        <location line="+15"/>
         <source>Filter Toolbar</source>
         <translation>Barre d&apos;outils de filtrage</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="654"/>
+        <location line="+2"/>
         <source>Filtered by:</source>
-        <translation>Filtré par :</translation>
+        <translation>Filtre :</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="677"/>
+        <location line="+25"/>
         <source>Address Toolbar</source>
         <translation>Barre d&apos;outils d&apos;adresse</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="681"/>
+        <location line="+4"/>
         <source>Address:</source>
         <translation>Adresse :</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="795"/>
+        <location line="+114"/>
         <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 filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="866"/>
+        <location line="+71"/>
         <source>About %1</source>
         <translation>À propos de %1</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/mainwindow.cpp" line="980"/>
+        <location line="+114"/>
         <source>Updating search index</source>
         <translation>Mise à jour de l&apos;index de recherche</translation>
     </message>
@@ -736,48 +746,48 @@
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.cpp" line="259"/>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.cpp" line="302"/>
+        <location filename="../tools/assistant/tools/assistant/preferencesdialog.cpp" line="+259"/>
+        <location line="+43"/>
         <source>Add Documentation</source>
         <translation>Ajouter de la documentation</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.cpp" line="259"/>
+        <location line="-43"/>
         <source>Qt Compressed Help Files (*.qch)</source>
         <translation>Fichiers d&apos;aide Qt compressés (*.qch)</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.cpp" line="288"/>
+        <location line="+29"/>
         <source>The namespace %1 is already registered!</source>
         <translation>L&apos;espace de nom %1 existe déjà!</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.cpp" line="296"/>
+        <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 filename="../tools/assistant/tools/assistant/preferencesdialog.cpp" line="319"/>
+        <location line="+23"/>
         <source>Remove Documentation</source>
         <translation>Supprimer la documentation</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.cpp" line="320"/>
+        <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 filename="../tools/assistant/tools/assistant/preferencesdialog.cpp" line="322"/>
+        <location line="+2"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.cpp" line="323"/>
+        <location line="+1"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.cpp" line="411"/>
+        <location line="+88"/>
         <source>Use custom settings</source>
         <translation>Utiliser des paramètres personnalisés</translation>
     </message>
@@ -785,119 +795,118 @@
 <context>
     <name>PreferencesDialogClass</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="14"/>
+        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui"/>
         <source>Preferences</source>
         <translation>Préférences</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="24"/>
+        <location/>
         <source>Fonts</source>
         <translation>Polices</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="38"/>
+        <location/>
         <source>Font settings:</source>
         <translation>Configuration des polices :</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="46"/>
+        <location/>
         <source>Browser</source>
         <translation>Navigateur</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="51"/>
+        <location/>
         <source>Application</source>
         <translation>Application</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="70"/>
+        <location/>
         <source>Filters</source>
         <translation>Filtres</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="76"/>
+        <location/>
         <source>Filter:</source>
         <translation>Filtre :</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="86"/>
+        <location/>
         <source>Attributes:</source>
         <translation>Attributs :</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="97"/>
+        <location/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="105"/>
+        <location/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="112"/>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="163"/>
+        <location/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="120"/>
+        <location/>
         <source>Documentation</source>
         <translation>Documentation</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="126"/>
+        <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 filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="156"/>
+        <location/>
         <source>Add...</source>
         <translation>Ajouter…</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="188"/>
+        <location/>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="206"/>
+        <location/>
         <source>On help start:</source>
         <translation>Au démarrage :</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="220"/>
+        <location/>
         <source>Show my home page</source>
         <translation>Afficher ma page d&apos;accueil</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="225"/>
+        <location/>
         <source>Show a blank page</source>
         <translation>Afficher une page blanche</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="230"/>
+        <location/>
         <source>Show my tabs from last session</source>
         <translation>Afficher mes onglets de la dernière session</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="262"/>
+        <location/>
         <source>Homepage</source>
         <translation>Page d&apos;accueil</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="289"/>
+        <location/>
         <source>Current Page</source>
         <translation>Page courante</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="296"/>
+        <location/>
         <source>Blank Page</source>
         <translation>Page blanche</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/preferencesdialog.ui" line="303"/>
+        <location/>
         <source>Restore to default</source>
         <translation>Restaurer les valeurs par défaut</translation>
     </message>
@@ -905,69 +914,69 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="112"/>
+        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="+112"/>
         <source>The specified collection file does not exist!</source>
         <translation>Le fichier de collection spécifié n&apos;existe pas!</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="116"/>
+        <location line="+4"/>
         <source>Missing collection file!</source>
         <translation>Fichier de collection manquant!</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="125"/>
+        <location line="+9"/>
         <source>Invalid URL!</source>
         <translation>URL invalide!</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="129"/>
+        <location line="+4"/>
         <source>Missing URL!</source>
         <translation>URL manquante!</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="146"/>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="165"/>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="184"/>
+        <location line="+17"/>
+        <location line="+19"/>
+        <location line="+19"/>
         <source>Unknown widget: %1</source>
         <translation>Widget inconnu : %1</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="150"/>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="169"/>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="188"/>
+        <location line="-34"/>
+        <location line="+19"/>
+        <location line="+19"/>
         <source>Missing widget!</source>
         <translation>Widget manquant!</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="195"/>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="207"/>
+        <location line="+7"/>
+        <location line="+12"/>
         <source>The specified Qt help file does not exist!</source>
         <translation>Le fichier d&apos;aide Qt spécifié n&apos;existe pas!</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="200"/>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="212"/>
+        <location line="-7"/>
+        <location line="+12"/>
         <source>Missing help file!</source>
         <translation>Fichier d&apos;aide manquant!</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="219"/>
+        <location line="+7"/>
         <source>Missing filter argument!</source>
         <translation>Argument de filtre manquant!</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="231"/>
+        <location line="+12"/>
         <source>Unknown option: %1</source>
         <translation>Option inconnue : %1</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="261"/>
-        <location filename="../tools/assistant/tools/assistant/cmdlineparser.cpp" line="263"/>
+        <location line="+30"/>
+        <location line="+2"/>
         <source>Qt Assistant</source>
         <translation>Qt Assistant</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/main.cpp" line="217"/>
+        <location filename="../tools/assistant/tools/assistant/main.cpp" line="+225"/>
         <source>Could not register documentation file
 %1
 
@@ -980,17 +989,17 @@ Raison :
 %2</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/main.cpp" line="221"/>
+        <location line="+4"/>
         <source>Documentation successfully registered.</source>
         <translation>Documentation enregistrée avec succès.</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/main.cpp" line="229"/>
+        <location line="+8"/>
         <source>Documentation successfully unregistered.</source>
         <translation>Documentation retirée avec succès.</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/main.cpp" line="232"/>
+        <location line="+3"/>
         <source>Could not unregister documentation file
 %1
 
@@ -1003,12 +1012,12 @@ Raison :
 %2</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/main.cpp" line="269"/>
+        <location line="+37"/>
         <source>Cannot load sqlite database driver!</source>
         <translation>Impossible de charger le driver de la base de données sqlite!</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/main.cpp" line="278"/>
+        <location line="+9"/>
         <source>The specified collection file could not be read!</source>
         <translation>Le fichier de collection spécifié ne peut pas être lu!</translation>
     </message>
@@ -1016,12 +1025,12 @@ Raison :
 <context>
     <name>RemoteControl</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/remotecontrol.cpp" line="163"/>
+        <location filename="../tools/assistant/tools/assistant/remotecontrol.cpp" line="+163"/>
         <source>Debugging Remote Control</source>
         <translation>Débogage du contrôle à distance</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/remotecontrol.cpp" line="164"/>
+        <location line="+1"/>
         <source>Received Command: %1 %2</source>
         <translation>Commande reçue : %1 %2</translation>
     </message>
@@ -1029,22 +1038,22 @@ Raison :
 <context>
     <name>SearchWidget</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/searchwidget.cpp" line="195"/>
+        <location filename="../tools/assistant/tools/assistant/searchwidget.cpp" line="+196"/>
         <source>&amp;Copy</source>
         <translation>&amp;Copier</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/searchwidget.cpp" line="199"/>
+        <location line="+4"/>
         <source>Copy &amp;Link Location</source>
         <translation>Copier &amp;l&apos;adresse du lien</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/searchwidget.cpp" line="203"/>
+        <location line="+4"/>
         <source>Open Link in New Tab</source>
         <translation>Ouvrir le lien dans un nouvel onglet</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/searchwidget.cpp" line="211"/>
+        <location line="+8"/>
         <source>Select All</source>
         <translation>Sélectionner tout</translation>
     </message>
@@ -1052,27 +1061,27 @@ Raison :
 <context>
     <name>TopicChooser</name>
     <message>
-        <location filename="../tools/assistant/tools/assistant/topicchooser.ui" line="16"/>
+        <location filename="../tools/assistant/tools/assistant/topicchooser.ui"/>
         <source>Choose Topic</source>
         <translation>Choisir le domaine</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/topicchooser.ui" line="37"/>
+        <location/>
         <source>&amp;Topics</source>
         <translation>&amp;Domaines</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/topicchooser.ui" line="88"/>
+        <location/>
         <source>&amp;Display</source>
         <translation>&amp;Afficher</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/topicchooser.ui" line="104"/>
+        <location/>
         <source>&amp;Close</source>
         <translation>&amp;Fermer</translation>
     </message>
     <message>
-        <location filename="../tools/assistant/tools/assistant/topicchooser.cpp" line="54"/>
+        <location filename="../tools/assistant/tools/assistant/topicchooser.cpp" line="+54"/>
         <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>
diff --git a/translations/qt_help_fr.ts b/translations/qt_help_fr.ts
new file mode 100644
index 0000000000..3835d108fb
--- /dev/null
+++ b/translations/qt_help_fr.ts
@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="fr_FR">
+<context>
+    <name>QCLuceneResultWidget</name>
+    <message>
+        <location filename="../tools/assistant/lib/qhelpsearchresultwidget.cpp" line="+110"/>
+        <source>Search Results</source>
+        <translation>Résultats de la recherche</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Note:</source>
+        <translation>Note :</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The search results may not be complete since the documentation is still being indexed!</source>
+        <translation>Les résultats de la recherche risquent d&apos;être incomplets car l&apos;indexation de la documentation est en cours !</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Your search did not match any documents.</source>
+        <translation>Votre recherche ne correspond à aucun document.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>(The reason for this might be that the documentation is still being indexed.)</source>
+        <translation>(Il est possible que cela soit dû au fait que la documentation est en cours d&apos;indexation.)</translation>
+    </message>
+</context>
+<context>
+    <name>QHelpCollectionHandler</name>
+    <message>
+        <location filename="../tools/assistant/lib/qhelpcollectionhandler.cpp" line="+79"/>
+        <source>The collection file &apos;%1&apos; is not set up yet!</source>
+        <translation>Le fichier de collection &apos;%1&apos; n&apos;est pas encore chargé !</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Cannot load sqlite database driver!</source>
+        <translatorcomment>driver ?</translatorcomment>
+        <translation>Chargement du pilote de base de données sqlite impossible !</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <location line="+49"/>
+        <source>Cannot open collection file: %1</source>
+        <translatorcomment>collection ?</translatorcomment>
+        <translation>Impossible d&apos;ouvrir le fichier collection : %1</translation>
+    </message>
+    <message>
+        <location line="-40"/>
+        <source>Cannot create tables in file %1!</source>
+        <translation>Impossible de créer les tables dans le fichier : %1 !</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>The collection file &apos;%1&apos; already exists!</source>
+        <translation>Le fichier collection &apos;%1&apos; existe déjà !</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cannot create directory: %1</source>
+        <translation>Impossible de créer le répertoire : %1</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Cannot copy collection file: %1</source>
+        <translation>Impossible de copier le fichier collection : %1</translation>
+    </message>
+    <message>
+        <location line="+119"/>
+        <source>Unknown filter &apos;%1&apos;!</source>
+        <translation>Filtre &apos;%1&apos; inconnu !</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Cannot register filter %1!</source>
+        <translation>Impossible d&apos;enregistrer le filtre %1 !</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Cannot open documentation file %1!</source>
+        <translation>Impossible d&apos;ouvrir le fichier de documentation %1 !</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Invalid documentation file &apos;%1&apos;!</source>
+        <translation>Fichier de documentation invalide : &apos;%1&apos; !</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>The namespace %1 was not registered!</source>
+        <translation>L&apos;espace de noms &apos;%1&apos; n&apos;était pas référencé !</translation>
+    </message>
+    <message>
+        <location line="+120"/>
+        <source>Namespace %1 already exists!</source>
+        <translation>L&apos;espace de noms %1 existe déjà !</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Cannot register namespace &apos;%1&apos;!</source>
+        <translation>Impossible d&apos;enregistrer l&apos;espace de noms &apos;%1&apos; !</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Cannot open database &apos;%1&apos; to optimize!</source>
+        <translation>Impossible d&apos;ouvrir la base de données à optimiser &apos;%1&apos; !</translation>
+    </message>
+</context>
+<context>
+    <name>QHelpDBReader</name>
+    <message>
+        <location filename="../tools/assistant/lib/qhelpdbreader.cpp" line="+98"/>
+        <source>Cannot open database &apos;%1&apos; &apos;%2&apos;: %3</source>
+        <extracomment>The placeholders are: %1 - The name of the database which cannot be opened %2 - The unique id for the connection %3 - The actual error string</extracomment>
+        <translation>Impossible d&apos;ouvrir la base de données &apos;%1&apos; &apos;%2&apos; : %3</translation>
+    </message>
+</context>
+<context>
+    <name>QHelpEngineCore</name>
+    <message>
+        <location filename="../tools/assistant/lib/qhelpenginecore.cpp" line="+524"/>
+        <source>The specified namespace does not exist!</source>
+        <translation>L&apos;espace de noms spécifié n&apos;existe pas !</translation>
+    </message>
+</context>
+<context>
+    <name>QHelpEngineCorePrivate</name>
+    <message>
+        <location line="-402"/>
+        <source>Cannot open documentation file %1: %2!</source>
+        <translation>Impossible d&apos;ouvrir le fichier de documentation %1 : %2 !</translation>
+    </message>
+</context>
+<context>
+    <name>QHelpGenerator</name>
+    <message>
+        <location filename="../tools/assistant/lib/qhelpgenerator.cpp" line="+157"/>
+        <source>Invalid help data!</source>
+        <translation>Données d&apos;aide invalides !</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>No output file name specified!</source>
+        <translation>Aucun nom de fichier de sortie spécifié !</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>The file %1 cannot be overwritten!</source>
+        <translation>Le fichier %1 ne peut être écrasé !</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Building up file structure...</source>
+        <translation>Construction de la structure de fichiers en cours…</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Cannot open data base file %1!</source>
+        <translation>Impossible d&apos;ouvrir le fichier de base de données %1 !</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Cannot register namespace %1!</source>
+        <translation>Impossible d&apos;enregistrer l&apos;espace de noms %1 !</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Insert custom filters...</source>
+        <translation>Insértion des filtres personnalisés…</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Insert help data for filter section (%1 of %2)...</source>
+        <translatorcomment>???</translatorcomment>
+        <translation>Insertion des données d&apos;aide pour la section filtre (%1 de %2)…</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Documentation successfully generated.</source>
+        <translation>Documentation générée avec succès.</translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <source>Some tables already exist!</source>
+        <translation>Certaines tables existent déjà !</translation>
+    </message>
+    <message>
+        <location line="+61"/>
+        <source>Cannot create tables!</source>
+        <translation>Impossible de créer les tables !</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Cannot register virtual folder!</source>
+        <translation>Impossible d&apos;enregistrer le dossier virtuel !</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Insert files...</source>
+        <translation>Insertion des fichiers...</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>The referenced file %1 must be inside or within a subdirectory of (%2). Skipping it.</source>
+        <translation>Le fichier référencé %1 doit être dans le dossier (%2) ou un de ses sous-dossiers. Fichier non pris en compte.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>The file %1 does not exist! Skipping it.</source>
+        <translation>Le fichier %1 n&apos;existe pas ! Fichier non pris en compte.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Cannot open file %1! Skipping it.</source>
+        <translation>Impossible d&apos;ouvrir le fichier %1 ! Fichier non pris en compte.</translation>
+    </message>
+    <message>
+        <location line="+131"/>
+        <source>The filter %1 is already registered!</source>
+        <translation>Le filtre %1 est déjà enregistré !</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Cannot register filter %1!</source>
+        <translation>Impossible d&apos;enregistrer le filtre %1 !</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Insert indices...</source>
+        <translation>Insertion des index…</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <source>Insert contents...</source>
+        <translation>insertion du contenu…</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Cannot insert contents!</source>
+        <translation>Impossible d&apos;insérer le contenu !</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Cannot register contents!</source>
+        <translation>Impossible de référencer le contenu !</translation>
+    </message>
+</context>
+<context>
+    <name>QHelpSearchQueryWidget</name>
+    <message>
+        <location filename="../tools/assistant/lib/qhelpsearchquerywidget.cpp" line="+411"/>
+        <source>Search for:</source>
+        <translation>Rechercher :</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Previous search</source>
+        <translation>Recherche précédente</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Next search</source>
+        <translation>Recherche suivante</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Search</source>
+        <translation>Recherche</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Advanced search</source>
+        <translation>Recherche avancée</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>words &lt;B&gt;similar&lt;/B&gt; to:</source>
+        <translation>mots &lt;B&gt;semblables&lt;/B&gt; à :</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&lt;B&gt;without&lt;/B&gt; the words:</source>
+        <translation>&lt;B&gt;sans&lt;/B&gt; les mots :</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>with &lt;B&gt;exact phrase&lt;/B&gt;:</source>
+        <translation>avec la &lt;B&gt;phrase exacte&lt;/B&gt; :</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>with &lt;B&gt;all&lt;/B&gt; of the words:</source>
+        <translation>avec &lt;B&gt;tous&lt;/B&gt; les mots :</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>with &lt;B&gt;at least one&lt;/B&gt; of the words:</source>
+        <translation>avec &lt;B&gt;au moins un&lt;/B&gt; des mots :</translation>
+    </message>
+</context>
+<context>
+    <name>QHelpSearchResultWidget</name>
+    <message>
+        <location filename="../tools/assistant/lib/qhelpsearchresultwidget.cpp" line="+235"/>
+        <source>0 - 0 of 0 Hits</source>
+        <translation>0 - 0 de 0 résultats</translation>
+    </message>
+</context>
+<context>
+    <name>QHelpSearchResultWidgetPrivate</name>
+    <message>
+        <location line="-61"/>
+        <source>%1 - %2 of %3 Hits</source>
+        <translation>%1 - %2 de %3 résultats</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../tools/assistant/lib/qhelp_global.h" line="+83"/>
+        <source>Untitled</source>
+        <translation>Sans titre</translation>
+    </message>
+    <message>
+        <location filename="../tools/assistant/lib/qhelpprojectdata.cpp" line="+85"/>
+        <source>Unknown token.</source>
+        <translatorcomment>contexte peu clair...</translatorcomment>
+        <translation>Identificateur inconnu.</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Unknown token. Expected &quot;QtHelpProject&quot;!</source>
+        <translation>Identificateur inconnu. &quot;QtHelpProject&quot; attendu !</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error in line %1: %2</source>
+        <translation>Erreur à la ligne %1 : %2</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>A virtual folder must not contain a &apos;/&apos; character!</source>
+        <translation>Un dossier virtuel ne doit pas contenir le caractère &apos;/&apos; !</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>A namespace must not contain a &apos;/&apos; character!</source>
+        <translation>Un espace de noms ne doit pas contenir le caractère &apos;/&apos; !</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Missing namespace in QtHelpProject.</source>
+        <translation>Espace de noms manquant dans QtHelpProject.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Missing virtual folder in QtHelpProject</source>
+        <translation>Dossier virtuel manquant dans QtHelpProject</translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <source>Missing attribute in keyword at line %1.</source>
+        <translation>Attribut manquant pour le mot clé à la ligne %1.</translation>
+    </message>
+    <message>
+        <location line="+123"/>
+        <source>The input file %1 could not be opened!</source>
+        <translation>Le fichier source %1 n&apos;a pas pu être ouvert !</translation>
+    </message>
+</context>
+</TS>