Git commit 4c6dc3a42f5225f868424382badad8d613760d7a by Burkhard L?ck.
Committed on 29/11/2013 at 19:30.
Pushed by lueck into branch 'master'.

doc update
REVIEW:114203

M  +-    --    doc/Defaultwebbrowser.png
M  +-    --    doc/Face-smile.png
M  +-    --    doc/Rekonq-adblockconfiguration-manual.png
M  +-    --    doc/Rekonq-adblockconfiguration.png
M  +-    --    doc/Rekonq-akregator.png
M  +-    --    doc/Rekonq-kget.png
M  +-    --    doc/Rekonq-manualplugins.png
D  +-    --    doc/Rekonq-notabs.png
M  +-    --    doc/Rekonq-sslinfo.png
M  +-    --    doc/Rekonq-tabpreview.png
M  +-    --    doc/Rekonq-toolbar.png
M  +-    --    doc/Rekonq-urlbar.png
D  +-    --    doc/Rekonq-windowtabbing.png
D  +-    --    doc/Systemsettings-enablewindowtabbing.png
M  +-    --    doc/advanced.png
M  +-    --    doc/appearance.png
M  +127  -228  doc/index.docbook
M  +-    --    doc/privacy.png
M  +-    --    doc/shortcuts.png
M  +-    --    doc/webshortcuts.png

http://commits.kde.org/rekonq/4c6dc3a42f5225f868424382badad8d613760d7a

diff --git a/doc/Defaultwebbrowser.png b/doc/Defaultwebbrowser.png
index 8329e8b..0b7f0dd 100644
Binary files a/doc/Defaultwebbrowser.png and b/doc/Defaultwebbrowser.png differ
diff --git a/doc/Face-smile.png b/doc/Face-smile.png
index 61f2974..da39a47 100644
Binary files a/doc/Face-smile.png and b/doc/Face-smile.png differ
diff --git a/doc/Rekonq-adblockconfiguration-manual.png 
b/doc/Rekonq-adblockconfiguration-manual.png
index 500223b..a224084 100644
Binary files a/doc/Rekonq-adblockconfiguration-manual.png and 
b/doc/Rekonq-adblockconfiguration-manual.png differ
diff --git a/doc/Rekonq-adblockconfiguration.png 
b/doc/Rekonq-adblockconfiguration.png
index a25988b..15d9dc6 100644
Binary files a/doc/Rekonq-adblockconfiguration.png and 
b/doc/Rekonq-adblockconfiguration.png differ
diff --git a/doc/Rekonq-akregator.png b/doc/Rekonq-akregator.png
index d435360..825a1bc 100644
Binary files a/doc/Rekonq-akregator.png and b/doc/Rekonq-akregator.png differ
diff --git a/doc/Rekonq-kget.png b/doc/Rekonq-kget.png
index 7772a99..b434fca 100644
Binary files a/doc/Rekonq-kget.png and b/doc/Rekonq-kget.png differ
diff --git a/doc/Rekonq-manualplugins.png b/doc/Rekonq-manualplugins.png
index 440e484..f434518 100644
Binary files a/doc/Rekonq-manualplugins.png and b/doc/Rekonq-manualplugins.png 
differ
diff --git a/doc/Rekonq-notabs.png b/doc/Rekonq-notabs.png
deleted file mode 100644
index 82b8f7b..0000000
Binary files a/doc/Rekonq-notabs.png and /dev/null differ
diff --git a/doc/Rekonq-sslinfo.png b/doc/Rekonq-sslinfo.png
index cfd4265..1e88553 100644
Binary files a/doc/Rekonq-sslinfo.png and b/doc/Rekonq-sslinfo.png differ
diff --git a/doc/Rekonq-tabpreview.png b/doc/Rekonq-tabpreview.png
index f2a0033..0bbf590 100644
Binary files a/doc/Rekonq-tabpreview.png and b/doc/Rekonq-tabpreview.png differ
diff --git a/doc/Rekonq-toolbar.png b/doc/Rekonq-toolbar.png
index 8db8343..ece3c13 100644
Binary files a/doc/Rekonq-toolbar.png and b/doc/Rekonq-toolbar.png differ
diff --git a/doc/Rekonq-urlbar.png b/doc/Rekonq-urlbar.png
index ac0aba9..d0d5f0a 100644
Binary files a/doc/Rekonq-urlbar.png and b/doc/Rekonq-urlbar.png differ
diff --git a/doc/Rekonq-windowtabbing.png b/doc/Rekonq-windowtabbing.png
deleted file mode 100644
index c68e0ab..0000000
Binary files a/doc/Rekonq-windowtabbing.png and /dev/null differ
diff --git a/doc/Systemsettings-enablewindowtabbing.png 
b/doc/Systemsettings-enablewindowtabbing.png
deleted file mode 100644
index 1bccbc2..0000000
Binary files a/doc/Systemsettings-enablewindowtabbing.png and /dev/null differ
diff --git a/doc/advanced.png b/doc/advanced.png
index 5ff76bc..baf64dd 100644
Binary files a/doc/advanced.png and b/doc/advanced.png differ
diff --git a/doc/appearance.png b/doc/appearance.png
index 38d9e87..3789102 100644
Binary files a/doc/appearance.png and b/doc/appearance.png differ
diff --git a/doc/index.docbook b/doc/index.docbook
index 3980389..2c9b317 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" 
"dtd/kdex.dtd" [
-  <!ENTITY rekonq "<application>rekonq</application>">
-  <!ENTITY kappname "&rekonq;">
+  <!ENTITY i18n-rekonq "<application>rekonq</application>">
+  <!ENTITY kappname "&i18n-rekonq;">
   <!ENTITY Andrea.Diamantini "<personname>
                               <firstname>Andrea</firstname>
                               <surname>Diamantini</surname>
@@ -30,31 +30,32 @@
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
 ]>
-
+<!-- FIXME http://adjamblog.wordpress.com/2013/11/15/rekonq-2-4-0/ -->
 <book lang="&language;">
 <bookinfo>
-<title>The &rekonq; Handbook</title>
+<title>The &i18n-rekonq; Handbook</title>
 <authorgroup>
 <author>&Andrea.Diamantini; &Andrea.Diamantini.mail;</author>
 <author>&Rohan.Garg; &Rohan.Garg.mail;</author>
 <author>&Jonathan.Kolberg; &Jonathan.Kolberg.mail;</author>
 <author>
 <personname>
-    <firstname>Part of this documentation was converted from the &kde; 
UserBase <ulink url="http://userbase.kde.org/Rekonq";>Rekonq</ulink> 
page.</firstname>
+    <firstname>Part of this documentation was converted from the &kde; 
UserBase <ulink url="http://userbase.kde.org/Rekonq";>Rekonq</ulink>
+    and <ulink url="http://userbase.kde.org/Rekonq/FAQs";>Rekonq/FAQs</ulink> 
pages.</firstname>
 <surname></surname>
 </personname>
 </author>
 <author>
 <personname>
