Fixing MERGING issues..

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@964690 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

21 files changed, 1165 insertions, 71 deletions

diff --git a/po/rekonq_fr.po b/po/rekonq_fr.po
index e69de29b..c8f1626f 100644
--- a/po/rekonq_fr.po
+++ b/po/rekonq_fr.po
@@ -0,0 +1,1032 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Alain Laporte <alain_laporte123@yahoo.fr>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: "
+"http://sourceforge.net/tracker/?group_id=252277&atid=1126949\n"
+"POT-Creation-Date: 2009-05-02 02:35+0200\n"
+"PO-Revision-Date: 2009-05-05 23:51+0100\n"
+"Last-Translator: Alain Laporte <alain_laporte123@yahoo.fr>\n"
+"Language-Team: French <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Language: fr_FR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. i18n: file: rekonqui.rc:58
+#. i18n: ectx: Menu (go)
+#: bookmarks.cpp:265 rc.cpp:90
+msgid "&Bookmarks"
+msgstr "&Signets"
+
+#: bookmarks.cpp:274
+msgid "Bookmarks Bar"
+msgstr "Barre des signets"
+
+#: cookiejar.cpp:457 cookiejar.cpp:636
+msgid "Website"
+msgstr "Site web"
+
+#: cookiejar.cpp:459
+msgid "Name"
+msgstr "Nom"
+
+#: cookiejar.cpp:461
+msgid "Path"
+msgstr "Chemin"
+
+#: cookiejar.cpp:463
+msgid "Secure"
+msgstr "Sécurisé"
+
+#: cookiejar.cpp:465
+msgid "Expires"
+msgstr "Expiration"
+
+#: cookiejar.cpp:467
+msgid "Contents"
+msgstr "Contenu"
+
+#: cookiejar.cpp:638
+msgid "Status"
+msgstr "Statut"
+
+#. i18n: file: cookiesexceptions.ui:77
+#. i18n: ectx: property (text), widget (QPushButton, allowButton)
+#: cookiejar.cpp:663 rc.cpp:27
+msgid "Allow"
+msgstr "Autoriser"
+
+#. i18n: file: cookiesexceptions.ui:57
+#. i18n: ectx: property (text), widget (QPushButton, blockButton)
+#: cookiejar.cpp:674 rc.cpp:21
+msgid "Block"
+msgstr "Bloquer"
+
+#. i18n: file: cookiesexceptions.ui:67
+#. i18n: ectx: property (text), widget (QPushButton, allowForSessionButton)
+#: cookiejar.cpp:685 rc.cpp:24
+msgid "Allow For Session"
+msgstr "Autoriser pour la session"
+
+#: download.cpp:73
+msgid ""
+"Download '%1'?\n"
+"Type: %2"
+msgstr ""
+"Téléchargement '%1'?\n"
+"Type: %2"
+
+#: download.cpp:74
+msgid "Download '%1'..."
+msgstr "Téléchargement '%1'..."
+
+#: findbar.cpp:39
+msgid "&Match case"
+msgstr "&Sensible à la casse"
+
+#: findbar.cpp:55
+msgid "Find: "
+msgstr "Chercher: "
+
+#: findbar.cpp:65
+msgid "&Next"
+msgstr "&Suivant"
+
+#: findbar.cpp:66
+msgid "&Previous"
+msgstr "&Précédent"
+
+#: history.cpp:445
+msgid "Title"
+msgstr "Titre"
+
+#: history.cpp:446
+msgid "Address"
+msgstr "Adresse"
+
+#: history.cpp:703
+msgid "Show All History"
+msgstr "Afficher tout l'historique"
+
+#: history.cpp:707
+msgid "Clear History"
+msgstr "Effacer l'historique"
+
+#: history.cpp:788
+msgid "Open"
+msgstr "Ouvrir"
+
+#: history.cpp:790
+msgid "Copy"
+msgstr "Copier"
+
+#: history.cpp:792
+msgid "Delete"
+msgstr "Supprimer"
+
+#: history.cpp:1175
+msgid "Earlier Today"
+msgstr "Plus tôt aujourd'hui"
+
+#: history.cpp:1180
+msgid "1 item"
+msgid_plural "%1 items"
+msgstr[0] "1 élément"
+msgstr[1] "%1 éléments"
+
+#: main.cpp:29
+msgid "KDE Browser Webkit Based"
+msgstr "Navigateur de KDE utilisant Webkit"
+
+#: main.cpp:39
+msgid "rekonq"
+msgstr "rekonq"
+
+#: main.cpp:43
+msgid "(C) 2008-2009 Andrea Diamantini"
+msgstr "(C) 2008-2009 Andrea Diamantini"
+
+#: main.cpp:50
+msgid "Andrea Diamantini"
+msgstr "Andrea Diamantini"
+
+#: main.cpp:51
+msgid "Project Lead, Developer, Italian translations"
+msgstr "Chef du projet, Développeur, Traduction en italien"
+
+#: main.cpp:55
+msgid "Domrachev Alexandr"
+msgstr "Domrachev Alexandr"
+
+#: main.cpp:56
+msgid "Developer, Russian translations"
+msgstr "Développeur, Traductions en russe"
+
+#: main.cpp:60
+msgid "Pawel Prazak"
+msgstr "Pawel Prazak"
+
+#: main.cpp:61
+msgid "Developer"
+msgstr "Développeur"
+
+#: main.cpp:65
+msgid "Panagiotis Papadopoulos"
+msgstr "Panagiotis Papadopoulos"
+
+#: main.cpp:66
+msgid "German translations"
+msgstr "Traduction en allemand"
+
+#: main.cpp:82
+msgid "Location to open"
+msgstr "Emplacement à ouvrir"
+
+#: mainview.cpp:98
+msgid "Recently Closed Tabs"
+msgstr "Onglets récemment fermés"
+
+#: mainview.cpp:339 mainview.cpp:583
+msgid "(Untitled)"
+msgstr "(sans titre)"
+
+#: mainview.cpp:455
+msgid ""
+"You have modified this page and when closing it you would lose the "
+"modification.\n"
+"Do you really want to close this page?\n"
+msgstr ""
+"Vous avez modifié cette page et lorsque vous la fermerez vous allez perdre "
+"la modification.\n"
+"Voulez-vous vraiment fermer cette page?\n"
+
+#: mainview.cpp:457
+msgid "Do you really want to close this page?"
+msgstr "Voulez-vous vraiment fermer cette page?"
+
+#: mainview.cpp:514
+msgid "Loading..."
+msgstr "Chargement..."
+
+#: mainview.cpp:529
+msgid "Loading %1% (%2 %3)..."
+msgstr "Chargement %1% (%2 %3)..."
+
+#: mainview.cpp:556
+msgid "Done"
+msgstr "Terminé"
+
+#: mainview.cpp:558
+msgid "Failed to load"
+msgstr "Erreur lors du chargement"
+
+#: mainwindow.cpp:177
+msgid "Location Bar"
+msgstr "Barre d'adresse"
+
+#: mainwindow.cpp:183
+msgid "Search Bar"
+msgstr "Barre de recherche"
+
+#: mainwindow.cpp:215 mainwindow.cpp:230 mainwindow.cpp:809
+msgid "Reload"
+msgstr "Rechargement"
+
+#: mainwindow.cpp:224
+msgid "&Stop"
+msgstr "&Stop"
+
+#: mainwindow.cpp:235
+msgid "Open Location"
+msgstr "Ouvrir l'emplacement"
+
+#: mainwindow.cpp:240
+msgid "&Enlarge Font"
+msgstr "&Agrandir la police"
+
+#: mainwindow.cpp:245
+msgid "&Normal Font"
+msgstr "&Police habituelle"
+
+#: mainwindow.cpp:250
+msgid "&Shrink Font"
+msgstr "&Réduire la police"
+
+#: mainwindow.cpp:255
+msgid "Page S&ource"
+msgstr "Code s&ource"
+
+#: mainwindow.cpp:260
+msgid "Web &Inspector"
+msgstr "&Inspecteur Web"
+
+#: mainwindow.cpp:265
+msgid "Private &Browsing"
+msgstr "&Navigation sécurisée"
+
+#: mainwindow.cpp:271
+msgid "Back"
+msgstr "Suivant"
+
+#: mainwindow.cpp:279
+msgid "Forward"
+msgstr "Précédent"
+
+#: mainwindow.cpp:284
+msgid "New &Tab"
+msgstr "Nouvelle ongle&t"
+
+#: mainwindow.cpp:292 tabbar.cpp:110
+msgid "&Close Tab"
+msgstr "&Fermer l'onglet"
+
+#: mainwindow.cpp:297
+msgid "Show Next Tab"
+msgstr "Afficher l'onglet suivant"
+
+#: mainwindow.cpp:302
+msgid "Show Previous Tab"
+msgstr "Afficher l'onglet précédent"
+
+#. i18n: file: history.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, HistoryDialog)
+#. i18n: file: settings_privacy.ui:20
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: mainwindow.cpp:312 mainwindow.cpp:320 rc.cpp:39 rc.cpp:156
+msgid "History"
+msgstr "Historique"
+
+#: mainwindow.cpp:336
+msgid "&History"
+msgstr "&Historique"
+
+#: mainwindow.cpp:523
+msgid "Web Resources (*.html *.htm *.svg *.png *.gif *.svgz); All files (*.*)"
+msgstr ""
+"Fichiers Web (*.html *.htm *.svg *.png *.gif *.svgz); Tous les fichiers (*.*)"
+
+#: mainwindow.cpp:525
+msgid "Open Web Resource"
+msgstr "Ouvrir un fichier Web"
+
+#: mainwindow.cpp:571
+msgid "Are you sure you want to turn on private browsing?"
+msgstr "Êtes vous certains de vouloir utiliser la navigation privée?"
+
+#: mainwindow.cpp:572
+msgid ""
+"</b><br><br>When private browsing in turned on, webpages are not added to "
+"the history, new cookies are not stored, current cookies cannot be accessed, "
+"site icons will not be stored, session will not be saved,  and searches are "
+"not addded to the pop-up menu in the Google search box.  Until you close the "
+"window, you can still click the Back and Forward buttons to return to the "
+"webpages you have opened."
+msgstr ""
+"</b><br><br>Lors que la navigation privée est activée, les pages Web ne sont "
+"pas ajoutées dans l'historique, les nouveaux cookies ne sont pas "
+"enregistrées, les cookies existant ne sont pas utilisés, les favicons ne "
+"sont pas enregistrées, la session ne sera pas sauvegardée,  et les "
+"recherches ne sont pas ajoutés dans le menu déroulant de la boîte de "
+"recherche Google.  Jusqu'à la fermeture de la fenêtre, vous pouvez toujours "
+"cliquer sur les boutons Précédent et Retour pour revenir sur les pages Web "
+"que vous aviez ouvertes."
+
+#: mainwindow.cpp:632 mainwindow.cpp:654
+msgid " not found."
+msgstr " non trouvé."
+
+#: mainwindow.cpp:766
+msgid ""
+"The web inspector will only work correctly for pages that were loaded after "
+"enabling.\n"
+"Do you want to reload all pages?"
+msgstr ""
+"L'inspecteur Web ne fonctionnera correctement que pour les pages ouvertes "
+"après son activation.\n"
+"Voulez-vous recharger toutes les pages?"
+
+#: mainwindow.cpp:768
+msgid "Web Inspector"
+msgstr "Inspecteur Web"
+
+#: mainwindow.cpp:800
+msgid "Stop loading the current page"
+msgstr "Arrêter le chargement de la page"
+
+#: mainwindow.cpp:801
+msgid "Stop"
+msgstr "Arrêter"
+
+#: mainwindow.cpp:808
+msgid "Reload the current page"
+msgstr "Rechargement la page actuelle"
+
+#: mainwindow.cpp:892
+msgid ""
+"Are you sure you want to close the window?\n"
+"You have 1 tap open"
+msgid_plural ""
+"Are you sure you want to close the window?\n"
+"You have %1 tabs open"
+msgstr[0] ""
+"Êtes vous certains de vouloir fermer la fenêtre?\n"
+"Vous avez un onglet d'ouvert"
+msgstr[1] ""
+"Êtes vous certains de vouloir fermer la fenêtre?\n"
+"Vous avez %1 onglets d'ouverts"
+
+#: mainwindow.cpp:893
+msgid "Are you sure you want to close the window?"
+msgstr "Êtes vous certains de vouloir fermer la fenêtre?"
+
+#: mainwindow.cpp:895
+msgid "C&lose Current Tab"
+msgstr "Fermer &l'onglet courant"
+
+#: networkaccessmanager.cpp:112
+msgid "<qt>Enter username and password for "
+msgstr "<qt>Entrer le nom d'utilisateur et mot de passe pour "
+
+#: networkaccessmanager.cpp:113
+msgid " at "
+msgstr " chez "
+
+#: networkaccessmanager.cpp:140
+msgid "<qt>Connect to proxy "
+msgstr "<qt>Connecter au proxy "
+
+#: networkaccessmanager.cpp:140
+msgid " using:</qt>"
+msgstr " utilisant:</qt>"
+
+#: networkaccessmanager.cpp:160
+msgid ""
+"SSL Errors:\n"
+"\n"
+msgstr ""
+"Erreurs SSL:\n"
+"\n"
+
+#: panelhistory.cpp:50
+msgid "Search: "
+msgstr "Chercher: "
+
+#: searchbar.cpp:55
+msgid "Search.."
+msgstr "Chercher.."
+
+#. i18n: file: settings_general.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, general)
+#: settings.cpp:81 rc.cpp:126
+msgid "General"
+msgstr "Général"
+
+#. i18n: file: settings_fonts.ui:20
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: settings.cpp:87 rc.cpp:111
+msgid "Fonts"
+msgstr "Polices"
+
+#. i18n: file: settings_privacy.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, privacy)
+#: settings.cpp:93 rc.cpp:153
+msgid "Privacy"
+msgstr "Confidentialité"
+
+#. i18n: file: settings_proxy.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, proxy)
+#: settings.cpp:99 rc.cpp:213
+msgid "Proxy"
+msgstr "Proxy"
+
+#: settings.cpp:105
+msgid "Webkit"
+msgstr "Webkit"
+
+#: settings.cpp:121
+msgid "rekonfig.."
+msgstr "rekonfig.."
+
+#: settings.cpp:143
+msgid "Specifies whether images are automatically loaded in web pages"
+msgstr "Définir si les images sont automatiquement afficher sur les pages web"
+
+#: settings.cpp:144
+msgid "Enables the running of JavaScript programs."
+msgstr "Autoriser l'exécution des programmes JavaScript."
+
+#: settings.cpp:145
+msgid "Enables Java applets."
+msgstr "Autoriser les applets Java."
+
+#: settings.cpp:146
+msgid "Enables plugins in web pages."
+msgstr "Autoriser les plugins dans les pages Web."
+
+#: settings.cpp:147
+msgid "Allows JavaScript programs to opening new windows."
+msgstr "Autoriser les programmes JavaScript à ouvrir de nouvelles fenêtres."
+
+#: settings.cpp:148
+msgid "Allows JavaScript programs to reading/writing to the clipboard."
+msgstr "Autoriser les programmes JavaScript à lire et écrire le presse papier."
+
+#: settings.cpp:149
+msgid "Includes hyperlinks in the keyboard focus chain."
+msgstr "Inclure les liens dans l'enchaînement du focus clavier."
+
+#: settings.cpp:150
+msgid "Applies the zoom factor on a frame to only the text or all content."
+msgstr ""
+"Appliquer le facteur de grossissement d'un cadre uniquement sur son texte ou "
+"sur tout son contenu."
+
+#: settings.cpp:151
+msgid "Draws also background color and images when the page is printed."
+msgstr ""
+"Dessiner également la couleur de fond et les images lorsque la page est "
+"imprimée."
+
+#: settings.cpp:152
+msgid "Support for the HTML 5 offline storage feature."
+msgstr "Support de la fonctionnalité de stockage hors ligne du HTML 5."
+
+#: settings.cpp:153
+msgid "Support for the HTML 5 web application cache feature."
+msgstr "Support de la fonctionnalité de cache des applications web de HTML 5."
+
+#: settings.cpp:154
+msgid "Support for the HTML 5 local storage feature."
+msgstr "Support de la fonctionnalité de stockage local de HTML 5."
+
+#: tabbar.cpp:108
+msgid "Clone Tab"
+msgstr "Dupliquer l'onglet"
+
+#: tabbar.cpp:111
+msgid "Close &Other Tabs"
+msgstr "Fermer les autres &onglets"
+
+#: tabbar.cpp:113
+msgid "Reload Tab"
+msgstr "Recharger l'onglet"
+
+#: tabbar.cpp:119
+msgid "Reload All Tabs"
+msgstr "Recharger tous les onglets"
+
+#: webview.cpp:245
+msgid "Error loading page: "
+msgstr "Erreur lors du chargement de la page: "
+
+#: webview.cpp:309
+msgid "Open Link in New &Tab"
+msgstr "Ouvrir le lien dans un nouvel ongle&t"
+
+#: webview.cpp:315
+msgid "Cu&t"
+msgstr "&Couper"
+
+#: webview.cpp:320
+msgid "&Copy"
+msgstr "Copi&er"
+
+#: webview.cpp:325
+msgid "&Paste"
+msgstr "Co&ller"
+
+#: webview.cpp:330
+msgid "&Save Image As..."
+msgstr "&Enregistrer l'image sous..."
+
+#: webview.cpp:335
+msgid "&Copy This Image"
+msgstr "&Copier cette image"
+
+#: webview.cpp:340
+msgid "&Save Link As..."
+msgstr "&Enregistrer le lien sous..."
+
+#: webview.cpp:345
+msgid "&Copy Link Location"
+msgstr "&Copier l'emplacement du lien"
+
+#: webview.cpp:350
+msgid "&Inspect Element"
+msgstr "&Inspecter l'élément"
+
+#: webview.cpp:364
+msgid "Bookmark This Page"
+msgstr "Ajout un signet pour cette page"
+
+#: webview.cpp:417
+msgid "&Bookmark This Link"
+msgstr "&Ajouter un signet pour ce lien"
+
+#. i18n: file: cookies.ui:14
+#. i18n: ectx: property (windowTitle), widget (QDialog, CookiesDialog)
+#. i18n: file: settings_privacy.ui:73
+#. i18n: ectx: property (title), widget (QGroupBox, cookiesGroupBox)
+#: rc.cpp:3 rc.cpp:180
+msgid "Cookies"
+msgstr "Cookies"
+
+#. i18n: file: cookies.ui:41
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#. i18n: file: cookiesexceptions.ui:114
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#. i18n: file: history.ui:40
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: rc.cpp:6 rc.cpp:33 rc.cpp:42
+msgid "&Remove"
+msgstr "&Supprimer"
+
+#. i18n: file: cookies.ui:48
+#. i18n: ectx: property (text), widget (QPushButton, removeAllButton)
+#: rc.cpp:9
+msgid "Remove &All Cookies"
+msgstr "Supprimer &tous les cookies"
+
+#. i18n: file: cookiesexceptions.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, CookiesExceptionsDialog)
+#: rc.cpp:12
+msgid "Cookie Exceptions"
+msgstr "Exceptions de cookie"
+
+#. i18n: file: cookiesexceptions.ui:19
+#. i18n: ectx: property (title), widget (QGroupBox, newExceptionGroupBox)
+#: rc.cpp:15
+msgid "New Exception"
+msgstr "Nouvelle exception"
+
+#. i18n: file: cookiesexceptions.ui:27
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:18
+msgid "Domain:"
+msgstr "Domaine:"
+
+#. i18n: file: cookiesexceptions.ui:89
+#. i18n: ectx: property (title), widget (QGroupBox, ExceptionsGroupBox)
+#: rc.cpp:30
+msgid "Exceptions"
+msgstr "Exceptions"
+
+#. i18n: file: cookiesexceptions.ui:121
+#. i18n: ectx: property (text), widget (QPushButton, removeAllButton)
+#. i18n: file: history.ui:47
+#. i18n: ectx: property (text), widget (QPushButton, removeAllButton)
+#: rc.cpp:36 rc.cpp:45
+msgid "Remove &All"
+msgstr "Supprimer &tout"
+
+#. i18n: file: password.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, passwordWidget)
+#. i18n: file: proxy.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, proxyWidget)
+#. i18n: file: settings_webkit.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, webkit)
+#: rc.cpp:48 rc.cpp:63 rc.cpp:243
+msgid "Form"
+msgstr "Formulaire"
+
+#. i18n: file: password.ui:22
+#. i18n: ectx: property (text), widget (QLabel, iconLabel)
+#: rc.cpp:51
+msgid "DUMMY ICON"
+msgstr "ICONE FACTICE"
+
+#. i18n: file: password.ui:35
+#. i18n: ectx: property (text), widget (QLabel, introLabel)
+#: rc.cpp:54
+msgid "INTRO TEXT DUMMY"
+msgstr "TEXTE D INTRO FACTICE"
+
+#. i18n: file: password.ui:44
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: proxy.ui:37
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#. i18n: file: settings_proxy.ui:102
+#. i18n: ectx: property (text), widget (QLabel, label_12)
+#: rc.cpp:57 rc.cpp:72 rc.cpp:237
+msgid "Username:"
+msgstr "Nom d'utilisateur:"
+
+#. i18n: file: password.ui:54
+#. i18n: ectx: property (text), widget (QLabel, lblPassword)
+#. i18n: file: proxy.ui:47
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#. i18n: file: settings_proxy.ui:115
+#. i18n: ectx: property (text), widget (QLabel, label_13)
+#: rc.cpp:60 rc.cpp:75 rc.cpp:240
+msgid "Password:"
+msgstr "Mot de passe:"
+
+#. i18n: file: proxy.ui:20
+#. i18n: ectx: property (text), widget (QLabel, iconLabel)
+#: rc.cpp:66
+msgid "ICON"
+msgstr "ICON"
+
+#. i18n: file: proxy.ui:27
+#. i18n: ectx: property (text), widget (QLabel, introLabel)
+#: rc.cpp:69
+msgid "Connect to proxy"
+msgstr "Connecter au proxy"
+
+#. i18n: file: rekonqui.rc:8
+#. i18n: ectx: Menu (file)
+#: rc.cpp:78
+msgid "&File"
+msgstr "&Ficher"
+
+#. i18n: file: rekonqui.rc:24
+#. i18n: ectx: Menu (edit)
+#: rc.cpp:81
+msgid "&Edit"
+msgstr "&Edition"
+
+#. i18n: file: rekonqui.rc:38
+#. i18n: ectx: Menu (view)
+#: rc.cpp:84
+msgid "&View"
+msgstr "&Affichage"
+
+#. i18n: file: rekonqui.rc:54
+#. i18n: ectx: Menu (go)
+#: rc.cpp:87
+msgid "Hi&story"
+msgstr "&Historique"
+
+#. i18n: file: rekonqui.rc:62
+#. i18n: ectx: Menu (tools)
+#: rc.cpp:93
+msgid "&Tools"
+msgstr "Ou&tils"
+
+#. i18n: file: rekonqui.rc:68
+#. i18n: ectx: Menu (settings)
+#: rc.cpp:96
+msgid "&Settings"
+msgstr "&Configuration"
+
+#. i18n: file: rekonqui.rc:73
+#. i18n: ectx: Menu (side_panels)
+#: rc.cpp:99
+msgid "Side &Panels"
+msgstr "&Panneaux latéraux"
+
+#. i18n: file: rekonqui.rc:88
+#. i18n: ectx: ToolBar (mainToolBar)
+#: rc.cpp:102
+msgid "Main Toolbar"
+msgstr "Barre d'outils principale"
+
+#. i18n: file: rekonqui.rc:100
+#. i18n: ectx: ToolBar (bookmarksToolBar)
+#: rc.cpp:105
+msgid "Bookmark Toolbar"
+msgstr "Barre d'outils des signets"
+
+#. i18n: file: settings_fonts.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, fonts)
+#: rc.cpp:108
+msgid "Appearance"
+msgstr "Apparence"
+
+#. i18n: file: settings_fonts.ui:28
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:114
+msgid "Standard Font"
+msgstr "Police standard"
+
+#. i18n: file: settings_fonts.ui:35
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:117
+msgid "Fixed Font"
+msgstr "Police fixée"
+
+#. i18n: file: settings_fonts.ui:53
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:120
+msgid "Dimension"
+msgstr "Dimension"
+
+#. i18n: file: settings_fonts.ui:61
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:123
+msgid "Font Size"
+msgstr "Taille de la police"
+
+#. i18n: file: settings_general.ui:20
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:129
+msgid "Places"
+msgstr "Emplacements"
+
+#. i18n: file: settings_general.ui:26
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:132
+msgid "Home Page:"
+msgstr "Page de démarrage:"
+
+#. i18n: file: settings_general.ui:48
+#. i18n: ectx: property (text), widget (QPushButton, setHomeToCurrentPageButton)
+#: rc.cpp:135
+msgid "Set to current page"
+msgstr "Définir la page actuelle"
+
+#. i18n: file: settings_general.ui:73
+#. i18n: ectx: property (text), widget (QLabel, label_7)
+#: rc.cpp:138
+msgid "Save downloads to:"
+msgstr "Enregistrer les téléchargements dans:"
+
+#. i18n: file: settings_general.ui:83
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_downloadToDefaultDir)
+#: rc.cpp:141
+msgid "ask where saving downloads"
+msgstr "demander après l'enregistrement des téléchargements"
+
+#. i18n: file: settings_general.ui:93
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: rc.cpp:144
+msgid "Tabbed Browsing"
+msgstr "Navigation par onglet"
+
+#. i18n: file: settings_general.ui:99
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_alwaysShowTabBar)
+#: rc.cpp:147
+msgid "Always show tab bar"
+msgstr "Toujours afficher la barre des onglets"
+
+#. i18n: file: settings_general.ui:106
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_openTabsBack)
+#: rc.cpp:150
+msgid "Open tabs in the background"
+msgstr "Ouvrir les onglets en arrière plan"
+
+#. i18n: file: settings_privacy.ui:26
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:159
+msgid "Remove history items:"
+msgstr "Supprimer les éléments de l'historique:"
+
+#. i18n: file: settings_privacy.ui:37
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_expireHistory)
+#: rc.cpp:162
+msgid "After one day"
+msgstr "Après un jour"
+
+#. i18n: file: settings_privacy.ui:42
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_expireHistory)
+#: rc.cpp:165
+msgid "After one week"
+msgstr "Après une semaine"
+
+#. i18n: file: settings_privacy.ui:47
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_expireHistory)
+#: rc.cpp:168
+msgid "After two weeks"
+msgstr "Après deux semaines"
+
+#. i18n: file: settings_privacy.ui:52
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_expireHistory)
+#: rc.cpp:171
+msgid "After one month"
+msgstr "Après un mois"
+
+#. i18n: file: settings_privacy.ui:57
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_expireHistory)
+#: rc.cpp:174
+msgid "After one year"
+msgstr "Après un an"
+
+#. i18n: file: settings_privacy.ui:62
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_expireHistory)
+#: rc.cpp:177
+msgid "Manually"
+msgstr "Manuellement"
+
+#. i18n: file: settings_privacy.ui:79
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:183
+msgid "Accept Cookies:"
+msgstr "Accepter les cookies:"
+
+#. i18n: file: settings_privacy.ui:90
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_acceptCookies)
+#: rc.cpp:186
+msgid "Always"
+msgstr "Toujours"
+
+#. i18n: file: settings_privacy.ui:95
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_acceptCookies)
+#: rc.cpp:189
+msgid "Never"
+msgstr "Jamais"
+
+#. i18n: file: settings_privacy.ui:100
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_acceptCookies)
+#: rc.cpp:192
+msgid "Only from sites you visit"
+msgstr "Seulement des sites que je consulte"
+
+#. i18n: file: settings_privacy.ui:108
+#. i18n: ectx: property (text), widget (QPushButton, exceptionsButton)
+#: rc.cpp:195
+msgid "Exceptions..."
+msgstr "Exceptions..."
+
+#. i18n: file: settings_privacy.ui:115
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:198
+msgid "Keep until:"
+msgstr "Conserver jusuqu'à:"
+
+#. i18n: file: settings_privacy.ui:126
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_keepCookiesUntil)
+#: rc.cpp:201
+msgid "They expire"
+msgstr "Ils expirent"
+
+#. i18n: file: settings_privacy.ui:131
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_keepCookiesUntil)
+#: rc.cpp:204
+msgid "I exit the application"
+msgstr "Je ferme l'application"
+
+#. i18n: file: settings_privacy.ui:136
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_keepCookiesUntil)
+#: rc.cpp:207
+msgid "At most 90 days"
+msgstr "Au moins 90 jours"
+
+#. i18n: file: settings_privacy.ui:144
+#. i18n: ectx: property (text), widget (QPushButton, cookiesButton)
+#: rc.cpp:210
+msgid "Cookies..."
+msgstr "Cookies..."
+
+#. i18n: file: settings_proxy.ui:19
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_isProxyEnabled)
+#: rc.cpp:216
+msgid "Enable proxy"
+msgstr "Activer le proxy"
+
+#. i18n: file: settings_proxy.ui:26
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:219
+msgid "Proxy Settings"
+msgstr "Configuration du proxy"
+
+#. i18n: file: settings_proxy.ui:32
+#. i18n: ectx: property (text), widget (QLabel, label_9)
+#: rc.cpp:222
+msgid "Type:"
+msgstr "Type:"
+
+#. i18n: file: settings_proxy.ui:43
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_proxyType)
+#: rc.cpp:225
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+#. i18n: file: settings_proxy.ui:48
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_proxyType)
+#: rc.cpp:228
+msgid "HTTP"
+msgstr "HTTP"
+
+#. i18n: file: settings_proxy.ui:56
+#. i18n: ectx: property (text), widget (QLabel, label_10)
+#: rc.cpp:231
+msgid "Host:"
+msgstr "Hôte:"
+
+#. i18n: file: settings_proxy.ui:69
+#. i18n: ectx: property (text), widget (QLabel, label_11)
+#: rc.cpp:234
+msgid "Port:"
+msgstr "Ports:"
+
+#. i18n: file: settings_webkit.ui:20
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:246
+msgid "WebKit Settings"
+msgstr "Configuration de Webkit"
+
+#. i18n: file: settings_webkit.ui:26
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_autoLoadImages)
+#: rc.cpp:249
+msgid "Auto Load Images"
+msgstr "Chargement automatique des images"
+
+#. i18n: file: settings_webkit.ui:40
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_linksIncludedInFocusChain)
+#: rc.cpp:252
+msgid "Links included in focus chain"
+msgstr "Liens compris dans l'enchaînement du focus"
+
+#. i18n: file: settings_webkit.ui:47
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_javascriptEnabled)
+#: rc.cpp:255
+msgid "Javascript support"
+msgstr "Support de Javascript"
+
+#. i18n: file: settings_webkit.ui:54
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_zoomTextOnly)
+#: rc.cpp:258
+msgid "Zoom Text Only"
+msgstr "Grossir uniquement le texte"
+
+#. i18n: file: settings_webkit.ui:61
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_javaEnabled)
+#: rc.cpp:261
+msgid "Java support"
+msgstr "Support de Java"
+
+#. i18n: file: settings_webkit.ui:68
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_printElementBackgrounds)
+#: rc.cpp:264
+msgid "Print element Backgrounds"
+msgstr "Imprimer l'image en fond"
+
+#. i18n: file: settings_webkit.ui:75
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_pluginsEnabled)
+#: rc.cpp:267
+msgid "Plugins"
+msgstr "Plugins"
+
+#. i18n: file: settings_webkit.ui:82
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_offlineStorageDatabaseEnabled)
+#: rc.cpp:270
+msgid "Offline storage Database"
+msgstr "Base de données de stockage hors ligne"
+
+#. i18n: file: settings_webkit.ui:89
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_javascriptCanOpenWindows)
+#: rc.cpp:273
+msgid "Javascript can open windows"
+msgstr "Javascript peut ouvrir des fenêtes"
+
+#. i18n: file: settings_webkit.ui:96
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_offlineWebApplicationCacheEnabled)
+#: rc.cpp:276
+msgid "Offline Web Application Cache "
+msgstr "Désactiver le cache"
+
+#. i18n: file: settings_webkit.ui:103
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_javascriptCanAccessClipboard)
+#: rc.cpp:279
+msgid "Javascript can access clipboard"
+msgstr "Javascript peut accéder au presse papier"
+
+#. i18n: file: settings_webkit.ui:110
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_localStorageDatabaseEnabled)
+#: rc.cpp:282
+msgid "Local storage database"
+msgstr "Base de données de stockage local"
diff --git a/src/cookiejar.cpp b/src/cookiejar.cpp
index de7d7d7e..fd823553 100644
--- a/src/cookiejar.cpp
+++ b/src/cookiejar.cpp
@@ -37,9 +37,14 @@
 #include <KDebug>
 
 // Qt Includes