-    <firstname>Part of this documentation was converted from the &kde; 
UserBase <ulink url="http://userbase.kde.org/Rekonq/FAQs";>Rekonq/FAQs</ulink> 
page.</firstname>
+    <firstname>Update to Rekonq 2.3.2 by the &kde; Documentation 
Team.</firstname>
 <surname></surname>
 </personname>
     </author>
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
     </authorgroup>
 <legalnotice>&FDLNotice;</legalnotice>
-<date>2012-06-02</date>
-    <releaseinfo>0.9.61 (&kde; SC 4.8)</releaseinfo>
+<date>2013-08-20</date>
+    <releaseinfo>2.3.2 (&kde; SC 4.11)</releaseinfo>
 <abstract>
 <para></para>
     </abstract>
@@ -65,31 +66,30 @@
 <keyword>webkit</keyword>
 </keywordset>
 </bookinfo>
-
 <chapter id="introduction"><title>Introduction</title>
-<para>Based initially on <emphasis>qtwebkit</emphasis> (and currently on 
<emphasis>kdewebkit</emphasis>), &rekonq; is a lightweight browser designed to 
use the <guilabel>WebKit</guilabel> rendering engine in combination with 
various &kde; technologies, allowing it to integrate seamlessly into the &kde; 
desktop. The name is a throwback to the venerable khtml-based <ulink 
url="help:/konqueror/index.html">&konqueror;</ulink> which is currently the 
default &kde; web browser.
+<para>Based initially on <emphasis>qtwebkit</emphasis> (and currently on 
<emphasis>kdewebkit</emphasis>), &i18n-rekonq; is a lightweight browser 
designed to use the <guilabel>WebKit</guilabel> rendering engine in combination 
with various &kde; technologies, allowing it to integrate seamlessly into the 
&kde; desktop. The name is a throwback to the venerable khtml-based <ulink 
url="help:/konqueror/index.html">&konqueror;</ulink> which is currently the 
default &kde; web browser.
 </para>
-<para>&rekonq; has already replaced &konqueror; as the default browser in 
Chakra and Kubuntu, with more distributions expressing similar intent for their 
future releases.
+<para>&i18n-rekonq; has already replaced &konqueror; as the default browser in 
Chakra and &kubuntu;, with more distributions expressing similar intent for 
their future releases.
 </para>
-<important><para>Like all &kde; applications, &rekonq; is highly
-        configurable. This document describes how &rekonq; behaves with the 
normal,
+<important><para>Like all &kde; applications, &i18n-rekonq; is highly
+        configurable. This document describes how &i18n-rekonq; behaves with 
the normal,
         default settings.
         </para>
         <para> A three button mouse can be useful when you are running
-        &rekonq; or any other &kde; application. If your mouse only has two 
buttons
+        &i18n-rekonq; or any other &kde; application. If your mouse only has 
two buttons
         then you should be able to set your system up so that you can simulate 
a middle mouse button by pressing both buttons at the same time.
         </para>
         <para>If you are used to having to double-click to perform an action,
-        then take care, because in common with the rest of &kde;, &rekonq; 
defaults
+        then take care, because in common with the rest of &kde;, 
&i18n-rekonq; defaults
         to single-clicking.
         </para>
 </important>
 
 <sect1 id="Starting">
 
-<title>Starting &rekonq;</title>
+<title>Starting &i18n-rekonq;</title>
 <para>
-&rekonq; can be started in the following ways
+&i18n-rekonq; can be started in the following ways
 <itemizedlist>
   <listitem><para>From the application launcher select
     <menuchoice>
@@ -99,7 +99,7 @@
     </menuchoice>
   </para></listitem>
   <listitem><para><keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo> 
will open
-        &krunner;, type <userinput>rekonq</userinput> (lower case) and press 
&Enter; to start &rekonq;</para></listitem>
+        &krunner;, type <userinput>rekonq</userinput> (lower case) and press 
&Enter; to start &i18n-rekonq;</para></listitem>
 </itemizedlist>
 </para>
 </sect1>
@@ -113,17 +113,17 @@
       <imagedata fileref="Rekonq-toolbar.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>&rekonq; main toolbar</phrase>
+      <phrase>&i18n-rekonq; main toolbar</phrase>
     </textobject>
     <caption>
-      <para>&rekonq; main toolbar</para>
+      <para>&i18n-rekonq; main toolbar</para>
     </caption>
   </mediaobject>
 </screenshot>
 </para>
-<para>By default, the &rekonq; window uses only one toolbar. This main toolbar 
consists of four navigation buttons (<guilabel>back</guilabel>, 
<guilabel>forward</guilabel>, <guilabel>reload/stop</guilabel>), the URL bar 
and a menu/button <guilabel>Tools</guilabel>. This minimalist approach to the 
main toolbar marks the most significant user-interface departure from the 
traditional multi-toolbar paradigm followed by most other browsers like 
&konqueror;.
+<para>By default, the &i18n-rekonq; window uses only one toolbar. This main 
toolbar consists of four navigation buttons (<guilabel>Back</guilabel>, 
<guilabel>Forward</guilabel>, <guilabel>Reload/Stop</guilabel>), the &URL; bar 
and a menu button <guilabel>Tools</guilabel>. This minimalist approach to the 
main toolbar marks the most significant user-interface departure from the 
traditional multi-toolbar paradigm followed by most other browsers like 
&konqueror;.
 </para>
-<para>Further, the main toolbar offers only limited customization &ndash; 
<guilabel>orientation</guilabel> (locked at the top of the window, by default), 
<guilabel>icon size</guilabel> (medium, by default) and <guilabel>icon 
labels</guilabel> (not shown, by default). This helps keep the &rekonq; UI 
simple and puts the focus on the web page on display.
+<para>Further, the main toolbar offers only limited customization &ndash;. 
This helps keep the &i18n-rekonq; UI simple and puts the focus on the web page 
on display.
 </para>
 <para>
 <screenshot>
@@ -133,15 +133,15 @@
       <imagedata fileref="Rekonq-urlbar.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>&rekonq; URL bar</phrase>
+      <phrase>&i18n-rekonq; &URL; bar</phrase>
     </textobject>
     <caption>
-      <para>&rekonq; URL bar</para>
+      <para>&i18n-rekonq; &URL; bar</para>
     </caption>
   </mediaobject>
 </screenshot>
 </para>
-<para>&rekonq; introduces a vastly improved URL bar that offers access to 
search engines from the drop down completion list itself. The completion list 
is also populated by matching items from your history and bookmarks.
+<para>&i18n-rekonq; introduces a vastly improved &URL; bar that offers access 
to search engines from the drop down completion list itself. The completion 
list is also populated by matching items from your history and bookmarks.
 </para>
 <para>
 <screenshot>
@@ -151,16 +151,17 @@
       <imagedata fileref="Rekonq-newtab.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>&rekonq; new tab page</phrase>
+      <phrase>&i18n-rekonq; new tab page</phrase>
     </textobject>
     <caption>
-      <para>&rekonq; new tab page</para>
+      <para>&i18n-rekonq; new tab page</para>
     </caption>
   </mediaobject>
 </screenshot>
 </para>
-<para>When started, &rekonq; displays the New Tab page, much of which is taken 
by a set of preview thumbnails of favorite webpages. These thumbnails offer a 
speedy way for the user to access their most frequently used webpages. There is 
also a pane at the top of this page allows the user to switch to previews of 
recently closed tabs and lists of bookmarked webpages, download and browsing 
histories.
+<para>When started, &i18n-rekonq; displays the New Tab page, much of which is 
taken by a set of preview thumbnails of favorite web pages. These thumbnails 
offer a speedy way for the user to access their most frequently used web pages. 
There is also a pane at the top of this page allows the user to switch to 
previews of recently closed tabs and lists of bookmarked web pages, download 
and browsing histories.
 </para>
+<para>To get back to the New Tab page, open a new tab or click the 
<guiicon>Close Tab</guiicon> icon if only one tab is opened.</para>
 <para>
 <screenshot>
 <screeninfo></screeninfo>
@@ -169,10 +170,10 @@
       <imagedata fileref="Rekonq-panels.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>&rekonq; hidden UI elements</phrase>
+      <phrase>&i18n-rekonq; hidden UI elements</phrase>
     </textobject>
     <caption>
-      <para>&rekonq; hidden UI elements</para>
+      <para>&i18n-rekonq; hidden UI elements</para>
     </caption>
   </mediaobject>
 </screenshot>
@@ -181,10 +182,10 @@
 </para>
 </chapter>
 <chapter id="features"><title>Features</title>
-<para>Under its minimalist appearance, &rekonq; packs a full set of powerful 
features. Some of them are described below:
+<para>Under its minimalist appearance, &i18n-rekonq; packs a full set of 
powerful features. Some of them are described below:
 </para>
 <sect1 id="kde-integration"><title>&kde; integration</title>
-<para>&rekonq; is designed with the aim of being a &kde; browser. And it shows 
this.
+<para>&i18n-rekonq; is designed with the aim of being a &kde; browser. And it 
shows this.
 </para>
 <sect2 id="appearance"><title>Appearance</title>
 <para>It obeys your themes, fonts, window decoration, menu highlighting, and 
many personalization options you set for your desktop.
@@ -199,15 +200,15 @@
       <imagedata fileref="Rekonq-okularkpart.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>&rekonq; opens a PDF file in an &okular; 
<guilabel>kpart</guilabel></phrase>
+      <phrase>&i18n-rekonq; opens a PDF file in an &okular; 
<guilabel>kpart</guilabel></phrase>
     </textobject>
     <caption>
-      <para>&rekonq; opens a PDF file in an &okular; 
<guilabel>kpart</guilabel></para>
+      <para>&i18n-rekonq; opens a PDF file in an &okular; 
<guilabel>kpart</guilabel></para>
     </caption>
   </mediaobject>
 </screenshot>
 </para>
-<para>&rekonq; plays well with other applications in the &kde; family. 
&rekonq; will always use your chosen default applications to handle file types. 
PDF files, for example will open in an embedded <ulink 
url="help:/okular/index.html">&okular;</ulink> <guilabel>kpart</guilabel> 
within &rekonq; itself. Media files will open in <ulink 
url="help:/dragonplayer/index.html">&dragon;</ulink> (or any other designated 
default application for that filetype).
+<para>&i18n-rekonq; plays well with other applications in the &kde; family. 
&i18n-rekonq; will always use your chosen default applications to handle file 
types. PDF files, for example will open in an embedded <ulink 
url="help:/okular/index.html">&okular;</ulink> <guilabel>kpart</guilabel> 
within &i18n-rekonq; itself. Media files will open in <ulink 
url="help:/dragonplayer/index.html">&dragon;</ulink> (or any other designated 
default application for that filetype).
 </para>
 <para>
 <screenshot>
@@ -217,15 +218,16 @@
       <imagedata fileref="Bookmarkseditor.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>&rekonq; shares bookmarks &etc; with &konqueror;</phrase>
+      <phrase>&i18n-rekonq; shares bookmarks &etc; with &konqueror;</phrase>
     </textobject>
     <caption>
-      <para>&rekonq; shares bookmarks &etc; with &konqueror;</para>
+      <para>&i18n-rekonq; shares bookmarks &etc; with &konqueror;</para>
     </caption>
   </mediaobject>
 </screenshot>
 </para>
-<para>Bookmarks, web shortcuts (more on these later), cookies and 
authentication information are shared with &konqueror;. You will see the same 
set of bookmarks from either application and you can log onto a website in 
&konqueror; and carry on seamlessly if you decide to switch to &rekonq;. Your 
passwords are stored securely in <ulink 
url="help:/kwallet/index.html">KWallet</ulink> and can be used from either 
&konqueror; or &rekonq;.
+<!--FIXME ~/.kde/share/apps/konqueror/bookmarks.xml-->
+<para>Bookmarks, web shortcuts (more on these later), cookies and 
authentication information are shared with &konqueror;. You will see the same 
set of bookmarks from either application and you can log onto a website in 
&konqueror; and carry on seamlessly if you decide to switch to &i18n-rekonq;. 
Your passwords are stored securely in <ulink 
url="help:/kwallet/index.html">KWallet</ulink> and can be used from either 
&konqueror; or &i18n-rekonq;.
 </para>
 <para>Your downloads can be optionally handled by <ulink 
url="help:/kget/index.html">KGet</ulink>. Feeds from websites can be saved to 
&akregator; (or <guilabel>Google Reader</guilabel>).
 </para>
@@ -237,10 +239,10 @@
       <imagedata fileref="Rekonq-akregator.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>&rekonq; + &akregator;</phrase>
+      <phrase>&i18n-rekonq; + &akregator;</phrase>
     </textobject>
     <caption>
-      <para>&rekonq; + &akregator;</para>
+      <para>&i18n-rekonq; + &akregator;</para>
     </caption>
   </mediaobject>
 </screenshot>
@@ -253,10 +255,10 @@
       <imagedata fileref="Rekonq-kget.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>&rekonq; + &kget;</phrase>
+      <phrase>&i18n-rekonq; + &kget;</phrase>
     </textobject>
     <caption>
-      <para>&rekonq; + &kget;</para>
+      <para>&i18n-rekonq; + &kget;</para>
     </caption>
   </mediaobject>
 </screenshot>
@@ -273,27 +275,27 @@
       <imagedata fileref="Rekonq-ftp.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>&rekonq; browsing an &FTP; share</phrase>
+      <phrase>&i18n-rekonq; browsing an &FTP; share</phrase>
     </textobject>
     <caption>
-      <para>&rekonq; browsing an &FTP; share</para>
+      <para>&i18n-rekonq; browsing an &FTP; share</para>
     </caption>
   </mediaobject>
 </screenshot>
 </para>