-#include <QtCore>
-#include <QtGui>
-#include <QtWebKit>
+#include <QtCore/QDataStream>
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
+
+#include <QtGui/QSortFilterProxyModel>
+#include <QtGui/QCompleter>
+
+#include <QtWebKit/QWebSettings>
 
 
 static const unsigned int JAR_VERSION = 23;
diff --git a/src/cookiejar.h b/src/cookiejar.h
index cd2403a2..03802df1 100644
--- a/src/cookiejar.h
+++ b/src/cookiejar.h
@@ -24,9 +24,6 @@
 #define COOKIEJAR_H
 
 
-// KDE Includes
-#include <QDialog>
-
 // Qt Includes
 #include <QNetworkCookieJar>
 #include <QAbstractItemModel>
@@ -37,6 +34,7 @@
 class QSortFilterProxyModel;
 class QKeyEvent;
 class AutoSaver;
+class QUrl;
 
 
 class CookieJar : public QNetworkCookieJar
diff --git a/src/edittableview.cpp b/src/edittableview.cpp
index bf1ef370..8b9bb12d 100644
--- a/src/edittableview.cpp
+++ b/src/edittableview.cpp
@@ -19,15 +19,19 @@
 * ============================================================ */
 
 
-
+// Self Includes
 #include "edittableview.h"