-<para>&rekonq; supports KIO services, including cookies, cache, proxies and 
network settings. <emphasis>KIO-slaves</emphasis> like file:/, ftp:/, man:/, 
help:/, info:/ &etc; will work in &rekonq;, too.
+<para>&i18n-rekonq; supports KIO services, including cookies, cache, proxies 
and network settings. <emphasis>KIO-slaves</emphasis> like file:/, ftp:/, 
man:/, help:/, info:/ &etc; will work in &i18n-rekonq;, too.
 </para>
 </sect2>
 <sect2 id="dialogs"><title>Dialogs</title>
-<para>In addition to all this, &rekonq; uses &kde;'s own file dialog for 
opening/saving documents. This means, you have access to the 
<emphasis>Places</emphasis> navigation panel from &dolphin; while you open or 
save documents.
+<para>In addition to all this, &i18n-rekonq; uses &kde;'s own file dialog for 
opening/saving documents. This means, you have access to the 
<emphasis>Places</emphasis> navigation panel from &dolphin; while you open or 
save documents.
 </para>
-<para>Thus, &rekonq; looks, feels and behaves like a part of your &kde; 
desktop.
+<para>Thus, &i18n-rekonq; looks, feels and behaves like a part of your &kde; 
desktop.
 </para>
 </sect2>
 </sect1>
 </chapter>
 <chapter id="webkit-engine"><title>Webkit engine</title>
-<para>&rekonq; uses the open source <guilabel>WebKit</guilabel> rendering 
engine which incidentally began life as a branch of the khtml/kjs libraries 
from the &kde; project. <guilabel>WebKit</guilabel> is fast, powerful and used 
by many other popular browsers today including <trademark 
class="registered">Google</trademark>'s <trademark 
class="registered">Chrome</trademark>, <trademark 
class="registered">Apple</trademark>'s <trademark 
class="registered">Safari</trademark> and others.
+<para>&i18n-rekonq; uses the open source <guilabel>WebKit</guilabel> rendering 
engine which incidentally began life as a branch of the khtml/kjs libraries 
from the &kde; project. <guilabel>WebKit</guilabel> is fast, powerful and used 
by many other popular browsers today including <trademark 
class="registered">Google</trademark>'s <trademark 
class="registered">Chrome</trademark>, <trademark 
class="registered">Apple</trademark>'s <trademark 
class="registered">Safari</trademark> and others.
 </para>
 </chapter>
 <chapter id="auto-load-click-to-load-plugins"><title>Auto-load/click-to-load 
plugins</title>
@@ -305,10 +307,10 @@
       <imagedata fileref="Rekonq-manualplugins-youtube.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>&rekonq; demonstrating the click-to-load-plugins feature on 
youtube.com</phrase>
+      <phrase>&i18n-rekonq; demonstrating the click-to-load-plugins feature on 
youtube.com</phrase>
     </textobject>
     <caption>
-      <para>&rekonq; demonstrating the click-to-load-plugins feature on 
youtube.com</para>
+      <para>&i18n-rekonq; demonstrating the click-to-load-plugins feature on 
youtube.com</para>
     </caption>
   </mediaobject>
 </screenshot>
@@ -325,20 +327,24 @@
       <imagedata fileref="Rekonq-adblock.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>&rekonq; blocking images on kde-apps.org</phrase>
+      <phrase>&i18n-rekonq; blocking images on kde-apps.org</phrase>
     </textobject>
     <caption>
-      <para>&rekonq; blocking images on kde-apps.org</para>
+      <para>&i18n-rekonq; blocking images on kde-apps.org</para>
     </caption>
   </mediaobject>
 </screenshot>
 </para>
-<para>&rekonq; comes with an automatic subscription to the Easylist filter, 
which is updated every week. Additionally, you can set up manual filters to 
block loading of elements from web pages that match your criteria. You can even 
download and import additional published filterlists or export your list for 
backup.
+<para>&i18n-rekonq; comes with an automatic subscription to the Easylist 
filter, which is updated every week. Additionally, you can set up manual 
filters to block loading of elements from web pages that match your criteria. 
You can even download and import additional published filterlists or export 
your list for backup.
 </para>
+<!--FIXME para>I you want to import your Manual Filters e.g. from Konqueror 
just copy your list into this file: 
/home/username/.kde4/share/apps/rekonq/adblockrules_local
+</para-->
+<para>For detailed information please read <ulink 
url="help:/kcontrol/khtml-adblock/index.html">AdBlocK Filters</ulink>.</para>
 </chapter>
 <chapter id="web-shortcuts-support"><title>Web shortcuts support</title>
-<para>&rekonq; allows you to pick from an extensive list of web shortcuts 
&ndash; these are keywords that allow you to search the web quickly. For 
instance, entering <userinput>gg:&kde;</userinput> in the location bar will 
search <emphasis>Google</emphasis> for <quote>&kde;</quote>, while 
<userinput>wp:&kde;</userinput> will search <emphasis>Wikipedia</emphasis> for 
<quote>&kde;</quote>. There are dozens of these defined by default. You can 
edit these or even define custom shortcuts to search on your favorite websites.
+<para>&i18n-rekonq; allows you to pick from an extensive list of web shortcuts 
&ndash; these are keywords that allow you to search the web quickly. For 
instance, entering <userinput>gg:&kde;</userinput> in the location bar will 
search <emphasis>Google</emphasis> for <quote>&kde;</quote>, while 
<userinput>wp:&kde;</userinput> will search <emphasis>Wikipedia</emphasis> for 
<quote>&kde;</quote>. There are dozens of these defined by default. You can 
edit these or even define custom shortcuts to search on your favorite websites.
 </para>
+<para>For detailed information please read <ulink 
url="help:/kcontrol/ebrowsing/index.html">Web Shortcuts</ulink>.</para>
 </chapter>
 <chapter id="privacy-and-security-features"><title>Privacy and security 
features</title>
 <para>
@@ -349,15 +355,15 @@
       <imagedata fileref="Rekonq-privatebrowsing.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>&rekonq; in private browsing mode</phrase>
+      <phrase>&i18n-rekonq; in private browsing mode</phrase>
     </textobject>
     <caption>
-      <para>&rekonq; in private browsing mode</para>
+      <para>&i18n-rekonq; in private browsing mode</para>
     </caption>
   </mediaobject>
 </screenshot>
 </para>
-<para>&rekonq; allows users to browse the web without retaining information 
about the visited pages in your history. Note that this feature does not 
necessarily make you anonymous on the Internet &ndash; it only prevents fresh 
information from being recorded on your computer. You can also delete your 
history, cookies and other private data anytime straight from the configuration 
menu button.
+<para>&i18n-rekonq; allows users to browse the web without retaining 
information about the visited pages in your history. Note that this feature 
does not necessarily make you anonymous on the Internet &ndash; it only 
prevents fresh information from being recorded on your computer. You can also 
delete your history, cookies and other private data anytime straight from the 
configuration menu button.
 </para>
 <para>
 <screenshot>
@@ -367,15 +373,15 @@
       <imagedata fileref="Rekonq-sslinfo.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>&rekonq; URL bar showing the SSL info icon</phrase>
+      <phrase>&i18n-rekonq; &URL; bar showing the SSL info icon</phrase>
     </textobject>
     <caption>
-      <para>&rekonq; URL bar showing the SSL info icon</para>
+      <para>&i18n-rekonq; &URL; bar showing the SSL info icon</para>
     </caption>
   </mediaobject>
 </screenshot>
 </para>
-<para>When viewing web pages over a secure connection, you can also view SSL 
information straight from the URL bar by clicking on the <guiicon>yellow 
lock</guiicon> icon.
+<para>When viewing web pages over a secure connection, you can also view SSL 
information straight from the &URL; bar by clicking on the <guiicon>yellow 
lock</guiicon> icon.
 </para>
 </chapter>
 <chapter id="advanced-tab-handling"><title>Advanced tab handling</title>
@@ -387,25 +393,25 @@
       <imagedata fileref="Rekonq-tabpreview.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>&rekonq; showing a preview of a tab on hover</phrase>
+      <phrase>&i18n-rekonq; showing a preview of a tab on hover</phrase>
     </textobject>
     <caption>
-      <para>&rekonq; showing a preview of a tab on hover</para>
+      <para>&i18n-rekonq; showing a preview of a tab on hover</para>
     </caption>
   </mediaobject>
 </screenshot>
 </para>
-<para>&rekonq; allows you to rearrange your tabs on the fly. Just drag a tab 
to the left or to the right and the other tabs will move out of your way. You 
can also hover over a tab to see a live preview of the web page being displayed 
there.
+<para>&i18n-rekonq; allows you to rearrange your tabs on the fly. Just drag a 
tab to the left or to the right and the other tabs will move out of your way. 
You can also hover over a tab to see a live preview of the web page being 
displayed there.
 </para>
 <para>A <emphasis>context menu</emphasis> (right-click menu) gives access to 
more tab-related functions such as the ability to detach, clone, reload the tab.
 </para>
 </chapter>
 <chapter id="session-restore-feature"><title>Session restore feature</title>
-<para>If &rekonq; crashes, it will automatically attempt to restore your 
session, complete with all the tabs the next time you start it. If for some 
reason, the browser continues to crash upon restoring the session, &rekonq; 
will automatically start with a fresh session the second time.
+<para>If &i18n-rekonq; crashes, it will automatically attempt to restore your 
session, complete with all the tabs the next time you start it. If for some 
reason, the browser continues to crash upon restoring the session, 
&i18n-rekonq; will automatically start with a fresh session the second time.
 </para>
 </chapter>
 <chapter id="full-screen-mode"><title>Full screen mode</title>
-<para>&rekonq; supports full-screening the webpage straight from the 
configuration menu button or through a keyboard shortcut 
(<keycombo>&Ctrl;&Shift;<keycap>F</keycap></keycombo>, by default). In the full 
screen view, the main toolbar will auto-hide and the web page will be displayed 
over your entire screen.
+<para>&i18n-rekonq; supports full-screening the web page straight from the 
configuration menu button or through a keyboard shortcut 
(<keycombo>&Ctrl;&Shift;<keycap>F</keycap></keycombo>, by default). In the full 
screen view, the main toolbar will auto-hide and the web page will be displayed 
over your entire screen.
 </para>
 </chapter>
 <!--FIXME no slider any more
@@ -423,29 +429,29 @@ Zoom... sets 100% now
       <imagedata fileref="Rekonq-zoom.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>&rekonq; showing the zoom slider at the bottom of the 
window</phrase>
+      <phrase>&i18n-rekonq; showing the zoom slider at the bottom of the 
window</phrase>
     </textobject>
     <caption>
-      <para>&rekonq; showing the zoom slider at the bottom of the window</para>
+      <para>&i18n-rekonq; showing the zoom slider at the bottom of the 
window</para>
     </caption>
   </mediaobject>
 </screenshot>
 </para>
-<para>&rekonq; has a slider to adjust the zoom at the bottom of the window 
with a handy button to restore the zoom back to default. Of course, you can 
still use keyboard (<keycombo>&Ctrl;<keycap>+/-</keycap></keycombo>) or mouse 
(<keycombo>&Ctrl;<keycap> mouse scroll up/down</keycap></keycombo>) shortcuts 
just the same.
+<para>&i18n-rekonq; has a slider to adjust the zoom at the bottom of the 
window with a handy button to restore the zoom back to default. Of course, you 
can still use keyboard (<keycombo>&Ctrl;<keycap>+/-</keycap></keycombo>) or 
mouse (<keycombo>&Ctrl;<keycap> mouse scroll up/down</keycap></keycombo>) 
shortcuts just the same.
 </para>
 <para>The zoom slider can be enabled (or disabled) with 
<keycombo>&Ctrl;<keycap>Y</keycap></keycombo> or with 
<guimenuitem>Zoom...</guimenuitem> from <guilabel>Tools</guilabel> menu.
 </para>
 </chapter>
 -->
 <chapter id="Config-rekonq">
-<title>Detailed &rekonq; configuration</title>
+<title>Detailed &i18n-rekonq; configuration</title>
 
 <sect1 id="General">
 
-<title>Do the general settings of &rekonq;</title>
+<title>General settings of &i18n-rekonq;</title>
 
 <para>
-You want to configure the general behavior of &rekonq;? You found the right 
place to get it explained.
+You want to configure the general behavior of &i18n-rekonq;? You found the 
right place to get it explained.
 </para>
 
 <para>
@@ -473,15 +479,15 @@ Here a List of configurable points and explanation for it:
 <variablelist>
   <varlistentry>
     <term><guilabel>When starting rekonq:</guilabel></term>
-    <listitem> <para>You can configure what &rekonq; should do on 
startup.</para></listitem>
+    <listitem> <para>You can configure what &i18n-rekonq; should do on 
startup.</para></listitem>
   </varlistentry>
   <varlistentry>
-    <term><guilabel>Home page URL:</guilabel></term>
+    <term><guilabel>Home page &URL;:</guilabel></term>
     <listitem><para>You can either set your home page directly through tipping 
the &URL; in.</para></listitem>
   </varlistentry>
   <varlistentry>
     <term><guilabel>Use the New Tab Page as home page</guilabel></term>
-    <listitem><para>Enabling this option makes an empty new page the default 
home page of &rekonq;.</para> </listitem>
+    <listitem><para>Enabling this option makes an empty new page the default 
home page of &i18n-rekonq;.</para> </listitem>
   </varlistentry>
   <varlistentry>
     <term><guibutton>Set to Current Page</guibutton></term>