+
+// Qt Includes
 #include <QtGui/QKeyEvent>
 
+
 EditTableView::EditTableView(QWidget *parent)
         : QTableView(parent)
 {
 }
 
+
 void EditTableView::keyPressEvent(QKeyEvent *event)
 {
     if ((event->key() == Qt::Key_Delete
@@ -42,6 +46,7 @@ void EditTableView::keyPressEvent(QKeyEvent *event)
     }
 }
 
+
 void EditTableView::removeOne()
 {
     if (!model() || !selectionModel())
@@ -54,6 +59,7 @@ void EditTableView::removeOne()
     selectionModel()->select(idx, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
 }
 
+
 void EditTableView::removeAll()
 {
     if (model())
diff --git a/src/edittableview.h b/src/edittableview.h
index dbc9a145..d6f88bfe 100644
--- a/src/edittableview.h
+++ b/src/edittableview.h
@@ -23,8 +23,10 @@
 #ifndef EDITTABLEVIEW_H
 #define EDITTABLEVIEW_H
 
+// Qt Includes
 #include <QtGui/QTableView>
 
+
 class EditTableView : public QTableView
 {
     Q_OBJECT
@@ -39,4 +41,3 @@ public slots:
 };
 
 #endif // EDITTABLEVIEW_H
-
diff --git a/src/edittreeview.cpp b/src/edittreeview.cpp
index 49730d67..5547cdb0 100644
--- a/src/edittreeview.cpp
+++ b/src/edittreeview.cpp
@@ -19,16 +19,19 @@
 * ============================================================ */
 
 
-
+// Self Includes
 #include "edittreeview.h"
 
+// Qt includes
 #include <QtGui/QKeyEvent>
 
+
 EditTreeView::EditTreeView(QWidget *parent)
         : QTreeView(parent)
 {
 }
 
+
 void EditTreeView::keyPressEvent(QKeyEvent *event)
 {
     if ((event->key() == Qt::Key_Delete
@@ -43,6 +46,7 @@ void EditTreeView::keyPressEvent(QKeyEvent *event)
     }
 }
 
+
 void EditTreeView::removeOne()
 {
     if (!model())
@@ -52,10 +56,10 @@ void EditTreeView::removeOne()
     model()->removeRow(row, ci.parent());
 }
 
+
 void EditTreeView::removeAll()
 {
     if (!model())
         return;
     model()->removeRows(0, model()->rowCount(rootIndex()), rootIndex());
 }
-
diff --git a/src/edittreeview.h b/src/edittreeview.h
index 5be0dc45..aeb32f37 100644
--- a/src/edittreeview.h
+++ b/src/edittreeview.h
@@ -22,8 +22,10 @@
 #ifndef EDITTREEVIEW_H
 #define EDITTREEVIEW_H
 
+// Qt Includes
 #include <QtGui/QTreeView>
 
+
 class EditTreeView : public QTreeView
 {
     Q_OBJECT
@@ -38,4 +40,3 @@ public slots:
 };
 
 #endif // EDITTREEVIEW_H
-
diff --git a/src/history.h b/src/history.h
index dabd6883..1bc1aa91 100644
--- a/src/history.h
+++ b/src/history.h
@@ -76,6 +76,7 @@ public:
 // ---------------------------------------------------------------------------------------------------------------
 
 
+// Forward Declarations
 class AutoSaver;
 class HistoryModel;
 class HistoryFilterModel;
@@ -384,6 +385,8 @@ protected:
 
 // ------------------------------------------------------------------------------------------
 
+
+// Ui includes
 #include "ui_history.h"
 
 class HistoryDialog : public QDialog, public Ui_HistoryDialog
diff --git a/src/modelmenu.h b/src/modelmenu.h
index af0d1043..89a0ecdf 100644
--- a/src/modelmenu.h
+++ b/src/modelmenu.h
@@ -41,7 +41,12 @@ class QPersistentModelIndex;
 
 class KIcon;
 
-// A QMenu that is dynamically populated from a QAbstractItemModel
+/** 
+ * A KMenu that is dynamically populated 
+ * from a QAbstractItemModel
+ *
+ */
+
 class ModelMenu : public KMenu
 {
     Q_OBJECT
@@ -98,4 +103,3 @@ private:
 };
 
 #endif // MODELMENU_H
-
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index c9b94a8d..deae42dd 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -165,4 +165,3 @@ void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError
         reply->ignoreSslErrors();
 }
 #endif
-
diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h
index ebcd952d..7da2f54f 100644
--- a/src/networkaccessmanager.h
+++ b/src/networkaccessmanager.h
@@ -22,8 +22,8 @@
 #ifndef NETWORKACCESSMANAGER_H
 #define NETWORKACCESSMANAGER_H
 
-
-#include <QNetworkAccessManager>
+// Qt Includes
+#include <QtNetwork/QNetworkAccessManager>
 
 
 class NetworkAccessManager : public QNetworkAccessManager
diff --git a/src/panelhistory.h b/src/panelhistory.h
index 89759a84..c6fe1380 100644
--- a/src/panelhistory.h
+++ b/src/panelhistory.h
@@ -20,12 +20,13 @@
 #ifndef PANELHISTORY_H
 #define PANELHISTORY_H
 
-// Qt Includes
-#include <QWidget>
-
 // Local Includes
 #include "application.h"
 
+// Qt Includes
+#include <QWidget>
+
+// Forward Declarations
 class QTreeView;
 class KUrl;
 class TreeProxyModel;
diff --git a/src/searchbar.h b/src/searchbar.h
index 3fdf55b4..29588c58 100644
--- a/src/searchbar.h
+++ b/src/searchbar.h
@@ -34,6 +34,7 @@ class QNetworkReply;
 
 /**
  * This class defines an internet search bar.
+ *
  */
 class SearchBar : public KLineEdit
 {
diff --git a/src/sidepanel.cpp b/src/sidepanel.cpp
index 0fab81c0..85e11920 100644
--- a/src/sidepanel.cpp
+++ b/src/sidepanel.cpp
@@ -50,4 +50,3 @@ SidePanel::~SidePanel()
 
     delete m_panelHistory;
 }
-
diff --git a/src/sidepanel.h b/src/sidepanel.h
index c0af7827..7c0612ad 100644
--- a/src/sidepanel.h
+++ b/src/sidepanel.h
@@ -20,12 +20,13 @@
 #ifndef SIDEPANEL_H
 #define SIDEPANEL_H
 
-// Qt Includes
-#include <QDockWidget>
-
 // Local Includes
 #include "application.h"
 
+// Qt Includes
+#include <QDockWidget>
+
+// Forward Declarations
 class KUrl;
 class PanelHistory;
 
diff --git a/src/stackedurlbar.h b/src/stackedurlbar.h
index d3aea16f..ef3392e9 100644
--- a/src/stackedurlbar.h
+++ b/src/stackedurlbar.h
@@ -26,10 +26,12 @@
 // Qt Includes
 #include <QStackedWidget>
 
+// Forward Declarations
 class KCompletion;
 class HistoryCompletionModel;
 class UrlBar;
 
+
 class StackedUrlBar : public QStackedWidget
 {
     Q_OBJECT
@@ -61,4 +63,3 @@ private:
 };
 
 #endif // STACKEDURLBAR_H
-
diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index be1b05fd..bf3f0b4e 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -39,7 +39,9 @@
 #include <KGlobalSettings>
 
 // Qt Includes
-#include <QtGui>
+#include <QtCore/QString>
+
+#include <QtGui/QFont>
 
 
 TabBar::TabBar(QWidget *parent)
diff --git a/src/tabbar.h b/src/tabbar.h
index 8563793f..14f2e35b 100644
--- a/src/tabbar.h
+++ b/src/tabbar.h
@@ -26,8 +26,8 @@
 // KDE Includes
 #include <KTabBar>
 
-// Qt Includes
-#include <QShortcut>
+// Forward Declarations
+class QPoint;
 
 /**
  * Tab bar with a few more features such as
diff --git a/src/urlbar.cpp b/src/urlbar.cpp
index 29eaed70..e2756aa6 100644
--- a/src/urlbar.cpp
+++ b/src/urlbar.cpp
@@ -24,15 +24,6 @@
 #include "urlbar.h"
 #include "urlbar.moc"
 
-// Qt Includes
-#include <QtCore>
-#include <QtGui>
-
-// KDE Includes
-#include <KDebug>
-#include <KCompletionBox>
-#include <KUrl>
-
 // Local Includes
 #include "application.h"
 #include "history.h"
@@ -40,6 +31,16 @@
 #include "mainwindow.h"
 #include "webview.h"
 
+// KDE Includes
+#include <KDebug>
+#include <KCompletionBox>
+#include <KUrl>
+
+// Qt Includes
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QPalette>
+
 
 QColor UrlBar::s_defaultBaseColor;
 
diff --git a/src/urlbar.h b/src/urlbar.h
index 236792bd..d8fb9029 100644
--- a/src/urlbar.h
+++ b/src/urlbar.h
@@ -23,18 +23,18 @@
 #ifndef URLBAR_H
 #define URLBAR_H
 
-// Qt Includes
-#include <QIcon>
-#include <QPointer>
-#include <QUrl>
+
+// Local Includes
+#include "lineedit.h"
 
 // KDE Includes
 #include <KUrl>
 #include <KHistoryComboBox>
 
-// Local Includes
-#include "lineedit.h"
-
+// Qt Includes
+#include <QIcon>
+#include <QPointer>
+#include <QUrl>
 
 // Forward Declarations
 class QLinearGradient;
diff --git a/src/webview.cpp b/src/webview.cpp
index c90b65d5..4ae3986f 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -45,10 +45,22 @@
 #include <KToolInvocation>
 
 // Qt Includes
-#include <QtCore>
-#include <QtGui>
-#include <QtWebKit>
-#include <QUiLoader>
+#include <QtGui/QContextMenuEvent>
+#include <QtGui/QWheelEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QClipboard>
+#include <QtGui/QKeyEvent>
+
+#include <QtNetwork/QNetworkReply>
+#include <QtNetwork/QNetworkRequest>
+
+#include <QtWebKit/QWebFrame>
+#include <QtWebKit/QWebHitTestResult>
+#include <QtWebKit/QWebPage>
+#include <QtWebKit/QWebSettings>
+#include <QtWebKit/QWebView>
+
+#include <QtUiTools/QUiLoader>
 
 
 WebPage::WebPage(QObject *parent)
@@ -210,7 +222,7 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
         {
             path = QString("http://doc.trolltech.com/4.5/%1.html").arg(className);
         }
-        QUrl url(path);
+        KUrl url(path);
 
         Application::instance()->mainWindow()->loadUrl(url);
         return;
@@ -363,6 +375,35 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
     addBookmarkAction->setData(QVariant());
     KMenu menu(this);
 
+
+    // cut - copy - paste Actions. 
+    // If someone selects text perhaps wanna work with it..
+    bool b = false;
+
+    if (result.isContentSelected() && result.isContentEditable())
+    {
+        menu.addAction(webActions()->action("edit_cut"));
+        b = true;
+    }
+
+    if (result.isContentSelected())
+    {
+        menu.addAction(webActions()->action("edit_copy"));
+        b = true;
+    }
+
+    if (result.isContentEditable())
+    {
+        menu.addAction(webActions()->action("edit_paste"));
+        b = true;
+    }
+
+    if(b)
+    {
+        menu.addSeparator();
+    }
+
+    // link actions
     bool linkIsEmpty = result.linkUrl().isEmpty();
     if (!linkIsEmpty)
     {
@@ -375,48 +416,42 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
     menu.addAction(mainwindow->actionByName("view_redisplay"));
     menu.addSeparator();
 
+    // Developer Extras actions
     if (page()->settings()->testAttribute(QWebSettings::DeveloperExtrasEnabled))
     {
         menu.addAction(webActions()->action("inspect_element"));
         menu.addSeparator();
     }
 
-    menu.addAction(mainwindow->actionByName("history_back"));
-    menu.addAction(mainwindow->actionByName("history_forward"));
-    menu.addSeparator();
-
-    if (result.isContentSelected() && result.isContentEditable())
-    {
-        menu.addAction(webActions()->action("edit_cut"));
-    }
-
-    if (result.isContentSelected())
-    {
-        menu.addAction(webActions()->action("edit_copy"));
-    }
-
-    if (result.isContentEditable())
-    {
-        menu.addAction(webActions()->action("edit_paste"));
-    }
-
+    // save/copy link actions
     if (!linkIsEmpty)
     {
+        menu.addAction(webActions()->action("save_link_as"));
+        menu.addAction(webActions()->action("copy_link_location"));
         menu.addSeparator();
+
         if (!result.pixmap().isNull())
         {
             // TODO Add "View Image"
             menu.addAction(webActions()->action("save_image_as"));
             menu.addAction(webActions()->action("copy_this_image"));
+            menu.addSeparator();
         }
-        menu.addAction(webActions()->action("save_link_as"));
-        menu.addAction(webActions()->action("copy_link_location"));
+    }
+
+    // history actions
+    menu.addAction(mainwindow->actionByName("history_back"));
+    menu.addAction(mainwindow->actionByName("history_forward"));
+
+    // bookmark link action
+    if (!linkIsEmpty)
+    {
+        menu.addSeparator();
         addBookmarkAction->setData(result.linkUrl());
         addBookmarkAction->setText(i18n("&Bookmark This Link"));
+        menu.addAction(addBookmarkAction);
     }
-    menu.addSeparator();
 
-    menu.addAction(addBookmarkAction);
     menu.exec(mapToGlobal(event->pos()));
 }