@@ -489,11 +495,11 @@ Here a List of configurable points and explanation for it:
   </varlistentry>
   <varlistentry>
     <term><guilabel>Use KGet for downloading files</guilabel></term>
-    <listitem><para>This activates the &kget; download integration. If this is 
active &rekonq; will download everything through &kget;</para></listitem>
+    <listitem><para>This activates the &kget; download integration. If this is 
active &i18n-rekonq; will download everything through &kget;</para></listitem>
   </varlistentry>
   <varlistentry>
     <term><guilabel>List links with KGet</guilabel></term>
-    <listitem><para>If enabled, &rekonq; will display an additional context 
menu entry, which, when selected, lists all available links of the current 
website in &kget;.</para></listitem>
+    <listitem><para>If enabled, &i18n-rekonq; will display an additional 
context menu entry, which, when selected, lists all available links of the 
current website in &kget;.</para></listitem>
   </varlistentry>
 </variablelist>
 
@@ -534,35 +540,40 @@ Here a list of configurable points and explanation for it:
 <variablelist>
   <varlistentry>
     <term><guilabel>New tab opens</guilabel></term>
-    <listitem><para>Here you can choose the default behavior of &rekonq; when 
you open the new tab.</para></listitem>
-  </varlistentry><varlistentry>
+    <listitem><para>Here you can choose the default behavior of &i18n-rekonq; 
when you open the new tab.</para></listitem>
+  </varlistentry>
+  <varlistentry>
     <term><guilabel>New Tab Page starts with</guilabel></term>
     <listitem><para>Here you can choose the default contents for the new 
tabs.</para></listitem>
   </varlistentry>
   <varlistentry>
-    <term><guilabel>Don't use tabs: open links in new window</guilabel></term>
-    <listitem><para>This enables the default opening of links in new 
windows.</para></listitem>
+    <term><guilabel>When hovering a tab show</guilabel></term>
+    <listitem><para>Here you can choose to shoe a preview, the title, the 
&URL; or nothing.</para></listitem>
   </varlistentry>
   <varlistentry>
-    <term><guilabel>Always show tab bar</guilabel></term>
-    <listitem> <para>This forces &rekonq; to show the tab bar even if there is 
only one tab.</para></listitem>
+    <term><guilabel>Open as new window when &URL; is called 
externally</guilabel></term>
+    <listitem><para>This prevents &i18n-rekonq; to open links from external 
applications in an already running instance in another virtual desktop or 
activity, but opens them in the actual virtual desktop or activity in new 
windows instead.</para></listitem>
   </varlistentry>
   <varlistentry>
-    <term><guilabel>Open new tabs in the background</guilabel></term>
-    <listitem> <para>This makes &rekonq; not switching to new tabs.</para> 
</listitem>
+    <term><guilabel>Closing last tab closes window</guilabel></term>
+    <listitem> <para>This forces &i18n-rekonq; to quit, when you close the 
last tab. If disabled the view will switch to the New Tab 
content.</para></listitem>
   </varlistentry>
   <varlistentry>
-    <term><guilabel>Open new tabs after currently active one</guilabel></term>
-    <listitem> <para>This makes it to default that tabs are opened next to the 
currently active one.</para></listitem>
+    <term><guilabel>Activate previously used tab when closing the current 
one</guilabel></term>
+    <listitem> <para>This makes &i18n-rekonq; storing your last opened tab and 
if you close your current one it will reopen the old one. This also can be 
useful if you use many tabs.</para> </listitem>
   </varlistentry>
   <varlistentry>
-    <term><guilabel>Activate previously used tab when closing the current 
one</guilabel></term>
-    <listitem> <para>This makes &rekonq; storing your last opened tab and if 
you close your current one it will reopen the old one. This also can be useful 
if you use many tabs.</para> </listitem>
+    <term><guilabel>Open new tabs next to current tab</guilabel></term>
+    <listitem> <para>This makes it to default that tabs are opened next to the 
currently active one when you open a link on a page from the context menu in a 
new tab.</para></listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><guilabel>Open new tabs in the foreground</guilabel></term>
+    <listitem> <para>This makes &i18n-rekonq; switching to new tabs when you 
open a link on a page from the contact menu in a new tab.</para> </listitem>
   </varlistentry>
 </variablelist>
-
 </para>
-
+<para>The last two options do not apply for new tabs opened from the tab 
context menu or using the <guiicon>New Tab</guiicon> icon.
+</para>
 </sect1>
 
 <sect1 id="Appearance">
@@ -593,7 +604,7 @@ Here a list of configurable points and explanation for it:
   </varlistentry>
   <varlistentry>
     <term><guilabel>Fixed font</guilabel></term>
-    <listitem><para>Here you can set your font for &rekonq; labels. The same 
synopsis like <guilabel>Standard font</guilabel>.</para></listitem>
+    <listitem><para>Here you can set your font for &i18n-rekonq; labels. The 
same synopsis like <guilabel>Standard font</guilabel>.</para></listitem>
   </varlistentry>
   <varlistentry>
     <term><guilabel>Serif font</guilabel></term>
@@ -617,7 +628,7 @@ Here a list of configurable points and explanation for it:
   </varlistentry>
   <varlistentry>
     <term><guilabel>Minimal font size:</guilabel></term>
-    <listitem><para>You can configure the minimal size of fonts in &rekonq;. 
Every smaller font will grow to that size.</para></listitem>
+    <listitem><para>You can configure the minimal size of fonts in 
&i18n-rekonq;. Every smaller font will grow to that size.</para></listitem>
   </varlistentry>
 </variablelist>
 
@@ -634,8 +645,8 @@ Here a list of configurable points and explanation for it:
 
 <variablelist>
   <varlistentry>
-    <term><guilabel>Path to custom CSS file:</guilabel></term>
-    <listitem><para>Here you can set the path to your CSS file used to format 
webpages.</para></listitem>
+    <term><guilabel>Path to custom &CSS; file:</guilabel></term>
+    <listitem><para>Here you can set the path to your &CSS; file used to 
format web pages.</para></listitem>
   </varlistentry>
 </variablelist>
 </sect1>
@@ -679,7 +690,7 @@ Here a list of configurable points and explanation for it:
 </para>
 
 <para>
-  As you can see using this page you can control Javascript, tracking, 
history, passwords, <ulink url="help:kcontrol/cookies">cookies</ulink>, and 
<ulink url="help:kcontrol/cache">cache</ulink> settings of &rekonq;.
+  As you can see using this page you can control Javascript, tracking, 
history, passwords, <ulink url="help:kcontrol/cookies">cookies</ulink>, and 
<ulink url="help:kcontrol/cache">cache</ulink> settings of &i18n-rekonq;.
 </para>
 
 </sect1>
@@ -701,65 +712,23 @@ Here a list of configurable points and explanation for it:
 </screenshot>
 </para>
 
- <para>Using <guilabel>Proxy</guilabel> pane you can access the system wide 
proxy server settings. Just press <guibutton>Change them!</guibutton> to open 
the <ulink url="help:kcontrol/proxy">corresponding &systemsettings; 
module</ulink>.</para>
+ <para>Using <guilabel>Proxy</guilabel> pane you can access the system wide 
proxy server settings. Just press <guibutton>Change them</guibutton> to open 
the <ulink url="help:kcontrol/proxy">corresponding &systemsettings; 
module</ulink>.</para>
 
 <para>On the <guilabel>Misc</guilabel> pane you can configure various aspects 
controlling the browser.</para>
 
 <variablelist>
   <varlistentry>
     <term><guilabel>Enable smooth scrolling</guilabel></term>
-    <listitem><para>If you enable this option &rekonq; will use smooth 
scrolling. Uncheck this option if the scrolling becomes 
choppy.</para></listitem>
+    <listitem><para>If you enable this option &i18n-rekonq; will use smooth 
scrolling. Uncheck this option if the scrolling becomes 
choppy.</para></listitem>
   </varlistentry>
 </variablelist>
 </sect1>
 
-<sect1 id="Shortcut">
-
-<title>Configure the Shortcut settings</title>
-
- <!-- Add the link to KDE fundamentals on shortcuts configuration here later 
on! -->
-
-<para>
-<screenshot>
-<screeninfo>Now you should see this</screeninfo>
-       <mediaobject>
-         <imageobject>
-           <imagedata fileref="shortcuts.png" format="PNG"/>
-         </imageobject>
-         <textobject>
-           <phrase>Screenshot</phrase>
-         </textobject>
-       </mediaobject>
-</screenshot>
-</para>
-
-</sect1>
-
-<sect1 id="WebShortcut">
-
-<title>Configure Search Engines settings</title>
-
-<para>
-<screenshot>
-<screeninfo>Now you should see this</screeninfo>
-       <mediaobject>
-         <imageobject>
-           <imagedata fileref="webshortcuts.png" format="PNG"/>
-         </imageobject>
-         <textobject>
-           <phrase>Screenshot</phrase>
-         </textobject>
-       </mediaobject>
-</screenshot>
-</para>
-
-</sect1>
-
 </chapter>
 
 <chapter id="rekonq-faqs-tips-and-tricks"><title>rekonq FAQs, Tips and 
Tricks</title>
-<sect1 id="how-do-i-set-rekonq-as-my-default-browser"><title>How do I set 
&rekonq; as my default browser?</title>
-<para>Head to <menuchoice><guimenu>System 
Settings</guimenu><guimenuitem>Default Applications</guimenuitem></menuchoice>. 
Here, click on <guilabel>Web Browser</guilabel> to set your default browser. 
Select to open http and https URLs in the following browser and enter 
<userinput>rekonq %u</userinput> as the browser. Click 
<guilabel>Apply</guilabel>.
+<sect1 id="how-do-i-set-rekonq-as-my-default-browser"><title>How do I set 
&i18n-rekonq; as my default browser?</title>
+<para>Head to <menuchoice><guimenu>System 
Settings</guimenu><guimenuitem>Default Applications</guimenuitem></menuchoice>. 
Here, click on <guilabel>Web Browser</guilabel> to set your default browser. 
Select to open http and https &URL;s in the following browser and enter 
<userinput>rekonq %u</userinput> as the browser. Click 
<guilabel>Apply</guilabel>.
 </para>
 <para>
 <screenshot>
@@ -769,10 +738,10 @@ Here a list of configurable points and explanation for it:
       <imagedata fileref="Defaultwebbrowser.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>Setting &rekonq; as the default web browser</phrase>
+      <phrase>Setting &i18n-rekonq; as the default web browser</phrase>
     </textobject>
     <caption>
-      <para>Setting &rekonq; as the default web browser</para>
+      <para>Setting &i18n-rekonq; as the default web browser</para>
     </caption>
   </mediaobject>
 </screenshot>
@@ -789,75 +758,17 @@ Here a list of configurable points and explanation for it:
       <imagedata fileref="Rekonq-manualplugins.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>Setting &rekonq; to not automatically load plugins</phrase>
+      <phrase>Setting &i18n-rekonq; to not automatically load plugins</phrase>
     </textobject>
     <caption>
-      <para>Setting &rekonq; to not automatically load plugins</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-</sect1>
-<sect1 id="how-do-i-make-rekonq-behave-like-chrome-chromium"><title>How do I 
make &rekonq; behave like chrome/chromium?</title>
-<para>Using <ulink url="help:/kwin/index.html">KWin</ulink>'s window tabbing 
feature, we can make &rekonq; emulate the behavior of 
<guilabel>chromium</guilabel> by opening new windows instead of tabs within the 
same window. This will not however allow each window of &rekonq; to crash 
independently &ndash; all windows of &rekonq; crash as a single process. It 
merely emulates the look of <application>Chromium</application>, giving 
individual controls for each web page you load.
-</para>
-<para>Click on the <guilabel>Tools</guilabel> menu button and open the 
<guilabel>Configure rekonq</guilabel> dialog. Click on 
<guilabel>Tabs</guilabel>. Unselect all options to disable all tab handling in 
&rekonq;. Now, &rekonq; will always open new windows instead of tabs.
-</para>
-<para>Now, we'll set up <guilabel>KWin</guilabel> to automatically tab all 
&rekonq; windows together. Head to <menuchoice><guimenu>System 
Settings</guimenu><guimenuitem>Window Behavior</guimenuitem></menuchoice>. 
Select <guilabel>Window Behavior</guilabel> on the left and go to the 
<guilabel>Advanced</guilabel> tab. Here, under <guilabel>Window 
Tabbing</guilabel>, check <guilabel>Automatically group similar 
windows</guilabel>. Click <guilabel>Apply</guilabel>.
-</para>
-<para>Now, &rekonq; will open windows by default which will automatically get 
tabbed together.
-</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Rekonq-notabs.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>&rekonq; configuration</phrase>
-    </textobject>
-    <caption>
-      <para>&rekonq; configuration</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Systemsettings-enablewindowtabbing.png" 
format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>System Settings configuration</phrase>
-    </textobject>
-    <caption>
-      <para>System Settings configuration</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Rekonq-windowtabbing.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>The result</phrase>
-    </textobject>
-    <caption>
-      <para>The result</para>
+      <para>Setting &i18n-rekonq; to not automatically load plugins</para>
     </caption>
   </mediaobject>
 </screenshot>
 </para>
 </sect1>
 <sect1 id="how-do-i-enable-adblock"><title>How do I enable Adblock?</title>
-<para>Adblocking should already be enabled for you using the 
<guilabel>Easylist</guilabel> adblock subscription. You can further configure 
it by clicking on the configuration menu button and choosing 
<menuchoice><guisubmenu>Tools</guisubmenu> <guimenuitem>Ad Block</guimenuitem> 
</menuchoice> to open <guilabel>Ad Block Settings</guilabel> dialog. Click on 
<guilabel>AdBlocK Filters</guilabel>. Here, you can add custom filters using 
wildcard strings (e.g. <command>http://www.site.com/ads/*</command>) or regular 
expressions within forward slashes (e.g. 
<userinput>//(ads|dclk)\./</userinput>).
+<para>Adblocking should already be enabled for you using the 
<guilabel>Easylist</guilabel> adblock subscription. You can further configure 
it by clicking on the configuration menu button and choosing 
<menuchoice><guisubmenu>Tools</guisubmenu> <guimenuitem>Ad Block</guimenuitem> 
</menuchoice> to open <guilabel>Ad Block Settings</guilabel> dialog. Click on 
<guilabel>Manual Filters</guilabel>. Here, you can add custom filters using 
wildcard strings (e.g. <command>http://www.site.com/ads/*</command>) or regular 
expressions within forward slashes (e.g. 
<userinput>//(ads|dclk)\./</userinput>).
 </para>
 <para>Clicking <guilabel>OK</guilabel> activates your adblock filters 
instantly.
 </para>
@@ -869,10 +780,10 @@ Here a list of configurable points and explanation for it:
       <imagedata fileref="Rekonq-adblockconfiguration.png" format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>&rekonq; AdBlocK (automatic) configuration</phrase>
+      <phrase>&i18n-rekonq; AdBlocK (automatic) configuration</phrase>
     </textobject>
     <caption>
-      <para>&rekonq; AdBlocK (automatic) configuration</para>
+      <para>&i18n-rekonq; AdBlocK (automatic) configuration</para>
     </caption>
   </mediaobject>
 </screenshot>
@@ -885,10 +796,10 @@ Here a list of configurable points and explanation for it:
       <imagedata fileref="Rekonq-adblockconfiguration-manual.png" 
format="PNG"/>
     </imageobject>
     <textobject>
-      <phrase>&rekonq; AdBlocK (manual) configuration</phrase>
+      <phrase>&i18n-rekonq; AdBlocK (manual) configuration</phrase>
     </textobject>
     <caption>
-      <para>&rekonq; AdBlocK (manual) configuration</para>
+      <para>&i18n-rekonq; AdBlocK (manual) configuration</para>
     </caption>
   </mediaobject>
 </screenshot>
@@ -896,28 +807,16 @@ Here a list of configurable points and explanation for it:
 </sect1>
 <sect1 id="i-have-more-questions"><title>I have more questions!</title>
 
-<!--A user-generated manual is also available <ulink 
url="http://userbase.kde.org/Special:myLanguage/Rekonq/Manual";>here</ulink>.-->
 <para><ulink url="http://forum.kde.org";>&kde; Forums</ulink> is always a good 
place to ask user-specific questions.</para>
 
-<para>The <ulink url="http://rekonq.kde.org/";>&rekonq; website</ulink> has 
release announcements for the latest stable and unstable releases along with 
more helpful links. You can also contact the developers on the <ulink 
url="irc://freenode/#rekonq">#rekonq IRC channel</ulink> or the <ulink 
url="mailto:rekonq at kde.org">mailing list</ulink> with more questions.
-</para>
-</sect1>
-<sect1 id="how-do-i-contribute"><title>How do I contribute?</title>
-<para>See above for now. <inlinemediaobject>
-<imageobject>
-<imagedata fileref="Face-smile.png" format="PNG"/>
-</imageobject>
-<textobject>
-<phrase>Smiley</phrase>
-</textobject>
-</inlinemediaobject>
+<para>The <ulink url="http://rekonq.kde.org/";>&i18n-rekonq; website</ulink> 
has release announcements for the latest stable and unstable releases along 
with more helpful links. You can also contact the developers on the <ulink 
url="irc://freenode/#rekonq">#rekonq IRC channel</ulink> or the <ulink 
url="mailto:rekonq at kde.org">mailing list</ulink> with more questions.
 </para>
 </sect1>
 </chapter>
 <chapter id="credits">
 <title>Credits and License</title>
 <para>
-&rekonq;
+&i18n-rekonq;
 </para>
 
 <para>
@@ -948,21 +847,21 @@ List of the UserBase contributors can be found on
 <title>Installation</title>
 
 <sect1 id="getting-rekonq">
-<title>How to obtain &rekonq;</title>
-<para>Stable Packages of &rekonq; can be downloaded via standard repositories 
of your distribution</para>
+<title>How to obtain &i18n-rekonq;</title>
+<para>Stable Packages of &i18n-rekonq; can be downloaded via standard 
repositories of your distribution</para>
 
-<para>You also can compile &rekonq; yourself see <link 
linkend="compilation">Compilation and Installation</link> for that.</para>
+<para>You also can compile &i18n-rekonq; yourself see <link 
linkend="compilation">Compilation and Installation</link> for that.</para>
 </sect1>
 
 <sect1 id="requirements">
 <title>Requirements</title>
 
-<para>In order to successfully use &rekonq;, you need at least &Qt; 4.8.x and 
&kde; 4.7.x.</para>
+<para>In order to successfully use &i18n-rekonq;, you need at least &Qt; 4.8.x 
and &kde; 4.8.4.</para>
 </sect1>
 
 <sect1 id="compilation">
 <title>Compilation and Installation</title>
-<para>If you wish to compile &rekonq;, you have to install the headers of 
kdelibs and you need git and the build essentials installed.</para>
+<para>If you wish to compile &i18n-rekonq;, you have to install the headers of 
kdelibs and you need git and the build essentials installed.</para>
 
 <para>Under Debian/&ubuntu; you get those through running</para>
 
@@ -980,7 +879,7 @@ List of the UserBase contributors can be found on
 </para>
 
 <para>
-We will be using git, as the most recent code is available on the git 
repository. The &kde; Projects web page for &rekonq; can be found <ulink 
url="https://projects.kde.org/projects/extragear/network/rekonq";>here</ulink>. 
Stable releases, can also be downloaded <ulink 
url="http://sourceforge.net/projects/rekonq/files/";>here</ulink> in form of 
tarballs.
+We will be using git, as the most recent code is available on the git 
repository. The &kde; Projects web page for &i18n-rekonq; can be found <ulink 
url="https://projects.kde.org/projects/extragear/network/rekonq";>here</ulink>. 
Stable releases, can also be downloaded <ulink 
url="http://sourceforge.net/projects/rekonq/files/";>here</ulink> in form of 
tarballs.
 </para>
 
 <para>
diff --git a/doc/privacy.png b/doc/privacy.png
index c69729c..2a9f7d1 100644
Binary files a/doc/privacy.png and b/doc/privacy.png differ
diff --git a/doc/shortcuts.png b/doc/shortcuts.png
index 1cd7e79..8ff0957 100644
Binary files a/doc/shortcuts.png and b/doc/shortcuts.png differ
diff --git a/doc/webshortcuts.png b/doc/webshortcuts.png
index 7e5bcf0..98cc742 100644
Binary files a/doc/webshortcuts.png and b/doc/webshortcuts.png differ

Reply via email to