Jan 19 2006 Reinout van Schouwen <reinout@cs.vu.nl>

* Jan 19 2006  Reinout van Schouwen <reinout@cs.vu.nl>

	* help/C/epiphany.xml: update section on zoom factor
	* po/nl.po: update Dutch translation

4 files changed, 2898 insertions, 2686 deletions

diff --git a/help/C/epiphany.xml b/help/C/epiphany.xml
index b13ccf1cf..df8726ef4 100644
--- a/help/C/epiphany.xml
+++ b/help/C/epiphany.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
   <!ENTITY legal SYSTEM "legal.xml">
-  <!ENTITY appversion "1.6">
-  <!ENTITY manrevision "1.6">
-  <!ENTITY date "January 2005">
+  <!ENTITY appversion "1.9">
+  <!ENTITY manrevision "1.7">
+  <!ENTITY date "January 2006">
   <!ENTITY fr "<application>Epiphany</application>">
   <!ENTITY plainfr "Epiphany">
   <!-- Information about the entities
-       The legal.xml file contains legal information, there is no need to edit the file. 
-       Use the appversion entity to specify the version of the application.
-       Use the manrevision entity to specify the revision number of this manual.
-       Use the date entity to specify the release date of this manual.
-       Use the fr entity to specify the name of the application. -->
+	   The legal.xml file contains legal information, there is no need to edit the file. 
+	   Use the appversion entity to specify the version of the application.
+	   Use the manrevision entity to specify the revision number of this manual.
+	   Use the date entity to specify the release date of this manual.
+	   Use the fr entity to specify the name of the application. -->
 ]>
 <!-- 
-      (Do not remove this comment block.)
+	  (Do not remove this comment block.)
   Maintained by the GNOME Documentation Project
   http://developer.GNOME.org/projects/gdp
   Template version: 2.0 beta
@@ -26,20 +26,24 @@
 <!-- please do not change the id; for translations, change lang to -->
 <!-- appropriate code -->
   <articleinfo> 
-    <title>Epiphany Manual &manrevision;</title>       
+	<title>Epiphany Web Browser Manual</title>       
 
-    <copyright>
-      <year>2003</year>
-      <holder>Patanjali Somayaji</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>David Bordoley</holder>
-    </copyright>
-    <copyright>
-      <year>2005</year>
-      <holder>Piers Cornwell</holder>
-    </copyright>
+	<copyright>
+	  <year>2003</year>
+	  <holder>Patanjali Somayaji</holder>
+	</copyright>
+	<copyright>
+	  <year>2003</year>
+	  <holder>David Bordoley</holder>
+	</copyright>
+	<copyright>
+	  <year>2005</year>
+	  <holder>Piers Cornwell</holder>
+	</copyright>
+	<copyright>
+	  <year>2006</year>
+	  <holder>Reinout van Schouwen</holder>
+	</copyright>
 
 <!-- translators: uncomment this:
 
@@ -50,2518 +54,2553 @@
 
    -->
 <!-- An address can be added to the publisher information.  If a role is 
-     not specified, the publisher/author is the same for all versions of the 
-     document.  -->
-    <publisher> 
-      <publishername>GNOME Documentation Project</publishername> 
-    </publisher> 
+	 not specified, the publisher/author is the same for all versions of the 
+	 document.  -->
+	<publisher> 
+	  <publishername>GNOME Documentation Project</publishername> 
+	</publisher> 
 
    &legal; <!-- This file contains link to license for the
    documentation (GNU FDL), and other legal stuff such as "NO
    WARRANTY" statement. Please do not change any of this. -->
 
-    <authorgroup> 
-      <author> 
+	<authorgroup> 
+	  <author> 
 	<firstname>Patanjali</firstname> 
 	<surname>Somayaji</surname> 
 	<affiliation> 
 	  <orgname>GNOME Documentation Project</orgname> 
 	  <address><email>patanjali@codito.com</email></address> 
 	</affiliation> 
-      </author> 
-      <author> 
+	  </author> 
+	  <author> 
 	<firstname>David</firstname> 
 	<surname>Bordoley</surname> 
 	<affiliation> 
 	  <orgname>Epiphany Development Team</orgname> 
 	  <address><email>bordoley@msu.edu</email></address> 
 	</affiliation> 
-      </author> 
-      <author> 
+	  </author> 
+	  <author> 
 	<firstname>Piers</firstname> 
 	<surname>Cornwell</surname> 
 	<affiliation> 
 	  <orgname>Epiphany Development Team</orgname> 
 	  <address><email>piers@gnome.org</email></address> 
 	</affiliation> 
-      </author>
-    </authorgroup>
+	  </author>
+			<author> 
+	<firstname>Reinout</firstname> 
+	<surname>van Schouwen</surname> 
+	<affiliation> 
+	  <orgname>Epiphany Development Team</orgname> 
+	  <address><email>reinouts@gnome.org</email></address> 
+	</affiliation> 
+	  </author>
+
+	</authorgroup>
 
 
-    <releaseinfo>
-      This manual describes version &appversion; of &plainfr;.
-    </releaseinfo>
+	<releaseinfo>
+	  This manual describes version &appversion; of &plainfr;.
+	</releaseinfo>
   </articleinfo>
 
   <indexterm zone="index"> 
-    <primary>Epiphany</primary> 
+	<primary>Epiphany</primary> 
   </indexterm> 
   <indexterm zone="index"> 
-    <primary>epiphany</primary> 
+	<primary>epiphany</primary> 
   </indexterm>
   <indexterm zone="index"> 
-    <primary>Browser</primary> 
+	<primary>Browser</primary> 
   </indexterm>
 
 <!-- ============= Document Body ================================== -->
 <!-- ============= Introduction =================================== -->
 <!-- Use the Introduction section to give a brief overview of what
-     the application is and what it does. -->
+	 the application is and what it does. -->
   <sect1 id="fr-introduction"> 
-    <title>Introduction</title> 
-    <para>
-      &fr; is the GNOME web browser. &fr; aims to be simple to use 
-      and standards compliant.
+	<title>Introduction</title> 
+	<para>
+	  &fr; is the GNOME web browser. &fr; aims to be simple to use 
+	  and standards compliant.
    </para>
   </sect1>
 
 <!-- ============= Getting Started ================================ -->
   <sect1 id="ephy-getting-started">
-    <title>Getting Started</title>
+	<title>Getting Started</title>
 
-      <sect2 id="ephy-to-open-browser-window">
-        <title>To Open a Browser Window</title>
-        <para>
-          You can open a browser window in the following ways:
-        </para>
-        <variablelist>
-          <varlistentry>
-            <term><guimenu>Applications</guimenu> menu</term>
-            <listitem>
-              <para>
-                Choose <menuchoice> <guisubmenu>Internet</guisubmenu>
-                <guimenuitem>Web Browser</guimenuitem> </menuchoice>.
-              </para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>Command line</term>
-            <listitem>
-              <para>
-                Type <command>epiphany</command>, then press 
-                <keycap>Return</keycap>.
-              </para>
-            </listitem>
-          </varlistentry>
-        </variablelist>
-      </sect2>
-      <sect2 id="ephy-to-open-bookmarks">
-        <title>To Open the Bookmarks Window</title>
-        <para>
-          You can open the bookmarks window in the following ways:
-        </para>
-        <variablelist>
-          <varlistentry>
-            <term>
-              <guimenu>Applications</guimenu> menu
-            </term>
-            <listitem>
-   	      <para>
-                Choose <menuchoice> <guisubmenu>Internet</guisubmenu>
-                <guimenuitem>Web Bookmarks</guimenuitem> </menuchoice>. 
-              </para>
-            </listitem>
-          </varlistentry>
+	  <sect2 id="ephy-to-open-browser-window">
+		<title>To Open a Browser Window</title>
+		<para>
+		  You can open a browser window in the following ways:
+		</para>
+		<variablelist>
+		  <varlistentry>
+			<term><guimenu>Applications</guimenu> menu</term>
+			<listitem>
+			  <para>
+				Choose <menuchoice> <guisubmenu>Internet</guisubmenu>
+				<guimenuitem>Web Browser</guimenuitem> </menuchoice>.
+			  </para>
+			</listitem>
+		  </varlistentry>
+		  <varlistentry>
+			<term>Command line</term>
+			<listitem>
+			  <para>
+				Type <command>epiphany</command>, then press 
+				<keycap>Return</keycap>.
+			  </para>
+			</listitem>
+		  </varlistentry>
+		</variablelist>
+	  </sect2>
+	  <sect2 id="ephy-to-open-bookmarks">
+		<title>To Open the Bookmarks Window</title>
+		<para>
+		  You can open the bookmarks window in the following ways:
+		</para>
+		<variablelist>
+		  <varlistentry>
+			<term>
+			  <guimenu>Applications</guimenu> menu
+			</term>
+			<listitem>
+		  <para>
+				Choose <menuchoice> <guisubmenu>Internet</guisubmenu>
+				<guimenuitem>Web Bookmarks</guimenuitem> </menuchoice>. 
+			  </para>
+			</listitem>
+		  </varlistentry>
 	
-          <varlistentry>
-            <term>
-              Command line
-            </term>
-            <listitem>
-              <para>
-               Type <command>epiphany -b</command>, then press <keycap>Return</keycap>.
-              </para>
-            </listitem>
-          </varlistentry>
+		  <varlistentry>
+			<term>
+			  Command line
+			</term>
+			<listitem>
+			  <para>
+			   Type <command>epiphany -b</command>, then press <keycap>Return</keycap>.
+			  </para>
+			</listitem>
+		  </varlistentry>
 
-          <varlistentry>
-            <term>
-              From the <guimenu>Bookmarks</guimenu> menu
-            </term>
-            <listitem>
-              <para>
-                Choose <menuchoice> <guimenu>Bookmarks</guimenu>
-                <guimenuitem>Edit Bookmarks</guimenuitem>
-                </menuchoice> from the &fr; main window. 
-              </para>
-            </listitem>
-          </varlistentry>
+		  <varlistentry>
+			<term>
+			  From the <guimenu>Bookmarks</guimenu> menu
+			</term>
+			<listitem>
+			  <para>
+				Choose <menuchoice> <guimenu>Bookmarks</guimenu>
+				<guimenuitem>Edit Bookmarks</guimenuitem>
+				</menuchoice> from the &fr; main window. 
+			  </para>
+			</listitem>
+		  </varlistentry>
 
-          <varlistentry>
-            <term>
-              From the &fr; toolbar
-            </term>
-            <listitem>
-              <para>
-                Click on the Bookmarks button in the toolbar of the
-                main window. 
-              </para>
-            </listitem>
-          </varlistentry>
-        </variablelist>
-      </sect2>
+		  <varlistentry>
+			<term>
+			  From the &fr; toolbar
+			</term>
+			<listitem>
+			  <para>
+				Click on the Bookmarks button in the toolbar of the
+				main window. 
+			  </para>
+			</listitem>
+		  </varlistentry>
+		</variablelist>
+	  </sect2>
   </sect1>
 
 <!-- ============= Browser Windows ================================ -->
   <sect1 id="ephy-browser-windows">
-    <title>Browser Windows</title>
-    <para>
-      Browser windows enable you to browse between web pages. 
-      <xref linkend="ephy-screenshot"/> shows a browser window displaying the 
-      home page.
-    </para>
-    <figure id="ephy-screenshot">
-      <title>Browser window displaying the home page</title>
-      <screenshot>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/ephy-screenshot.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>A page being displayed in a browser window. Callouts: Menubar, toolbar, address entry, bookmarks bar, view pane</phrase>
-          </textobject>
-        </mediaobject>
-      </screenshot>
-    </figure>
-    <para>
-      <xref linkend="epiphany-TBL-1"/> describes the components of a browser window.
-    </para>
-    <table frame="topbot" id="epiphany-TBL-1">
-      <title>Browser Window Components</title>
-      <tgroup cols="2" colsep="0" rowsep="0">
-        <colspec colname="colspec0" colwidth="29.39*"/>
-        <colspec colname="colspec1" colwidth="70.61*"/>
-        <thead>
-          <row rowsep="1">
-            <entry valign="top">
-              <para>
-                Component
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Description
-              </para>
-            </entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry valign="top">
-              <para>
-                Menubar
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Contains menus that you use to perform tasks in a browser window.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
-                Toolbar
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Contains buttons that you use to perform tasks in a browser window.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                Address entry
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>
-                Drop-down combination box that you use to enter web addresses or 
-                search terms.
-              </para>
-            </entry>
-          </row>
+	<title>Browser Windows</title>
+	<para>
+	  Browser windows enable you to browse between web pages. 
+	  <xref linkend="ephy-screenshot"/> shows a browser window displaying the 
+	  home page.
+	</para>
+	<figure id="ephy-screenshot">
+	  <title>Browser window displaying the home page</title>
+	  <screenshot>
+		<mediaobject>
+		  <imageobject>
+			<imagedata fileref="figures/ephy-screenshot.png" format="PNG"/>
+		  </imageobject>
+		  <textobject>
+			<phrase>A page being displayed in a browser window. Callouts: Menubar, toolbar, address entry, bookmarks bar, view pane</phrase>
+		  </textobject>
+		</mediaobject>
+	  </screenshot>
+	</figure>
+	<para>
+	  <xref linkend="epiphany-TBL-1"/> describes the components of a browser window.
+	</para>
+	<table frame="topbot" id="epiphany-TBL-1">
+	  <title>Browser Window Components</title>
+	  <tgroup cols="2" colsep="0" rowsep="0">
+		<colspec colname="colspec0" colwidth="29.39*"/>
+		<colspec colname="colspec1" colwidth="70.61*"/>
+		<thead>
+		  <row rowsep="1">
+			<entry valign="top">
+			  <para>
+				Component
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Description
+			  </para>
+			</entry>
+		  </row>
+		</thead>
+		<tbody>
+		  <row>
+			<entry valign="top">
+			  <para>
+				Menubar
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Contains menus that you use to perform tasks in a browser window.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry valign="top">
+			  <para>
+				Toolbar
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Contains buttons that you use to perform tasks in a browser window.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry colname="colspec0" valign="top">
+			  <para>
+				Address entry
+			  </para>
+			</entry>
+			<entry colname="colspec1" valign="top">
+			  <para>
+				Drop-down combination box that you use to enter web addresses or 
+				search terms.
+			  </para>
+			</entry>
+		  </row>
 	  <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                Bookmarks bar
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>
-                Contains menus, buttons and text fields that you use for highspeed 
-                access to bookmarks and web searches.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
-                View pane
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Displays the contents of the viewed page.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                Statusbar
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>
-                Displays status information.
-              </para>
-            </entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <para>
-      You can also open a popup menu from browser windows. To open 
-      this popup menu right-click in a browser window. The items in 
-      this menu depend on where you right-click. For example, when 
-      you right-click on a link, you can choose items related to the 
-      link. When you right-click on the web page itself, you can 
-      choose items related to the display of the web page.
-    </para>
+			<entry colname="colspec0" valign="top">
+			  <para>
+				Bookmarks bar
+			  </para>
+			</entry>
+			<entry colname="colspec1" valign="top">
+			  <para>
+				Contains menus, buttons and text fields that you use for highspeed 
+				access to bookmarks and web searches.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry valign="top">
+			  <para>
+				View pane
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Displays the contents of the viewed page.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry colname="colspec0" valign="top">
+			  <para>
+				Statusbar
+			  </para>
+			</entry>
+			<entry colname="colspec1" valign="top">
+			  <para>
+				Displays status information.
+			  </para>
+			</entry>
+		  </row>
+		</tbody>
+	  </tgroup>
+	</table>
+	<para>
+	  You can also open a popup menu from browser windows. To open 
+	  this popup menu right-click in a browser window. The items in 
+	  this menu depend on where you right-click. For example, when 
+	  you right-click on a link, you can choose items related to the 
+	  link. When you right-click on the web page itself, you can 
+	  choose items related to the display of the web page.
+	</para>
   </sect1>
 
 <!-- ============= Browsing the Web =============================== -->
   <sect1 id="ephy-browsing-web">
-      <title>Browsing the Web</title>
-      <para>
-      </para>
-        <sect2 id="using-address-entry">
-          <title>Using the Address Entry</title>
-          <para>
-            The address entry is used to enter web addresses or search
-            terms. Any words entered in the address entry are searched
-            for in the Bookmarks database and the History database. If
-            there are any matches, these are shown in a drop down list
-            and can be selected by you. The selected web page will be
-            loaded in the browser window or tab. 
-          </para>
-          <para>
-            You can type in a bookmark topic or a term that is
-            part of the address or title of any page stored in your
-            bookmarks. These
-            terms are searched in the bookmark database for
-            matches. For more information, see <xref
-            linkend="overview-of-bookmarks"/>.
-          </para>
-        </sect2>
+	  <title>Browsing the Web</title>
+	  <para>
+	  </para>
+		<sect2 id="using-address-entry">
+		  <title>Using the Address Entry</title>
+		  <para>
+			The address entry is used to enter web addresses or search
+			terms. Any words entered in the address entry are searched
+			for in the Bookmarks database and the History database. If
+			there are any matches, these are shown in a drop down list
+			and can be selected by you. The selected web page will be
+			loaded in the browser window or tab. 
+		  </para>
+		  <para>
+			You can type in a bookmark topic or a term that is
+			part of the address or title of any page stored in your
+			bookmarks. These
+			terms are searched in the bookmark database for
+			matches. For more information, see <xref
+			linkend="overview-of-bookmarks"/>.
+		  </para>
+		</sect2>
 	<sect2 id="using-toolbar">
-          <title>Using the Toolbar</title>
-          <para>
-            The toolbar contains a number of shortcuts to commonly 
-            used functions. You can use the toolbar to navigate 
-            through your web history by clicking the back and 
-            forward buttons. In addition it is possible to stop the 
-            loading of pages by clicking the stop button. Finally 
-            pages may be reloaded by clicking the reload button.
-          </para>
-          <para>
-            You can customize the buttons which appear on your 
-            toolbar by using the Toolbar Editor: for details, see 
-            <xref linkend="to-edit-toolbars"/>.
-          </para>
-        </sect2>
+		  <title>Using the Toolbar</title>
+		  <para>
+			The toolbar contains a number of shortcuts to commonly 
+			used functions. You can use the toolbar to navigate 
+			through your web history by clicking the back and 
+			forward buttons. In addition it is possible to stop the 
+			loading of pages by clicking the stop button. Finally 
+			pages may be reloaded by clicking the reload button.
+		  </para>
+		  <para>
+			You can customize the buttons which appear on your 
+			toolbar by using the Toolbar Editor: for details, see 
+			<xref linkend="to-edit-toolbars"/>.
+		  </para>
+		</sect2>
 	<sect2 id="using-bookmarks-bar">
-          <title>Using the Bookmarks Bar</title>
-          <para>
-            The Bookmarks Bar allows you to have links to your favorite 
-            websites on a toolbar for easy access. For details on 
-            adding bookmarks to the bookmarks bar, see <xref 
-            linkend="to-add-bookmark-or-topic-to-bookmarks-bar"/>.
-          </para>
-        </sect2>
+		  <title>Using the Bookmarks Bar</title>
+		  <para>
+			The Bookmarks Bar allows you to have links to your favorite 
+			websites on a toolbar for easy access. For details on 
+			adding bookmarks to the bookmarks bar, see <xref 
+			linkend="to-add-bookmark-or-topic-to-bookmarks-bar"/>.
+		  </para>
+		</sect2>
 	<sect2 id="using-fullscreen-mode">
-          <title>Using Fullscreen Mode</title>
-          <para>
-            Fullscreen mode allows the browser to use the whole screen 
-            for its viewable area. To enter Fullscreen mode, select 
-            <menuchoice> <guimenu>View</guimenu> <guimenuitem>Fullscreen
-            </guimenuitem> </menuchoice>.
-          </para>

-          <para>

-            When in Fullscreen mode, only a minimal toolbar is shown. You

-            can toggle its visibility by right-clicking on a blank area

-            of the page and choosing <menuchoice> <guimenuitem>New 

-            Toolbar</guimenuitem> </menuchoice> or by pressing 

-            <keycap>Ctrl-Shift-T</keycap>.

-          </para>
-          <para>
-            You can exit Fullscreen mode by clicking <guibutton>Leave 
-            Fullscreen</guibutton>.
-          </para>
-        </sect2>
+		  <title>Using Fullscreen Mode</title>
+		  <para>
+			Fullscreen mode allows the browser to use the whole screen 
+			for its viewable area. To enter Fullscreen mode, select 
+			<menuchoice> <guimenu>View</guimenu> <guimenuitem>Fullscreen
+			</guimenuitem> </menuchoice>.
+		  </para>
+		  <para>
+			When in Fullscreen mode, only a minimal toolbar is shown. You
+			can toggle its visibility by right-clicking on a blank area
+			of the page and choosing <menuchoice> <guimenuitem>New 
+			Toolbar</guimenuitem> </menuchoice> or by pressing 
+			<keycap>Ctrl-Shift-T</keycap>.
+		  </para>
+		  <para>
+			You can exit Fullscreen mode by clicking <guibutton>Leave 
+			Fullscreen</guibutton>.
+		  </para>
+		</sect2>
 	<sect2 id="to-open-new-window">
-          <title>To Open a New Window</title>
-          <para>
-            To open a new window, choose <menuchoice> <guimenu>
-            File</guimenu> <guimenuitem>New Window</guimenuitem>
-	    </menuchoice>.
+		  <title>To Open a New Window</title>
+		  <para>
+			To open a new window, choose <menuchoice> <guimenu>
+			File</guimenu> <guimenuitem>New Window</guimenuitem>
+		</menuchoice>.
 	  </para>
-        </sect2>
+		</sect2>
 	<sect2 id="to-open-new-tab">
-          <title>To Open a New Tab</title>
-          <para>
-            To open a new tab, choose <menuchoice> <guimenu>
-            File</guimenu> <guimenuitem>New Tab</guimenuitem>
-            </menuchoice>. The new tab will be placed to the right of 
-            any existing tabs.
+		  <title>To Open a New Tab</title>
+		  <para>
+			To open a new tab, choose <menuchoice> <guimenu>
+			File</guimenu> <guimenuitem>New Tab</guimenuitem>
+			</menuchoice>. The new tab will be placed to the right of 
+			any existing tabs.
 	  </para>
 	</sect2>
 	<sect2 id="ephy-to-open-file">
-          <title>To Open a File</title>
-          <para>
-            To open a file, choose <menuchoice> <guimenu>File
-            </guimenu> <guimenuitem>Open...</guimenuitem>
-            </menuchoice> to display the <guilabel>Open File</guilabel> 
-            dialog. Select the file that you want to open, then click 
-            <guibutton>OK</guibutton>. The file is displayed in the 
-            browser window.
-          </para>
-        </sect2>
+		  <title>To Open a File</title>
+		  <para>
+			To open a file, choose <menuchoice> <guimenu>File
+			</guimenu> <guimenuitem>Open...</guimenuitem>
+			</menuchoice> to display the <guilabel>Open File</guilabel> 
+			dialog. Select the file that you want to open, then click 
+			<guibutton>OK</guibutton>. The file is displayed in the 
+			browser window.
+		  </para>
+		</sect2>
 	<sect2 id="to-save-page-to-file">
-          <title>To Save a Page to a File</title>
-          <para>
-             To save a page to a file, choose <menuchoice> <guimenu>
-             File</guimenu> <guimenuitem>Save As</guimenuitem> 
-             </menuchoice>. Enter a name for the file in the <guilabel>
-             Save As</guilabel> dialog box, then click <guibutton>OK
-             </guibutton>.
-          </para>
-        </sect2>
-        <sect2 id="using-print-setup">
-          <title>Using Print Setup</title>
-          <para>
-            Print setup allows you to configure how web pages are printed.
-          </para>
-          <variablelist>
-            <varlistentry>
-              <term>Margins</term>
-              <listitem>
-                <para>
-                  The distance from the edge of the page to the content.
-                </para>
-              </listitem>
-            </varlistentry>
-            <varlistentry>
-              <term>Colors</term>
-              <listitem>
-                <para>
-                  Print in grayscale or color.
-                </para>
-              </listitem>
-            </varlistentry>
-            <varlistentry>
-              <term>Footers</term>
-              <listitem>
-                <para>
-                  Choose whether to display page numbers and current date
-                  at the bottom of every page.
-                </para>
-              </listitem>
-            </varlistentry>
-            <varlistentry>
-              <term>Headers</term>
-              <listitem>
-                <para>
-                  Choose whether to display the web page title and address
-                  at the top of every page.
-                </para>
-              </listitem>
-            </varlistentry>
-            <varlistentry>
-              <term>Size</term>
-              <listitem>
-                <para>
-                  The paper size.
-                </para>
-              </listitem>
-            </varlistentry>
-            <varlistentry>
-              <term>Orientation</term>
-              <listitem>
-                <para>
-                  Defines whether the top of the page is the short (portrait) or 
-                  long (landscape) edge of the paper.
-                </para>
-              </listitem>
-            </varlistentry>
-          </variablelist>
-        </sect2>
-        <sect2 id="using-print-preview">
-          <title>Using Print Preview</title>
-          <para>
-            With print preview, you can see how a page will look once it has been 
-            printed. To print preview the current page, choose <menuchoice> 
-            <guimenu>File</guimenu> <guimenuitem>Print Preview</guimenuitem> 
-            </menuchoice>. 
-          </para>
-        </sect2>
+		  <title>To Save a Page to a File</title>
+		  <para>
+			 To save a page to a file, choose <menuchoice> <guimenu>
+			 File</guimenu> <guimenuitem>Save As</guimenuitem> 
+			 </menuchoice>. Enter a name for the file in the <guilabel>
+			 Save As</guilabel> dialog box, then click <guibutton>OK
+			 </guibutton>.
+		  </para>
+		</sect2>
+		<sect2 id="using-print-setup">
+		  <title>Using Print Setup</title>
+		  <para>
+			Print setup allows you to configure how web pages are printed.
+		  </para>
+		  <variablelist>
+			<varlistentry>
+			  <term>Margins</term>
+			  <listitem>
+				<para>
+				  The distance from the edge of the page to the content.
+				</para>
+			  </listitem>
+			</varlistentry>
+			<varlistentry>
+			  <term>Colors</term>
+			  <listitem>
+				<para>
+				  Print in grayscale or color.
+				</para>
+			  </listitem>
+			</varlistentry>
+			<varlistentry>
+			  <term>Footers</term>
+			  <listitem>
+				<para>
+				  Choose whether to display page numbers and current date
+				  at the bottom of every page.
+				</para>
+			  </listitem>
+			</varlistentry>
+			<varlistentry>
+			  <term>Headers</term>
+			  <listitem>
+				<para>
+				  Choose whether to display the web page title and address
+				  at the top of every page.
+				</para>
+			  </listitem>
+			</varlistentry>
+			<varlistentry>
+			  <term>Size</term>
+			  <listitem>
+				<para>
+				  The paper size.
+				</para>
+			  </listitem>
+			</varlistentry>
+			<varlistentry>
+			  <term>Orientation</term>
+			  <listitem>
+				<para>
+				  Defines whether the top of the page is the short (portrait) or 
+				  long (landscape) edge of the paper.
+				</para>
+			  </listitem>
+			</varlistentry>
+		  </variablelist>
+		</sect2>
+		<sect2 id="using-print-preview">
+		  <title>Using Print Preview</title>
+		  <para>
+			With print preview, you can see how a page will look once it has been 
+			printed. To print preview the current page, choose <menuchoice> 
+			<guimenu>File</guimenu> <guimenuitem>Print Preview</guimenuitem> 
+			</menuchoice>. 
+		  </para>
+		</sect2>
 	<sect2 id="to-print-page">
-          <title>To Print a Page</title>
-          <para>
-            To print a page, choose <menuchoice> <guimenu>File</guimenu>
-            <guimenuitem>Print</guimenuitem> </menuchoice>. Enter the 
-            name of the printer in the <guilabel>Printer</guilabel> 
-            field or enter a name in the <guilabel>File</guilabel> field 
-            to print to a file.
-          </para>
-          <para>
-            In the <guilabel>Page Range</guilabel> section, choose <guilabel>
-            All Pages</guilabel> to print the entire web page, <guilabel>Selection
-            </guilabel> to print the currently selected part of the web page only or
-            <guilabel>Pages</guilabel> to print the range of pages that you specify.
-          </para>
-        </sect2>
+		  <title>To Print a Page</title>
+		  <para>
+			To print a page, choose <menuchoice> <guimenu>File</guimenu>
+			<guimenuitem>Print</guimenuitem> </menuchoice>. Enter the 
+			name of the printer in the <guilabel>Printer</guilabel> 
+			field or enter a name in the <guilabel>File</guilabel> field 
+			to print to a file.
+		  </para>
+		  <para>
+			In the <guilabel>Page Range</guilabel> section, choose <guilabel>
+			All Pages</guilabel> to print the entire web page, <guilabel>Selection
+			</guilabel> to print the currently selected part of the web page only or
+			<guilabel>Pages</guilabel> to print the range of pages that you specify.
+		  </para>
+		</sect2>
 	<sect2 id="to-find-text-in-page">
-          <title>To Find Text in a Page</title>
+		  <title>To Find Text in a Page</title>
 	  <para>
-            To search a page for a string, perform the following 
-            steps:</para>
-            <orderedlist> 
-              <listitem>
-                <para>
-                  Choose <menuchoice> <guimenu>Edit</guimenu> 
-                  <guimenuitem>Find</guimenuitem> </menuchoice> to 
-                  display the <guilabel>Find</guilabel> dialog.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  Type the string that you want to find, in the
-                  <guilabel>Find</guilabel> field.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  Select the <guilabel>Case sensitive</guilabel> 
-                  option to only find occurrences of the string that 
-                  match the case of the text that you type.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  Select the <guilabel>Wrap around</guilabel> option to 
-                  search to the end of the page and then continue the 
-                  search from the beginning of the page.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  Click <guibutton>Next</guibutton> to search the page
-                  for the first occurrence of the string. If the string 
-                  is found, the cursor is moved to the string, and the 
-                  string is selected.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  To find the next occurrence of the string, click
-                  <guibutton>Next</guibutton>.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  To find the previous occurrence of the string, click
-                  <guibutton>Previous</guibutton>.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  To finish the search, click <guibutton>Close
-                  </guibutton>.
-                </para>
-              </listitem>
-            </orderedlist>
-        </sect2>	
+			To search a page for a string, perform the following 
+			steps:</para>
+			<orderedlist> 
+			  <listitem>
+				<para>
+				  Choose <menuchoice> <guimenu>Edit</guimenu> 
+				  <guimenuitem>Find</guimenuitem> </menuchoice> to 
+				  display the <guilabel>Find</guilabel> dialog.
+				</para>
+			  </listitem>
+			  <listitem>
+				<para>
+				  Type the string that you want to find, in the
+				  <guilabel>Find</guilabel> field.
+				</para>
+			  </listitem>
+			  <listitem>
+				<para>
+				  Select the <guilabel>Case sensitive</guilabel> 
+				  option to only find occurrences of the string that 
+				  match the case of the text that you type.
+				</para>
+			  </listitem>
+			  <listitem>
+				<para>
+				  Select the <guilabel>Wrap around</guilabel> option to 
+				  search to the end of the page and then continue the 
+				  search from the beginning of the page.
+				</para>
+			  </listitem>
+			  <listitem>
+				<para>
+				  Click <guibutton>Next</guibutton> to search the page
+				  for the first occurrence of the string. If the string 
+				  is found, the cursor is moved to the string, and the 
+				  string is selected.
+				</para>
+			  </listitem>
+			  <listitem>
+				<para>
+				  To find the next occurrence of the string, click
+				  <guibutton>Next</guibutton>.
+				</para>
+			  </listitem>
+			  <listitem>
+				<para>
+				  To find the previous occurrence of the string, click
+				  <guibutton>Previous</guibutton>.
+				</para>
+			  </listitem>
+			  <listitem>
+				<para>
+				  To finish the search, click <guibutton>Close
+				  </guibutton>.
+				</para>
+			  </listitem>
+			</orderedlist>
+		</sect2>	
 	<sect2 id="to-change-zoom">
-	  <title>To Change the Zoom Factor</title>

+	  <title>To Change the Zoom Factor</title>
 	  <para>
-            You can use the following methods to resize the view of a page
-          </para>

-	  <itemizedlist>
-            <listitem>
-              <para>To enlarge the view of a page, choose <menuchoice>

-                <guimenu>View</guimenu><guimenuitem>Zoom In</guimenuitem>

-                </menuchoice>.
-              </para>

-            </listitem>
-            <listitem>
-              <para>
-                To shrink the view of a page, choose <menuchoice>

-                <guimenu>View</guimenu><guimenuitem>Zoom Out</guimenuitem>

-                </menuchoice>.
-              </para>

-            </listitem>

-            <listitem>
-              <para>
-                To view the page at its actual size, choose <menuchoice>

-                <guimenu>View</guimenu><guimenuitem>Normal Size</guimenuitem>

-                </menuchoice>.
-              </para>

-            </listitem>

-          </itemizedlist>
-        </sect2>
+			You can use the following methods to enlarge or shrink the text in a
+			web page:
+		  </para>
+		  <variablelist>
+			<varlistentry>
+			<term>
+			  To enlarge the text in a web page
+			</term>			
+			<listitem>
+			 <para>
+			  Click on the Larger button in the toolbar of the main window.
+			 </para>
+			</listitem>
+			</varlistentry>
+			<varlistentry>
+			 <term>
+			 To shrink the text in a web page
+			 </term>
+			<listitem>
+			 <para>
+			  Click on the Smaller button in the toolbar of the main window.
+			 </para>
+			</listitem>
+			</varlistentry>
+		  </variablelist>
+		  <para>
+		  Alternatively, you may use the menu:
+		  </para>
+		  <itemizedlist>
+			<listitem>
+			  <para>To enlarge the view of a page, choose <menuchoice>
+				<guimenu>View</guimenu><guimenuitem>Zoom In</guimenuitem>
+				</menuchoice>.
+			  </para>
+			</listitem>
+			<listitem>
+			  <para>
+				To shrink the view of a page, choose <menuchoice>
+				<guimenu>View</guimenu><guimenuitem>Zoom Out</guimenuitem>
+				</menuchoice>.
+			  </para>
+			</listitem>
+			<listitem>
+			  <para>
+				To view the page at its normal size, choose <menuchoice>
+				<guimenu>View</guimenu><guimenuitem>Normal Size</guimenuitem>
+				</menuchoice>.
+			  </para>
+			</listitem>
+		  </itemizedlist>
+		</sect2>
 	<sect2 id="to-view-page-source">
-          <title>To View the Source of a Page</title>
-          <para>
-            To view the source code of a page, choose <menuchoice> 
-            <guimenu>View</guimenu> <guimenuitem>Page Source</guimenuitem> 
-            </menuchoice>. The source will be displayed in your default 
-            text editor.
-          </para>
-        </sect2>
-        <sect2 id="to-view-popup-windows">
-          <title>To View the Page's Popup Windows</title>
-          <para>
-            Some web pages automatically open new browser windows when viewed.
-            These are known as popup windows. To show or hide a page's popup
-            windows, choose <menuchoice><guimenu>View</guimenu>
-            <guimenuitem>Popup Windows</guimenuitem></menuchoice>. When the 

-            popups for the page are hidden, the blocked popup icon will show

-            in the statusbar. The tooltip for this icons shows how many popup

-            windows have been blocked.
-          </para>
-          <para>
-            To set a default popup window behavior for all web pages, see
-            <xref linkend="privacy-preferences"/>.
-          </para>
-        </sect2>
+		  <title>To View the Source of a Page</title>
+		  <para>
+			To view the source code of a page, choose <menuchoice> 
+			<guimenu>View</guimenu> <guimenuitem>Page Source</guimenuitem> 
+			</menuchoice>. The source will be displayed in your default 
+			text editor.
+		  </para>
+		</sect2>
+		<sect2 id="to-view-popup-windows">
+		  <title>To View the Page's Popup Windows</title>
+		  <para>
+			Some web pages automatically open new browser windows when viewed.
+			These are known as popup windows. To show or hide a page's popup
+			windows, choose <menuchoice><guimenu>View</guimenu>
+			<guimenuitem>Popup Windows</guimenuitem></menuchoice>. When the 
+			popups for the page are hidden, the blocked popup icon will show
+			in the statusbar. The tooltip for this icons shows how many popup
+			windows have been blocked.
+		  </para>
+		  <para>
+			To set a default popup window behavior for all web pages, see
+			<xref linkend="privacy-preferences"/>.
+		  </para>
+		</sect2>
 	<sect2 id="to-open-link">
-          <title>To Open Links</title>
-          <para>
-            Web pages contain links to other web pages, often (but not always)
-            indicated by an underline. To follow a link, left click it.
-          </para>
-          <variablelist>
-            <varlistentry>
-              <term>To open a link as the page specifies</term>
-              <listitem>
-                <para>
-                  Left-click a link. The link may open in the current window or 
-                  a new window according to what the page author specified.
-                </para>
-              </listitem>
-            </varlistentry>
-            <varlistentry>
-              <term>To open a link in a new tab</term>
-              <listitem>
-                <para>
-                  Right click it and select <guimenuitem>Open Link in New 
-                  Tab</guimenuitem>, click with the middle mouse button.
-                </para>
-              </listitem>
-            </varlistentry>
-            <varlistentry>
-              <term>To open a link in a new window</term>
-              <listitem>
-                <para>
-                  Right-click it and select <guimenuitem>Open Link in 
-                  New Window</guimenuitem>.
-                </para>
-              </listitem>
-            </varlistentry>
-          </variablelist>
-        </sect2>
+		  <title>To Open Links</title>
+		  <para>
+			Web pages contain links to other web pages, often (but not always)
+			indicated by an underline. To follow a link, left click it.
+		  </para>
+		  <variablelist>
+			<varlistentry>
+			  <term>To open a link as the page specifies</term>
+			  <listitem>
+				<para>
+				  Left-click a link. The link may open in the current window or 
+				  a new window according to what the page author specified.
+				</para>
+			  </listitem>
+			</varlistentry>
+			<varlistentry>
+			  <term>To open a link in a new tab</term>
+			  <listitem>
+				<para>
+				  Right click it and select <guimenuitem>Open Link in New 
+				  Tab</guimenuitem>, click with the middle mouse button.
+				</para>
+			  </listitem>
+			</varlistentry>
+			<varlistentry>
+			  <term>To open a link in a new window</term>
+			  <listitem>
+				<para>
+				  Right-click it and select <guimenuitem>Open Link in 
+				  New Window</guimenuitem>.
+				</para>
+			  </listitem>
+			</varlistentry>
+		  </variablelist>
+		</sect2>
 	<sect2 id="to-download-link">
-          <title>To Download a Link</title>
-          <para>
-            To save the target of a link, right click it and select 
-            <guimenuitem>Download Link</guimenuitem>. The linked file or 
-            document will be saved to your download folder which you can 
-            set in <xref linkend="general-preferences"/>.
-          </para>
-        </sect2>
+		  <title>To Download a Link</title>
+		  <para>
+			To save the target of a link, right click it and select 
+			<guimenuitem>Download Link</guimenuitem>. The linked file or 
+			document will be saved to your download folder which you can 
+			set in <xref linkend="general-preferences"/>.
+		  </para>
+		</sect2>
 	<sect2 id="to-switch-between-tabs">
-          <title>To Switch in Between Tabs</title>
-          <para>
-            Click the header of a tab to switch to it.
-          </para>
-        </sect2>
+		  <title>To Switch in Between Tabs</title>
+		  <para>
+			Click the header of a tab to switch to it.
+		  </para>
+		</sect2>
 	<sect2 id="to-move-tabs">
-          <title>To Move Tabs</title>
-          <para>
-            To rearrange tabs in the current window, select <menuchoice>
-            <guimenu>Tabs</guimenu> <guimenuitem>Move Tab Left</guimenuitem>
-            </menuchoice> or <menuchoice> <guimenu>Tabs</guimenu> 
-            <guimenuitem>Move Tab Right</guimenuitem></menuchoice> to 
-            move the current tab. You can also drag tabs to reorder them.
-          </para>
-          <para>
-            To move the current tab to a new window choose <menuchoice> 
-            <guimenu>Tabs</guimenu> <guimenuitem>Detach Tab</guimenuitem>
-            </menuchoice>.
-          </para>

-           <tip>
-             <para>
-               You can also access these options by right-clicking the

-               tab header.
-             </para>
-           </tip>
-        </sect2>
+		  <title>To Move Tabs</title>
+		  <para>
+			To rearrange tabs in the current window, select <menuchoice>
+			<guimenu>Tabs</guimenu> <guimenuitem>Move Tab Left</guimenuitem>
+			</menuchoice> or <menuchoice> <guimenu>Tabs</guimenu> 
+			<guimenuitem>Move Tab Right</guimenuitem></menuchoice> to 
+			move the current tab. You can also drag tabs to reorder them.
+		  </para>
+		  <para>
+			To move the current tab to a new window choose <menuchoice> 
+			<guimenu>Tabs</guimenu> <guimenuitem>Detach Tab</guimenuitem>
+			</menuchoice>.
+		  </para>
+		   <tip>
+			 <para>
+			   You can also access these options by right-clicking the
+			   tab header.
+			 </para>
+		   </tip>
+		</sect2>
   </sect1>
 
 <!-- ============= Managing Your Bookmarks ======================== -->
   <sect1 id="ephy-managing-bookmarks">
-      <title>Managing Your Bookmarks</title>
-      <para>
-      </para>
+	  <title>Managing Your Bookmarks</title>
+	  <para>
+	  </para>
 	<sect2 id="overview-of-bookmarks">
-          <title>Overview of the Epiphany Bookmarks System</title>
-          <para>
-            The &fr; bookmark system is quite different from the
-            hierarchical file folder method used by most
-            browsers. This design is in keeping with two design
-            principles: 
-            <itemizedlist>
-              <listitem>
-                <para>
-                  Building a browser with the simplest interface possible.
-	        </para>
-              </listitem>
-              <listitem>
-                <para>
-                  Avoiding the need for the user to remember addresses of
-                  sites that the user wants to visit. 
+		  <title>Overview of the Epiphany Bookmarks System</title>
+		  <para>
+			The &fr; bookmark system is quite different from the
+			hierarchical file folder method used by most
+			browsers. This design is in keeping with two design
+			principles: 
+			<itemizedlist>
+			  <listitem>
+				<para>
+				  Building a browser with the simplest interface possible.
+			</para>
+			  </listitem>
+			  <listitem>
+				<para>
+				  Avoiding the need for the user to remember addresses of
+				  sites that the user wants to visit. 
 		</para>
-              </listitem>
-            </itemizedlist>
-          </para>
-          <para>
-            The hierarchical way of organising bookmarks does not work
-            well for most people. Instead of this approach, &fr;
-            follows a database like approach. An address related to a
-            bookmark is stored with some metadata associated with
-            it. This metadata is then used to retrieve a bookmark
-            later. Future versions of &fr; will provide useful ways of
-            searching for and retrieving bookmarks using this
-            database. 
-          </para>
-          <para>
-            In the &fr; bookmark system, addresses are organised by
-            associating each address with one or more topic. For
-            example, if one were to store a bookmark for
-            <ulink type="http" url="http://developer.gnome.org">GNOME
-            Developers home page</ulink>, in any other browser, the user
-            might store it under the following hierarchy:
-            <programlisting>
-            Development -> GNOME -> GNOME developers home page
-            </programlisting>
+			  </listitem>
+			</itemizedlist>
+		  </para>
+		  <para>
+			The hierarchical way of organising bookmarks does not work
+			well for most people. Instead of this approach, &fr;
+			follows a database like approach. An address related to a
+			bookmark is stored with some metadata associated with
+			it. This metadata is then used to retrieve a bookmark
+			later. Future versions of &fr; will provide useful ways of
+			searching for and retrieving bookmarks using this
+			database. 
+		  </para>
+		  <para>
+			In the &fr; bookmark system, addresses are organised by
+			associating each address with one or more topic. For
+			example, if one were to store a bookmark for
+			<ulink type="http" url="http://developer.gnome.org">GNOME
+			Developers home page</ulink>, in any other browser, the user
+			might store it under the following hierarchy:
+			<programlisting>
+			Development -> GNOME -> GNOME developers home page
+			</programlisting>
 	  </para>
-          <para>
-            In &fr;, the same page could be associated with two
-            topics: 
-            <programlisting>
-            Development -> GNOME developers home page
-            GNOME -> GNOME developers home page
-            </programlisting>
-            Now the user can access this bookmark by typing the  
-            topic "GNOME" or "Development" in the location
-            bar. The user can also type in any of the words "GNOME",
-            "developers", "home" or "page" in the location bar. Either of these
-            methods drops a list containing the required bookmark. For
-            all ways to access bookmarks, see <xref
-            linkend="to-access-a-bookmark"/>
-          </para>
-          <para>
-            <note>
-              <title>No Subtopics</title>
-              <para>
-                &fr; allows only a single level of topics. Topics cannot
-                have sub-topics. 
-              </para>
-            </note>
-          </para>
-        </sect2>
-        <sect2 id="to-access-a-bookmark">
-          <title>To Access a bookmark</title>
-          <para>
-            The primary way to access bookmarks is the bookmarks
-            window. To open the bookmarks window, see <xref
-            linkend="ephy-to-open-bookmarks"/>. 
-            A separate window is used for organising bookmarks because
-            that makes it easier to navigate, and also allows it to
-            have search and edit 
-            functionalities in the same place. The bookmarks
-            collection can be directly edited from the desktop. In the
-            same place, it is now possible to edit the bookmark title
-            inline, add more topics, remove bookmarks, associate them
-            to more topics with drag and drop, edit properties of a
-            bookmark, etc. 
-          </para>
-          <para>
-            The bookmarks can also be
-            accessed by: 
-            <itemizedlist>
-              <listitem>
-               <para>
-                 Typing in a topic in the location bar of the main
-                 window drops down a list of bookmarks of that category.
-               </para>
-              </listitem>
-              <listitem>
-               <para>
-                 A word typed into the location bar are automatically
-                 searched in the bookmark database and matching bookmarks
-                 are shown in a drop down list below the location bar. 

-               </para>
-              </listitem>
-              <listitem>
-               <para>
-                 The menu item <guimenu>Bookmark</guimenu> gives a menu of 
-                 all the different topics. Bookmarks related to these topics 
-                 can then be accessed from submenus here. This is closest to
-                 the traditional method of accessing bookmarks, and is
-                 provided to keep compatibility.
-               </para>
-              </listitem>
-              <listitem>
-               <para>
-                 The bookmark bar can also be used to access your bookmarks. 
-                 Choose <menuchoice><guimenu>View</guimenu><guimenuitem>Bookmarks 
-                 Bar</guimenuitem></menuchoice> to add the Bookmark bar. 
-                 However, each topic and bookmark needs to be configured in 
-                 the Bookmarks dialog to be shown on this bar. This can be 
-                 used to organise most frequently used bookmarks. 
-               </para>
-              </listitem>
-            </itemizedlist>
-          </para>
-        </sect2>
-    <sect2 id="to-create-new-bookmark">
-       <title>To Create a New Bookmark</title>
-          <para>
-            You can create new bookmarks in several ways.
-          </para>
-          <variablelist>
-            <varlistentry>
-              <term>
-                Browser Window
-              </term>
-              <listitem>
-                <itemizedlist>
-                  <listitem>
-                    <para>
-                      To bookmark the currently viewed page, choose 
-                      <menuchoice><guimenu>Bookmarks</guimenu>
-                      <guimenuitem>Add Bookmark...</guimenuitem>

-                      </menuchoice>.
-                    </para>

-                  </listitem>
-                  <listitem>
-                    <para>
-                      To bookmark a link in the currently viewed page, 
-                      right click on the link and choose <menuchoice>

-                      <guimenuitem>Bookmark Link...</guimenuitem>

-                      </menuchoice>.
-                    </para>

-                  </listitem>
-                </itemizedlist>
-              </listitem>
-            </varlistentry>
-            <varlistentry>
-              <term>
-                History Window
-              </term>
-              <listitem>
-                <para>
-                  To bookmark the currently selected history link, 
-                  choose <menuchoice><guimenu>File</guimenu>
-                  <guimenuitem>Bookmark Link...</guimenuitem>

-                  </menuchoice>. Alternatively, right-click on the
-                  history link in the history window, then choose 
-                  <guimenuitem>Bookmark Link..</guimenuitem>.
-                </para>

-              </listitem>
-            </varlistentry>
-          </variablelist>
-        </sect2>
+		  <para>
+			In &fr;, the same page could be associated with two
+			topics: 
+			<programlisting>
+			Development -> GNOME developers home page
+			GNOME -> GNOME developers home page
+			</programlisting>
+			Now the user can access this bookmark by typing the  
+			topic "GNOME" or "Development" in the location
+			bar. The user can also type in any of the words "GNOME",
+			"developers", "home" or "page" in the location bar. Either of these
+			methods drops a list containing the required bookmark. For
+			all ways to access bookmarks, see <xref
+			linkend="to-access-a-bookmark"/>
+		  </para>
+		  <para>
+			<note>
+			  <title>No Subtopics</title>
+			  <para>
+				&fr; allows only a single level of topics. Topics cannot
+				have sub-topics. 
+			  </para>
+			</note>
+		  </para>
+		</sect2>
+		<sect2 id="to-access-a-bookmark">
+		  <title>To Access a bookmark</title>
+		  <para>
+			The primary way to access bookmarks is the bookmarks
+			window. To open the bookmarks window, see <xref
+			linkend="ephy-to-open-bookmarks"/>. 
+			A separate window is used for organising bookmarks because
+			that makes it easier to navigate, and also allows it to
+			have search and edit 
+			functionalities in the same place. The bookmarks
+			collection can be directly edited from the desktop. In the
+			same place, it is now possible to edit the bookmark title
+			inline, add more topics, remove bookmarks, associate them
+			to more topics with drag and drop, edit properties of a
+			bookmark, etc. 
+		  </para>
+		  <para>
+			The bookmarks can also be
+			accessed by: 
+			<itemizedlist>
+			  <listitem>
+			   <para>
+				 Typing in a topic in the location bar of the main
+				 window drops down a list of bookmarks of that category.
+			   </para>
+			  </listitem>
+			  <listitem>
+			   <para>
+				 A word typed into the location bar are automatically
+				 searched in the bookmark database and matching bookmarks
+				 are shown in a drop down list below the location bar. 
+			   </para>
+			  </listitem>
+			  <listitem>
+			   <para>
+				 The menu item <guimenu>Bookmark</guimenu> gives a menu of 
+				 all the different topics. Bookmarks related to these topics 
+				 can then be accessed from submenus here. This is closest to
+				 the traditional method of accessing bookmarks, and is
+				 provided to keep compatibility.
+			   </para>
+			  </listitem>
+			  <listitem>
+			   <para>
+				 The bookmark bar can also be used to access your bookmarks. 
+				 Choose <menuchoice><guimenu>View</guimenu><guimenuitem>Bookmarks 
+				 Bar</guimenuitem></menuchoice> to add the Bookmark bar. 
+				 However, each topic and bookmark needs to be configured in 
+				 the Bookmarks dialog to be shown on this bar. This can be 
+				 used to organise most frequently used bookmarks. 
+			   </para>
+			  </listitem>
+			</itemizedlist>
+		  </para>
+		</sect2>
+	<sect2 id="to-create-new-bookmark">
+	   <title>To Create a New Bookmark</title>
+		  <para>
+			You can create new bookmarks in several ways.
+		  </para>
+		  <variablelist>
+			<varlistentry>
+			  <term>
+				Browser Window
+			  </term>
+			  <listitem>
+				<itemizedlist>
+				  <listitem>
+					<para>
+					  To bookmark the currently viewed page, choose 
+					  <menuchoice><guimenu>Bookmarks</guimenu>
+					  <guimenuitem>Add Bookmark...</guimenuitem>
+					  </menuchoice>.
+					</para>
+				  </listitem>
+				  <listitem>
+					<para>
+					  To bookmark a link in the currently viewed page, 
+					  right click on the link and choose <menuchoice>
+					  <guimenuitem>Bookmark Link...</guimenuitem>
+					  </menuchoice>.
+					</para>
+				  </listitem>
+				</itemizedlist>
+			  </listitem>
+			</varlistentry>
+			<varlistentry>
+			  <term>
+				History Window
+			  </term>
+			  <listitem>
+				<para>
+				  To bookmark the currently selected history link, 
+				  choose <menuchoice><guimenu>File</guimenu>
+				  <guimenuitem>Bookmark Link...</guimenuitem>
+				  </menuchoice>. Alternatively, right-click on the
+				  history link in the history window, then choose 
+				  <guimenuitem>Bookmark Link..</guimenuitem>.
+				</para>
+			  </listitem>
+			</varlistentry>
+		  </variablelist>
+		</sect2>
 	<sect2 id="to-select-bookmarks">
-          <title>To Select Bookmarks and Topics</title>
-          <para>
-            You can select bookmarks and topics in several ways. 
-            <xref linkend="epiphany-TBL-2"/> describes how to select items 
-            in the bookmark window.
-          </para>
-          <table frame="topbot" id="epiphany-TBL-2">
-            <title>Selecting Items in the Bookmarks Window</title>
-            <tgroup cols="2" colsep="0" rowsep="0">
-              <colspec colname="colspec0" colwidth="36.36*"/>
-              <colspec colname="colspec2" colwidth="63.64*"/>
-              <thead>
-                <row rowsep="1">
-                  <entry valign="top">
-                    <para>
-                      Task
-                    </para>
-                  </entry>
-              	  <entry colname="colspec2" valign="top">
-                    <para>
-                      Action
-                    </para>
-                  </entry>
-            	</row>
-              </thead>
-              <tbody>
-                <row>
-                  <entry colname="colspec0" valign="top">
-                    <para>
-                      Select a bookmark or topic
-                    </para>
-              	  </entry>
-              	  <entry colname="colspec2" valign="top">
-                    <para>
-                      Click on the bookmark or topic.
-                    </para>
-              	  </entry>
-            	</row>
-            	<row>
-              	  <entry colname="colspec0" valign="top">
-                    <para>
-                      Select a group of contiguous bookmarks
-                    </para>
-              	  </entry>
-              	  <entry colname="colspec2" valign="top">
-                    <para>
-                      Press-and-hold <keycap>Shift</keycap>. Click on the 
-                      first bookmark in the group, then click on the last 
-                      bookmark in the group.
-                    </para>
-                  </entry>
-            	</row>
-            	<row>
-              	  <entry colname="colspec0" valign="top">
-                    <para>
-                      Select multiple bookmarks
-                    </para>
-              	  </entry>
-              	  <entry colname="colspec2" valign="top">
-                    <para>
-                      Press-and-hold <keycap>Ctrl</keycap>. Click on the 
-                      bookmark that you want to select.
-                    </para>
-              	  </entry>
-            	</row>
-            	<row>
-              	  <entry colname="colspec0" valign="top">
-                    <para>
-                      Select all bookmarks in a topic
-                    </para>
-              	  </entry>
-              	  <entry colname="colspec2" valign="top">
-                    <para>
-                      Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>
-                      Select All</guimenuitem></menuchoice>.
-                    </para>
-              	  </entry>
-            	</row>
-              </tbody>
-            </tgroup>
-          </table>
-        </sect2>
+		  <title>To Select Bookmarks and Topics</title>
+		  <para>
+			You can select bookmarks and topics in several ways. 
+			<xref linkend="epiphany-TBL-2"/> describes how to select items 
+			in the bookmark window.
+		  </para>
+		  <table frame="topbot" id="epiphany-TBL-2">
+			<title>Selecting Items in the Bookmarks Window</title>
+			<tgroup cols="2" colsep="0" rowsep="0">
+			  <colspec colname="colspec0" colwidth="36.36*"/>
+			  <colspec colname="colspec2" colwidth="63.64*"/>
+			  <thead>
+				<row rowsep="1">
+				  <entry valign="top">
+					<para>
+					  Task
+					</para>
+				  </entry>
+				  <entry colname="colspec2" valign="top">
+					<para>
+					  Action
+					</para>
+				  </entry>
+				</row>
+			  </thead>
+			  <tbody>
+				<row>
+				  <entry colname="colspec0" valign="top">
+					<para>
+					  Select a bookmark or topic
+					</para>
+				  </entry>
+				  <entry colname="colspec2" valign="top">
+					<para>
+					  Click on the bookmark or topic.
+					</para>
+				  </entry>
+				</row>
+				<row>
+				  <entry colname="colspec0" valign="top">
+					<para>
+					  Select a group of contiguous bookmarks
+					</para>
+				  </entry>
+				  <entry colname="colspec2" valign="top">
+					<para>
+					  Press-and-hold <keycap>Shift</keycap>. Click on the 
+					  first bookmark in the group, then click on the last 
+					  bookmark in the group.
+					</para>
+				  </entry>
+				</row>
+				<row>
+				  <entry colname="colspec0" valign="top">
+					<para>
+					  Select multiple bookmarks
+					</para>
+				  </entry>
+				  <entry colname="colspec2" valign="top">
+					<para>
+					  Press-and-hold <keycap>Ctrl</keycap>. Click on the 
+					  bookmark that you want to select.
+					</para>
+				  </entry>
+				</row>
+				<row>
+				  <entry colname="colspec0" valign="top">
+					<para>
+					  Select all bookmarks in a topic
+					</para>
+				  </entry>
+				  <entry colname="colspec2" valign="top">
+					<para>
+					  Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>
+					  Select All</guimenuitem></menuchoice>.
+					</para>
+				  </entry>
+				</row>
+			  </tbody>
+			</tgroup>
+		  </table>
+		</sect2>
 	<sect2 id="to-open-bookmark">
-          <title>To Open a Bookmark in a New Window or Tab</title>
-          <variablelist>
-            <varlistentry>
-              <term>To open a bookmark in a new window perform the following steps:</term>
-              <listitem>
-                <orderedlist>
-                  <listitem>
-                    <para>
-                       Select the bookmark that you want to open.
-                    </para>
-                  </listitem>
-                 <listitem>
-                   <para>
-                      Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open in 
-                      New Window</guimenuitem></menuchoice>. Alternatively, right-click 
-                      on the bookmark, then choose <menuchoice><guimenuitem>Open in New 
-                      Window</guimenuitem></menuchoice>.
-                   </para>
-                 </listitem>
-               </orderedlist>
-             </listitem>
-           </varlistentry>
-           <varlistentry>
-             <term>
-               To open a bookmark in a new tab perform the following steps:
-             </term>
-             <listitem>
-               <orderedlist>
-                 <listitem>
-                   <para>
-                     Select the bookmark that you want to open.
-                   </para>
-                 </listitem>
-                 <listitem>
-                   <para>
-                     Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open 
-                     in New Tab</guimenuitem></menuchoice>. Alternatively, 
-                     right-click on the bookmark, then choose <menuchoice>
-                     <guimenuitem>Open in New Tab</guimenuitem></menuchoice>.
-                   </para>
-                 </listitem>
-               </orderedlist>
-             </listitem>
-            </varlistentry>
+		  <title>To Open a Bookmark in a New Window or Tab</title>
+		  <variablelist>
+			<varlistentry>
+			  <term>To open a bookmark in a new window perform the following steps:</term>
+			  <listitem>
+				<orderedlist>
+				  <listitem>
+					<para>
+					   Select the bookmark that you want to open.
+					</para>
+				  </listitem>
+				 <listitem>
+				   <para>
+					  Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open in 
+					  New Window</guimenuitem></menuchoice>. Alternatively, right-click 
+					  on the bookmark, then choose <menuchoice><guimenuitem>Open in New 
+					  Window</guimenuitem></menuchoice>.
+				   </para>
+				 </listitem>
+			   </orderedlist>
+			 </listitem>
+		   </varlistentry>
+		   <varlistentry>
+			 <term>
+			   To open a bookmark in a new tab perform the following steps:
+			 </term>
+			 <listitem>
+			   <orderedlist>
+				 <listitem>
+				   <para>
+					 Select the bookmark that you want to open.
+				   </para>
+				 </listitem>
+				 <listitem>
+				   <para>
+					 Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open 
+					 in New Tab</guimenuitem></menuchoice>. Alternatively, 
+					 right-click on the bookmark, then choose <menuchoice>
+					 <guimenuitem>Open in New Tab</guimenuitem></menuchoice>.
+				   </para>
+				 </listitem>
+			   </orderedlist>
+			 </listitem>
+			</varlistentry>
 	  </variablelist>
-        </sect2>
+		</sect2>
 	<sect2 id="to-create-new-topic">
-          <title>To Create a New Topic</title>
-          <para>
-            To create a new topic, choose <menuchoice> <guimenu>File</guimenu>
-            <guimenuitem>New Topic</guimenuitem></menuchoice> in the Bookmark 
-            window. A new topic is created, you can now enter the name of the 
-            topic. The topics will appear as submenus in the <guimenu>Bookmarks
-            </guimenu> menu.
-          </para>
-        </sect2>
+		  <title>To Create a New Topic</title>
+		  <para>
+			To create a new topic, choose <menuchoice> <guimenu>File</guimenu>
+			<guimenuitem>New Topic</guimenuitem></menuchoice> in the Bookmark 
+			window. A new topic is created, you can now enter the name of the 
+			topic. The topics will appear as submenus in the <guimenu>Bookmarks
+			</guimenu> menu.
+		  </para>
+		</sect2>
 	<sect2 id="to-add-bookmark-to-topic">
-          <title>To Add a Bookmark to a Topic</title>
-          <para>
-            To add a bookmark to a topic, right-click its entry in the bookmarks 
-            window and choose <guimenuitem>Properties</guimenuitem>. From the 
-            <guilabel>Topics</guilabel> list, select each topic to add this 
-            bookmark to, and click <guibutton>Close</guibutton>.
-          </para>
-        </sect2>
+		  <title>To Add a Bookmark to a Topic</title>
+		  <para>
+			To add a bookmark to a topic, right-click its entry in the bookmarks 
+			window and choose <guimenuitem>Properties</guimenuitem>. From the 
+			<guilabel>Topics</guilabel> list, select each topic to add this 
+			bookmark to, and click <guibutton>Close</guibutton>.
+		  </para>
+		</sect2>
 	<sect2 id="to-remove-bookmark-from-topic">
-          <title>To Remove a Bookmark From a Topic</title>
-          <para>
-            To remove a bookmark from a topic, right-click its entry in the bookmarks 
-            window and choose <guimenuitem>Properties</guimenuitem>. From the 
-            <guilabel>Topics</guilabel> list, deselect each topic from which you 
-            wish to remove this bookmark, then click <guibutton>Close</guibutton>.
-          </para>
-        </sect2>
+		  <title>To Remove a Bookmark From a Topic</title>
+		  <para>
+			To remove a bookmark from a topic, right-click its entry in the bookmarks 
+			window and choose <guimenuitem>Properties</guimenuitem>. From the 
+			<guilabel>Topics</guilabel> list, deselect each topic from which you 
+			wish to remove this bookmark, then click <guibutton>Close</guibutton>.
+		  </para>
+		</sect2>
 	<sect2 id="to-rename-bookmark-or-topic">
-          <title>To Rename a Bookmark or Topic</title>
-          <para>
-            To rename a bookmark or topic perform the following steps:
-          </para>
-          <orderedlist>
-            <listitem>
-              <para>
-                Select the bookmark or topic that you want to rename in the bookmarks window.
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Rename...</guimenuitem>
+		  <title>To Rename a Bookmark or Topic</title>
+		  <para>
+			To rename a bookmark or topic perform the following steps:
+		  </para>
+		  <orderedlist>
+			<listitem>
+			  <para>
+				Select the bookmark or topic that you want to rename in the bookmarks window.
+			  </para>
+			</listitem>
+			<listitem>
+			  <para>
+				Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Rename...</guimenuitem>
 		</menuchoice>. Alternatively, right-click on the bookmark
 		or topic in the view pane, then choose <guimenuitem>Rename...</guimenuitem>.
-          	The name of the bookmark or topic is selected.</para>
-              </listitem>
-              <listitem>
-                <para>
-                  Type a new name for the topic or bookmark, then press 
-                  <keycap>Return</keycap>.
-                </para>
-              </listitem>
-           </orderedlist>
-        </sect2>
+			The name of the bookmark or topic is selected.</para>
+			  </listitem>
+			  <listitem>
+				<para>
+				  Type a new name for the topic or bookmark, then press 
+				  <keycap>Return</keycap>.
+				</para>
+			  </listitem>
+		   </orderedlist>
+		</sect2>
 	<sect2 id="to-delete-bookmark-or-topic">
-          <title>To Delete a Bookmark or Topic</title>
-          <para>
-            To delete a bookmarks or topics perform the following steps:
-          </para>
-          <orderedlist>
-            <listitem>
-              <para>
-                Select the bookmark or topic that you want to delete 
-                from the bookmarks window.
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                Choose <menuchoice><guimenu>File</guimenu><guimenuitem>
-                Delete</guimenuitem></menuchoice>. Alternatively, 
-                right-click on the bookmarks or topic in the bookmarks 
-                window, then choose <guimenuitem>Delete</guimenuitem>.
-              </para>
-            </listitem>
-      	  </orderedlist>
-        </sect2>
+		  <title>To Delete a Bookmark or Topic</title>
+		  <para>
+			To delete a bookmarks or topics perform the following steps:
+		  </para>
+		  <orderedlist>
+			<listitem>
+			  <para>
+				Select the bookmark or topic that you want to delete 
+				from the bookmarks window.
+			  </para>
+			</listitem>
+			<listitem>
+			  <para>
+				Choose <menuchoice><guimenu>File</guimenu><guimenuitem>
+				Delete</guimenuitem></menuchoice>. Alternatively, 
+				right-click on the bookmarks or topic in the bookmarks 
+				window, then choose <guimenuitem>Delete</guimenuitem>.
+			  </para>
+			</listitem>
+		  </orderedlist>
+		</sect2>
 	<sect2 id="to-edit-bookmark-properties">
 	  <title>To Edit a Bookmark's Properties</title>
-          <para>
-            To edit a bookmark's properties such as it's title and address
-            right click it's entry in the bookmarks window and select 
-            <guimenuitem>Properties</guimenuitem>.
-          </para>
-        </sect2>
+		  <para>
+			To edit a bookmark's properties such as it's title and address
+			right click it's entry in the bookmarks window and select 
+			<guimenuitem>Properties</guimenuitem>.
+		  </para>
+		</sect2>
 	<sect2 id="to-search-bookmarks">
-          <title>To Search Your Bookmarks</title>
-          <para>
-            To search through your bookmarks, enter you search term in 
-            the <guilabel>Search</guilabel> field. &fr; will search through 
-            all your bookmarks no matter which topic is currently selected.
-          </para>
-        </sect2>
+		  <title>To Search Your Bookmarks</title>
+		  <para>
+			To search through your bookmarks, enter you search term in 
+			the <guilabel>Search</guilabel> field. &fr; will search through 
+			all your bookmarks no matter which topic is currently selected.
+		  </para>
+		</sect2>
 	<sect2 id="to-copy-bookmark-address">
-          <title>To Copy the Address of a Bookmark</title>
-          <para>
-            To copy the address of a bookmark perform the following steps:
-          </para>
-          <orderedlist>
-            <listitem>
-              <para>
-                Select the bookmark.
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>
-                Copy Address</guimenuitem></menuchoice>. Alternatively, 
-                right-click on the bookmark, then choose <guimenuitem>Copy 
-                Address</guimenuitem>.
-              </para>
-            </listitem>
-          </orderedlist>
-        </sect2>
+		  <title>To Copy the Address of a Bookmark</title>
+		  <para>
+			To copy the address of a bookmark perform the following steps:
+		  </para>
+		  <orderedlist>
+			<listitem>
+			  <para>
+				Select the bookmark.
+			  </para>
+			</listitem>
+			<listitem>
+			  <para>
+				Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>
+				Copy Address</guimenuitem></menuchoice>. Alternatively, 
+				right-click on the bookmark, then choose <guimenuitem>Copy 
+				Address</guimenuitem>.
+			  </para>
+			</listitem>
+		  </orderedlist>
+		</sect2>
 	<sect2 id="to-add-bookmark-or-topic-to-bookmarks-bar">
-          <title>To Add a Bookmark or Topic to the Bookmarks Bar</title>
-          <para>
-            You can add a bookmark or topic to the bookmarks bar in the following ways:
-          </para>
-          <variablelist>
-            <varlistentry>
-              <term>
-                <guimenu>File</guimenu> menu
-              </term>
-              <listitem>
-                <para>
-                  Select the bookmark or topic you wish to add, and choose 
-                  <menuchoice><guisubmenu>File</guisubmenu><guimenuitem>
-                  Show in Bookmarks Bar</guimenuitem></menuchoice>.
-                </para>
-              </listitem>
-            </varlistentry>
-            <varlistentry>
-             <term>
-               Drag and Drop
-             </term>
-             <listitem>
-               <para>
-                 You can drag and drop bookmarks and topics from the 
-                 bookmarks window onto the bookmarks bar.
-               </para>
-             </listitem>
-           </varlistentry>
-         </variablelist>
-        </sect2>
+		  <title>To Add a Bookmark or Topic to the Bookmarks Bar</title>
+		  <para>
+			You can add a bookmark or topic to the bookmarks bar in the following ways:
+		  </para>
+		  <variablelist>
+			<varlistentry>
+			  <term>
+				<guimenu>File</guimenu> menu
+			  </term>
+			  <listitem>
+				<para>
+				  Select the bookmark or topic you wish to add, and choose 
+				  <menuchoice><guisubmenu>File</guisubmenu><guimenuitem>
+				  Show in Bookmarks Bar</guimenuitem></menuchoice>.
+				</para>
+			  </listitem>
+			</varlistentry>
+			<varlistentry>
+			 <term>
+			   Drag and Drop
+			 </term>
+			 <listitem>
+			   <para>
+				 You can drag and drop bookmarks and topics from the 
+				 bookmarks window onto the bookmarks bar.
+			   </para>
+			 </listitem>
+		   </varlistentry>
+		 </variablelist>
+		</sect2>
 	<sect2 id="to-remove-bookmark-or-topic-from-bookmarks-bar">
-          <title>To Remove a Bookmark or Topic From the Bookmarks Bar</title>
-          <para>
-            You can remove a bookmark or topic from the bookmarks bar in the following ways:
-          </para>
-          <variablelist>
-            <varlistentry>
-              <term>
-                <guimenu>File</guimenu> menu
-              </term>
-              <listitem>
-                <para>
-                  Select the bookmark or topic you wish to remove, and choose 
-                  <menuchoice><guisubmenu>File</guisubmenu><guimenuitem>Show 
-                  in Bookmarks Bar</guimenuitem></menuchoice>.
-                </para>
-              </listitem>
-            </varlistentry>
-            <varlistentry>
-              <term>
-                Toolbar Editor
-              </term>
-              <listitem>
-                <para>
-                  You can remove bookmarks and topics from the bookmarks bar 
+		  <title>To Remove a Bookmark or Topic From the Bookmarks Bar</title>
+		  <para>
+			You can remove a bookmark or topic from the bookmarks bar in the following ways:
+		  </para>
+		  <variablelist>
+			<varlistentry>
+			  <term>
+				<guimenu>File</guimenu> menu
+			  </term>
+			  <listitem>
+				<para>
+				  Select the bookmark or topic you wish to remove, and choose 
+				  <menuchoice><guisubmenu>File</guisubmenu><guimenuitem>Show 
+				  in Bookmarks Bar</guimenuitem></menuchoice>.
+				</para>
+			  </listitem>
+			</varlistentry>
+			<varlistentry>
+			  <term>
+				Toolbar Editor
+			  </term>
+			  <listitem>
+				<para>
+				  You can remove bookmarks and topics from the bookmarks bar 
 		  using the toolbar editor as described in the section
 		  <xref linkend="to-edit-toolbars"/>.
-                </para>
-              </listitem>
-            </varlistentry>
-          </variablelist>
-        </sect2>
+				</para>
+			  </listitem>
+			</varlistentry>
+		  </variablelist>
+		</sect2>
 	<sect2 id="smart-bookmarks">
 	  <title>Smart Bookmarks</title>
-          <para>
-          </para>
-          <sect3 id="smart-bookmarks-introduction">
-            <title>Introduction</title>
-            <para>
-              Smart Bookmarks are a special kind of bookmark that can take one or more 
-              arguments. By using Smart Bookmarks, web searches and queries can be 
-              performed without loading a query page first.
-            </para>
-            <para>
-              All of your Smart Bookmarks will appear in a drop down menu if you enter 
-              some text in the address bar, as shown in  
-              <xref linkend="ephy-addressbar-smartbookmark-screenshot"/>. By selecting 
-              the Smart Bookmark, a query using the given text will be performed.
-            </para>
-            <figure id="ephy-addressbar-smartbookmark-screenshot">
-              <title>Smart Bookmark in address bar drop down menu</title>
-              <screenshot>
-                <mediaobject>
-                  <imageobject>
-                    <imagedata
-                    fileref="figures/ephy-addressbar-smartbookmark-screenshot.png"
-                    format="PNG"/> 
-                  </imageobject>
-                </mediaobject>
-              </screenshot>
-            </figure>
-            <para>
-              It is also possible to add a Smart Bookmark to a toolbar by selecting 
-              <guimenuitem>Show in Bookmarks Bar</guimenuitem> in the bookmark's 
-              property dialog. If you do so, you will see its name and a text box, 
-              as shown in <xref linkend="ephy-bookmarkbar-smartbookmark-screenshot"/>. 
-              You can enter text into the box and press enter to perform the function of 
-              the Smart Bookmark.
-            </para>
-            <figure id="ephy-bookmarkbar-smartbookmark-screenshot">
-              <title>Smart Bookmark in the bookmarks bar</title>
-              <screenshot>
-                <mediaobject>
-                  <imageobject>
-                    <imagedata
-                    fileref="figures/ephy-bookmarkbar-smartbookmark-screenshot.png"
-                    format="PNG"/> 
-                  </imageobject>
-                </mediaobject>
-              </screenshot>
-            </figure>
-          </sect3>
-          <sect3 id="smart-bookmarks-create-a-smartbookmark">
-            <title>How do I create a Smart Bookmark?</title>
-            <para>
-              Smart Bookmarks can be created by finding out what address a site uses for 
-              searching, for example 
-              <command>http://www.google.com/search?q=SEARCHPHRASE</command> will 
-              start a Google query for <command>SEARCHPHRASE</command>.
-            </para>
-            <para>
-              To make this address a Smart Bookmark, perform the following steps:
-            </para>
-            <orderedlist>
-              <listitem>
-                <para>
-                  Add a bookmark for 
-                  <command>http://www.google.com/search?q=SEARCHPHRASE</command>
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  Open the bookmarks window.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  In the <guimenuitem>Address</guimenuitem> field of the bookmark's 
-                  <guimenuitem>Properties</guimenuitem> dialog, replace 
-                  <command>SEARCHPHRASE</command> with %s.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  (Optional) If you want the Smart Bookmark to appear in the bookmarks
-                  bar, as shown in 
-                  <xref linkend="ephy-bookmarkbar-smartbookmark-screenshot"/>, select 
-                  <guimenuitem>Show in Bookmarks Bar</guimenuitem> in the bookmark's 
-                  <guimenuitem>Properties</guimenuitem> dialog.
-                </para>
-              </listitem>
-            </orderedlist>
-          </sect3>
-          <sect3 id="smart-bookmarks-archive">
-            <title>Smart Bookmarks Archive</title>
-            <para>
-              An archive containing lots of Smart Bookmarks is available at the 
-              <ulink url="http://galeon.sourceforge.net/bookmarks/">Galeon</ulink> 
-              web site.
-            </para>
-          </sect3>
-        </sect2>
+		  <para>
+		  </para>
+		  <sect3 id="smart-bookmarks-introduction">
+			<title>Introduction</title>
+			<para>
+			  Smart Bookmarks are a special kind of bookmark that can take one or more 
+			  arguments. By using Smart Bookmarks, web searches and queries can be 
+			  performed without loading a query page first.
+			</para>
+			<para>
+			  All of your Smart Bookmarks will appear in a drop down menu if you enter 
+			  some text in the address bar, as shown in  
+			  <xref linkend="ephy-addressbar-smartbookmark-screenshot"/>. By selecting 
+			  the Smart Bookmark, a query using the given text will be performed.
+			</para>
+			<figure id="ephy-addressbar-smartbookmark-screenshot">
+			  <title>Smart Bookmark in address bar drop down menu</title>
+			  <screenshot>
+				<mediaobject>
+				  <imageobject>
+					<imagedata
+					fileref="figures/ephy-addressbar-smartbookmark-screenshot.png"
+					format="PNG"/> 
+				  </imageobject>
+				</mediaobject>
+			  </screenshot>
+			</figure>
+			<para>
+			  It is also possible to add a Smart Bookmark to a toolbar by selecting 
+			  <guimenuitem>Show in Bookmarks Bar</guimenuitem> in the bookmark's 
+			  property dialog. If you do so, you will see its name and a text box, 
+			  as shown in <xref linkend="ephy-bookmarkbar-smartbookmark-screenshot"/>. 
+			  You can enter text into the box and press enter to perform the function of 
+			  the Smart Bookmark.
+			</para>
+			<figure id="ephy-bookmarkbar-smartbookmark-screenshot">
+			  <title>Smart Bookmark in the bookmarks bar</title>
+			  <screenshot>
+				<mediaobject>
+				  <imageobject>
+					<imagedata
+					fileref="figures/ephy-bookmarkbar-smartbookmark-screenshot.png"
+					format="PNG"/> 
+				  </imageobject>
+				</mediaobject>
+			  </screenshot>
+			</figure>
+		  </sect3>
+		  <sect3 id="smart-bookmarks-create-a-smartbookmark">
+			<title>How do I create a Smart Bookmark?</title>
+			<para>
+			  Smart Bookmarks can be created by finding out what address a site uses for 
+			  searching, for example 
+			  <command>http://www.google.com/search?q=SEARCHPHRASE</command> will 
+			  start a Google query for <command>SEARCHPHRASE</command>.
+			</para>
+			<para>
+			  To make this address a Smart Bookmark, perform the following steps:
+			</para>
+			<orderedlist>
+			  <listitem>
+				<para>
+				  Add a bookmark for 
+				  <command>http://www.google.com/search?q=SEARCHPHRASE</command>
+				</para>
+			  </listitem>
+			  <listitem>
+				<para>
+				  Open the bookmarks window.
+				</para>
+			  </listitem>
+			  <listitem>
+				<para>
+				  In the <guimenuitem>Address</guimenuitem> field of the bookmark's 
+				  <guimenuitem>Properties</guimenuitem> dialog, replace 
+				  <command>SEARCHPHRASE</command> with %s.
+				</para>
+			  </listitem>
+			  <listitem>
+				<para>
+				  (Optional) If you want the Smart Bookmark to appear in the bookmarks
+				  bar, as shown in 
+				  <xref linkend="ephy-bookmarkbar-smartbookmark-screenshot"/>, select 
+				  <guimenuitem>Show in Bookmarks Bar</guimenuitem> in the bookmark's 
+				  <guimenuitem>Properties</guimenuitem> dialog.
+				</para>
+			  </listitem>
+			</orderedlist>
+		  </sect3>
+		  <sect3 id="smart-bookmarks-archive">
+			<title>Smart Bookmarks Archive</title>
+			<para>
+			  An archive containing lots of Smart Bookmarks is available at the 
+			  <ulink url="http://galeon.sourceforge.net/bookmarks/">Galeon</ulink> 
+			  web site.
+			</para>
+		  </sect3>
+		</sect2>
   </sect1>
 
 <!-- ============= Managing Your History Links ==================== -->
   <sect1 id="ephy-managing-history">
-      <title>Managing Your History Links</title>
-      <para>
-      </para>
+	  <title>Managing Your History Links</title>
+	  <para>
+	  </para>
 	<sect2 id="overview-of-history">
-          <title>Overview of the Epiphany History System</title>
-          <para>
-            Epiphany collects history information about locations that
-            are visited by you. This information is stored in a
-            database and can then be accessed later. 
-          </para>
-          <para>
-            As you type in the location bar of the main window,
-            &fr; searches for matches in the title or address of the
-            locations stored in the history and the bookmark
-            databases. Matches are shown in a list below the location
-            bar. 
-          </para>
-          <para>
-            You can manage history by opening the history window. This
-            window allows you to search the history, and delete locations
-            you do not want to revisit later.
-          </para>
-          <para>
-            <xref linkend="ephy-history-window-screenshot"/> shows the
-            history window. 
-          </para>
-          <figure id="ephy-history-window-screenshot">
-            <title>History window</title>
-            <screenshot>
-              <mediaobject>
-                <imageobject>
-                  <imagedata
-                  fileref="figures/ephy-history-window-screenshot.png"
-                  format="PNG"/> 
-                </imageobject>
-              </mediaobject>
-            </screenshot>
-          </figure>
-        </sect2>
+		  <title>Overview of the Epiphany History System</title>
+		  <para>
+			Epiphany collects history information about locations that
+			are visited by you. This information is stored in a
+			database and can then be accessed later. 
+		  </para>
+		  <para>
+			As you type in the location bar of the main window,
+			&fr; searches for matches in the title or address of the
+			locations stored in the history and the bookmark
+			databases. Matches are shown in a list below the location
+			bar. 
+		  </para>
+		  <para>
+			You can manage history by opening the history window. This
+			window allows you to search the history, and delete locations
+			you do not want to revisit later.
+		  </para>
+		  <para>
+			<xref linkend="ephy-history-window-screenshot"/> shows the
+			history window. 
+		  </para>
+		  <figure id="ephy-history-window-screenshot">
+			<title>History window</title>
+			<screenshot>
+			  <mediaobject>
+				<imageobject>
+				  <imagedata
+				  fileref="figures/ephy-history-window-screenshot.png"
+				  format="PNG"/> 
+				</imageobject>
+			  </mediaobject>
+			</screenshot>
+		  </figure>
+		</sect2>
 	<sect2 id="to-select-history">
-          <title>To Select History Links</title>
-          <para>
-            Select <menuchoice>
-            <guimenu>Go</guimenu>
-            <guimenuitem>History</guimenuitem>
-            </menuchoice>
-            to open the history window. You can search for history
-            links, open history links in a new window or a new tab, or
-            delete history from the database. 
-          </para>
-        </sect2>
+		  <title>To Select History Links</title>
+		  <para>
+			Select <menuchoice>
+			<guimenu>Go</guimenu>
+			<guimenuitem>History</guimenuitem>
+			</menuchoice>
+			to open the history window. You can search for history
+			links, open history links in a new window or a new tab, or
+			delete history from the database. 
+		  </para>
+		</sect2>
 	<sect2 id="to-open-history-link">
-          <title>To Open a History Link in a New Window or Tab</title>
-          <variablelist>
-            <varlistentry>
-              <term>
-                To open a history link in a new window perform the following steps:
-              </term>
-    	      <listitem>
-                <orderedlist>
-                  <listitem>
-                    <para>
-                      Select the history link that you want to open.
-                    </para>
-                  </listitem>
-                  <listitem>
-                    <para>
-                      Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open 
-                      in New Window</guimenuitem></menuchoice>. Alternatively, 
-                      right-click on the history link, then choose <menuchoice>
-                      <guimenuitem>Open in New Window</guimenuitem></menuchoice>.
-                    </para>
-                  </listitem>
-                 </orderedlist>
-               </listitem>
-             </varlistentry>
-             <varlistentry>
-               <term>
-                 To Open a history link in a new tab perform the following steps:
-               </term>
-               <listitem>
-                 <orderedlist>
-                   <listitem>
-                     <para>
-                       Select the history link that you want to open.
-                     </para>
-                   </listitem>
-                   <listitem>
-                     <para>
-                       Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open 
-                       in New Tab</guimenuitem></menuchoice>. Alternatively, 
-                       right-click on the history link, then choose <menuchoice>
-                       <guimenuitem>Open in New Tab</guimenuitem></menuchoice>.
-                     </para>
-                   </listitem>
-                 </orderedlist>
-               </listitem>
-             </varlistentry>
+		  <title>To Open a History Link in a New Window or Tab</title>
+		  <variablelist>
+			<varlistentry>
+			  <term>
+				To open a history link in a new window perform the following steps:
+			  </term>
+			  <listitem>
+				<orderedlist>
+				  <listitem>
+					<para>
+					  Select the history link that you want to open.
+					</para>
+				  </listitem>
+				  <listitem>
+					<para>
+					  Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open 
+					  in New Window</guimenuitem></menuchoice>. Alternatively, 
+					  right-click on the history link, then choose <menuchoice>
+					  <guimenuitem>Open in New Window</guimenuitem></menuchoice>.
+					</para>
+				  </listitem>
+				 </orderedlist>
+			   </listitem>
+			 </varlistentry>
+			 <varlistentry>
+			   <term>
+				 To Open a history link in a new tab perform the following steps:
+			   </term>
+			   <listitem>
+				 <orderedlist>
+				   <listitem>
+					 <para>
+					   Select the history link that you want to open.
+					 </para>
+				   </listitem>
+				   <listitem>
+					 <para>
+					   Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open 
+					   in New Tab</guimenuitem></menuchoice>. Alternatively, 
+					   right-click on the history link, then choose <menuchoice>
+					   <guimenuitem>Open in New Tab</guimenuitem></menuchoice>.
+					 </para>
+				   </listitem>
+				 </orderedlist>
+			   </listitem>
+			 </varlistentry>
 	  </variablelist>
-        </sect2>
+		</sect2>
 	<sect2 id="to-delete-history-link">
-          <title>To Delete a History Link</title>
-          <para>
-            To delete a history link perform the following steps:
-          </para>
-          <orderedlist>
-            <listitem>
-              <para>
-                Select the history link that you want to delete.
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Delete</guimenuitem>
-                </menuchoice>. Alternatively, right-click on the history link, then 
-                choose <guimenuitem>Delete</guimenuitem>.
-              </para>
-            </listitem>
-          </orderedlist>
-        </sect2>
+		  <title>To Delete a History Link</title>
+		  <para>
+			To delete a history link perform the following steps:
+		  </para>
+		  <orderedlist>
+			<listitem>
+			  <para>
+				Select the history link that you want to delete.
+			  </para>
+			</listitem>
+			<listitem>
+			  <para>
+				Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Delete</guimenuitem>
+				</menuchoice>. Alternatively, right-click on the history link, then 
+				choose <guimenuitem>Delete</guimenuitem>.
+			  </para>
+			</listitem>
+		  </orderedlist>
+		</sect2>
 	<sect2 id="to-search-history">
-          <title>To Search Your History Links</title>
-          <para>
-            You can type into the search entry in
-            the history window. In case any matches are found in the
-            history database, they are shown in a list below. These
-            matches can then be opened in a new window, a new tab or
-            the link address can be copied for pasting in any other
-            application. 
-          </para>
-          <para>
-            Alternatively, anything you enter in the address entry of
-            the &fr; window 
-            is matched against the history database, and shown in a
-            drop down list alongwith other matches from the bookmarks
-            database. 
-          </para>
-        </sect2>
+		  <title>To Search Your History Links</title>
+		  <para>
+			You can type into the search entry in
+			the history window. In case any matches are found in the
+			history database, they are shown in a list below. These
+			matches can then be opened in a new window, a new tab or
+			the link address can be copied for pasting in any other
+			application. 
+		  </para>
+		  <para>
+			Alternatively, anything you enter in the address entry of
+			the &fr; window 
+			is matched against the history database, and shown in a
+			drop down list alongwith other matches from the bookmarks
+			database. 
+		  </para>
+		</sect2>
 	<sect2 id="to-copy-history-link-address">
-          <title>To Copy the Address of a History Link</title>
-          <para>
-            To copy the address of a history link perform the following 
-            steps:
-          </para>
-          <orderedlist>
-            <listitem>
-              <para>
-                Select the history link.
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Copy 
-                Address</guimenuitem></menuchoice>. Alternatively, 
-                right-click on the history link, then choose 
-                <guimenuitem>Copy Address</guimenuitem>.
-              </para>
-            </listitem>
-          </orderedlist>
-        </sect2>
+		  <title>To Copy the Address of a History Link</title>
+		  <para>
+			To copy the address of a history link perform the following 
+			steps:
+		  </para>
+		  <orderedlist>
+			<listitem>
+			  <para>
+				Select the history link.
+			  </para>
+			</listitem>
+			<listitem>
+			  <para>
+				Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Copy 
+				Address</guimenuitem></menuchoice>. Alternatively, 
+				right-click on the history link, then choose 
+				<guimenuitem>Copy Address</guimenuitem>.
+			  </para>
+			</listitem>
+		  </orderedlist>
+		</sect2>
   </sect1>
 
 <!-- ============= Managing Your Passwords and Cookies ============ -->
   <sect1 id="ephy-managing-passwords-cookies">
-    <title>Managing Your Passwords and Cookies</title>
-    <para>
-      &fr; stores your cookies and passwords in the Personal Data Manager
-      which can be accessed by clicking <menuchoice> <guimenu>Edit</guimenu> 
-      <guisubmenu>Personal Data</guisubmenu> </menuchoice>.
-    </para>
-    <sect2 id="managing-cookies">
-      <title>Managing Cookies</title>
-      <para>
-        Cookies allow web pages to store pieces of information which can then be accessed 
-        by the site when you next visit.
-      </para>
-      <para>
-        In Personal Data Manager, you can view the cookies stored on your 
-        computer and the details contained within them. You can also delete cookies.
-      </para>
-      <itemizedlist>
-        <listitem>
-          <para>
-            To view the contents of a cookie, select its entry in the list and click 
-            <guibutton>Properties</guibutton>.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            To delete cookies, select all the cookies you want to delete, and click the 
-            <guibutton>Delete</guibutton> button.
-          </para>
-        </listitem>
-      </itemizedlist>
-      <para>
-        The cookies properties window shows you the following details:
-      </para>
-      <variablelist>
-        <varlistentry>
-          <term>Content</term>
-          <listitem>
-            <para>
-              The content of the cookie.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Path</term>
-          <listitem>
-            <para>
-              The path within the domain for which the cookie is valid.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Send for</term>
-          <listitem>
-            <para>
-              When <guilabel>Any type of connection</guilabel>, the 
-              cookie can be sent to any server. When <guilabel>Encrypted 
-              connections only</guilabel>, the cookie will only be
-              sent to secure servers.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Expires</term>
-          <listitem>
-            <para>
-              The date and time at which the cookie is no longer valid.
-            </para>
-          </listitem>
-        </varlistentry>
-      </variablelist>          
-    </sect2>
-    <sect2 id="managing-passwords">
-      <title>Managing Passwords</title>
-      <para>
-        Many web sites require you to log in using a username and password to gain access 
-        to some or all of the site. &fr; can remember the passwords for you so that you 
-        can quickly login in future.
-      </para>
-      <para>
-        In Personal Data Manager, you can view the sites for which passwords
-        have been stored, and delete them.
-      </para>
-      <itemizedlist>
-        <listitem>
-          <para>
-            To delete passwords, select all the entries you want to delete, and click the 
-            <guibutton>Delete</guibutton> button.
-          </para>
-        </listitem>
-      </itemizedlist>
-    </sect2>
+	<title>Managing Your Passwords and Cookies</title>
+	<para>
+	  &fr; stores your cookies and passwords in the Personal Data Manager
+	  which can be accessed by clicking <menuchoice> <guimenu>Edit</guimenu> 
+	  <guisubmenu>Personal Data</guisubmenu> </menuchoice>.
+	</para>
+	<sect2 id="managing-cookies">
+	  <title>Managing Cookies</title>
+	  <para>
+		Cookies allow web pages to store pieces of information which can then be accessed 
+		by the site when you next visit.
+	  </para>
+	  <para>
+		In Personal Data Manager, you can view the cookies stored on your 
+		computer and the details contained within them. You can also delete cookies.
+	  </para>
+	  <itemizedlist>
+		<listitem>
+		  <para>
+			To view the contents of a cookie, select its entry in the list and click 
+			<guibutton>Properties</guibutton>.
+		  </para>
+		</listitem>
+		<listitem>
+		  <para>
+			To delete cookies, select all the cookies you want to delete, and click the 
+			<guibutton>Delete</guibutton> button.
+		  </para>
+		</listitem>
+	  </itemizedlist>
+	  <para>
+		The cookies properties window shows you the following details:
+	  </para>
+	  <variablelist>
+		<varlistentry>
+		  <term>Content</term>
+		  <listitem>
+			<para>
+			  The content of the cookie.
+			</para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>Path</term>
+		  <listitem>
+			<para>
+			  The path within the domain for which the cookie is valid.
+			</para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>Send for</term>
+		  <listitem>
+			<para>
+			  When <guilabel>Any type of connection</guilabel>, the 
+			  cookie can be sent to any server. When <guilabel>Encrypted 
+			  connections only</guilabel>, the cookie will only be
+			  sent to secure servers.
+			</para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>Expires</term>
+		  <listitem>
+			<para>
+			  The date and time at which the cookie is no longer valid.
+			</para>
+		  </listitem>
+		</varlistentry>
+	  </variablelist>          
+	</sect2>
+	<sect2 id="managing-passwords">
+	  <title>Managing Passwords</title>
+	  <para>
+		Many web sites require you to log in using a username and password to gain access 
+		to some or all of the site. &fr; can remember the passwords for you so that you 
+		can quickly login in future.
+	  </para>
+	  <para>
+		In Personal Data Manager, you can view the sites for which passwords
+		have been stored, and delete them.
+	  </para>
+	  <itemizedlist>
+		<listitem>
+		  <para>
+			To delete passwords, select all the entries you want to delete, and click the 
+			<guibutton>Delete</guibutton> button.
+		  </para>
+		</listitem>
+	  </itemizedlist>
+	</sect2>
   </sect1>
 
 <!-- ============= Using the Download Manager ===================== -->
   <sect1 id="ephy-download-manager">
-      <title>Using the Download Manager</title>
-      <para>
-        When you are downloading files, the download manager provides you with details of the 
-        current downloads:
-      </para>
-      <itemizedlist>
-        <listitem>
-          <para>
-            The <guilabel>%</guilabel> column shows the progress of each download.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The <guilabel>Filename</guilabel> is the name of the downloading file. The folder 
-            which the file is downloaded to can be specified in <xref linkend="general-preferences"/>.
-            This column also shows the amount of the file downloaded and its total size.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            <guilabel>Remaining</guilabel> gives an estimation of the amount of time to completion.
-            This is a best guess and, depending on the reliability of your connection, this value may 
-            vary in accuracy.
-          </para>
-        </listitem>
-      </itemizedlist>
-      <para>
-        To cancel a download, select its entry in the download manager and click <guibutton>
-        Stop</guibutton>. 
-      </para>
-      <note>
-        <para>
-          Once all downloads have finished, or been cancelled, the download manager will close.
-        </para>
-      </note>
+	  <title>Using the Download Manager</title>
+	  <para>
+		When you are downloading files, the download manager provides you with details of the 
+		current downloads:
+	  </para>
+	  <itemizedlist>
+		<listitem>
+		  <para>
+			The <guilabel>%</guilabel> column shows the progress of each download.
+		  </para>
+		</listitem>
+		<listitem>
+		  <para>
+			The <guilabel>Filename</guilabel> is the name of the downloading file. The folder 
+			which the file is downloaded to can be specified in <xref linkend="general-preferences"/>.
+			This column also shows the amount of the file downloaded and its total size.
+		  </para>
+		</listitem>
+		<listitem>
+		  <para>
+			<guilabel>Remaining</guilabel> gives an estimation of the amount of time to completion.
+			This is a best guess and, depending on the reliability of your connection, this value may 
+			vary in accuracy.
+		  </para>
+		</listitem>
+	  </itemizedlist>
+	  <para>
+		To cancel a download, select its entry in the download manager and click <guibutton>
+		Stop</guibutton>. 
+	  </para>
+	  <note>
+		<para>
+		  Once all downloads have finished, or been cancelled, the download manager will close.
+		</para>
+	  </note>
   </sect1>
 
 <!-- ============= Certificates and Online Security =============== -->
   <sect1 id="ephy-certificates">
-    <title>Certificates &amp; Online Security</title>
-    <para>
-      When using sites which require you to login, or when using online
-      shopping, it is important to know that the information you submit 
-      is secure. &fr; offers a number of features to help you do this.
-    </para>
-    <sect2 id="identifying-secure-sites">
-      <title>Identifying Secure Sites</title>
-      <para>
-        When viewing web pages, &fr; displays a padlock icon 

-        which shows you whether the current site is secure. When the 
-        statusbar is visible, this icon will appear there, otherwise it
-        will be shown in the right-hand side of the address entry. In 
-        Fullscreen mode when the toolbar is hidden, the lock icon 
-        will be shown in the top right corner of the window on secure 
-        sites.
-      </para>
-      <variablelist>
-        <varlistentry>
-          <term>An unlocked padlock</term>
-          <listitem>
-            <para>
-              Indicates that this site is insecure.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>A locked padlock</term>
-          <listitem>
-            <para>
-              Indicates that this site is secure.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>A broken padlock</term>
-          <listitem>
-            <para>
-              Indicates that some parts of this page are secure, and others
-              are not. You should consider the page as a whole to be insecure.
-            </para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-    </sect2>
-    <sect2 id="using-certificate-viewer">
-      <title>Using Certificate Viewer</title>
-      <para>
-        The certificate viewer presents the details held within the certificate. 
-        The <guilabel>General</guilabel> tab provides the following details:
-      </para>
-      <variablelist>
-        <varlistentry>
-          <term>Common Name</term>
-          <listitem>
-            <para>
-              Shows either who issued the certificate, or the domain to which 
-              it was issued.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Organisation</term>
-          <listitem>
-            <para>
-              Shows the name of the issuing company, or the name of the company 
-              to which is was issued.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Organisational Unit</term>
-          <listitem>
-            <para>
-              Shows the division of the company which issued or received the certificate.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Serial Number</term>
-          <listitem>
-            <para>
-              A unique identifier for this certificate.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Issued On</term>
-          <listitem>
-            <para>
-              The date the certificate was issued.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Expires On</term>
-          <listitem>
-            <para>
-              The date the certificate expires.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>SHA1 Fingerprint</term>
-          <listitem>
-            <para>
-              An identifying string for this certificate. You can check with the 
-              issuing company that this string matches the certificate on their records.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>MD5 Fingerprint</term>
-          <listitem>
-            <para>
-              An identifying string for this certificate. You can check with the 
-              issuing company that this string matches the certificate on their records.
-            </para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-      <para>
-        The <guilabel>Details</guilabel> tab shows the following information:
-      </para>
-      <variablelist>
-        <varlistentry>
-          <term>Certificate Hierarchy</term>
-          <listitem>
-            <para>
-              Some certificates are signed by intermediate authorities who are in
-              turn signed by an authority at a higher level. This list displays
-              the complete certificate chain.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Certificate Fields</term>
-          <listitem>
-            <para>
-              Displays the fields as they appear in the certificate for the selected
-              certificate in the hierarchy.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Field Value</term>
-          <listitem>
-            <para>
-              Displays the value for the selected certificate field.
-            </para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-    </sect2>
+	<title>Certificates &amp; Online Security</title>
+	<para>
+	  When using sites which require you to login, or when using online
+	  shopping, it is important to know that the information you submit 
+	  is secure. &fr; offers a number of features to help you do this.
+	</para>
+	<sect2 id="identifying-secure-sites">
+	  <title>Identifying Secure Sites</title>
+	  <para>
+		When viewing web pages, &fr; displays a padlock icon 
+		which shows you whether the current site is secure. When the 
+		statusbar is visible, this icon will appear there, otherwise it
+		will be shown in the right-hand side of the address entry. In 
+		Fullscreen mode when the toolbar is hidden, the lock icon 
+		will be shown in the top right corner of the window on secure 
+		sites.
+	  </para>
+	  <variablelist>
+		<varlistentry>
+		  <term>An unlocked padlock</term>
+		  <listitem>
+			<para>
+			  Indicates that this site is insecure.
+			</para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>A locked padlock</term>
+		  <listitem>
+			<para>
+			  Indicates that this site is secure.
+			</para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>A broken padlock</term>
+		  <listitem>
+			<para>
+			  Indicates that some parts of this page are secure, and others
+			  are not. You should consider the page as a whole to be insecure.
+			</para>
+		  </listitem>
+		</varlistentry>
+	  </variablelist>
+	</sect2>
+	<sect2 id="using-certificate-viewer">
+	  <title>Using Certificate Viewer</title>
+	  <para>
+		The certificate viewer presents the details held within the certificate. 
+		The <guilabel>General</guilabel> tab provides the following details:
+	  </para>
+	  <variablelist>
+		<varlistentry>
+		  <term>Common Name</term>
+		  <listitem>
+			<para>
+			  Shows either who issued the certificate, or the domain to which 
+			  it was issued.
+			</para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>Organisation</term>
+		  <listitem>
+			<para>
+			  Shows the name of the issuing company, or the name of the company 
+			  to which is was issued.
+			</para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>Organisational Unit</term>
+		  <listitem>
+			<para>
+			  Shows the division of the company which issued or received the certificate.
+			</para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>Serial Number</term>
+		  <listitem>
+			<para>
+			  A unique identifier for this certificate.
+			</para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>Issued On</term>
+		  <listitem>
+			<para>
+			  The date the certificate was issued.
+			</para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>Expires On</term>
+		  <listitem>
+			<para>
+			  The date the certificate expires.
+			</para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>SHA1 Fingerprint</term>
+		  <listitem>
+			<para>
+			  An identifying string for this certificate. You can check with the 
+			  issuing company that this string matches the certificate on their records.
+			</para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>MD5 Fingerprint</term>
+		  <listitem>
+			<para>
+			  An identifying string for this certificate. You can check with the 
+			  issuing company that this string matches the certificate on their records.
+			</para>
+		  </listitem>
+		</varlistentry>
+	  </variablelist>
+	  <para>
+		The <guilabel>Details</guilabel> tab shows the following information:
+	  </para>
+	  <variablelist>
+		<varlistentry>
+		  <term>Certificate Hierarchy</term>
+		  <listitem>
+			<para>
+			  Some certificates are signed by intermediate authorities who are in
+			  turn signed by an authority at a higher level. This list displays
+			  the complete certificate chain.
+			</para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>Certificate Fields</term>
+		  <listitem>
+			<para>
+			  Displays the fields as they appear in the certificate for the selected
+			  certificate in the hierarchy.
+			</para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>Field Value</term>
+		  <listitem>
+			<para>
+			  Displays the value for the selected certificate field.
+			</para>
+		  </listitem>
+		</varlistentry>
+	  </variablelist>
+	</sect2>
   </sect1>
 
 <!-- ============= Customizing Epiphany =========================== -->
   <sect1 id="ephy-customize">
-      <title>Customizing &fr;</title>
-      <para>
-      </para>
+	  <title>Customizing &fr;</title>
+	  <para>
+	  </para>
 	<sect2 id="setting-preferences">
-          <title>Setting Your Preferences</title>
-          <para>
-            You can customize &fr; to suit your personal needs by using the Preferences 
-            dialog which can be accessed by selecting <menuchoice> <guimenu>Edit</guimenu> 
-            <guimenuitem>Preferences</guimenuitem> </menuchoice>.
-          </para>
-          <sect3 id="general-preferences">
-            <title>General Preferences</title>
-            <para>
-            </para>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  Choose the page displayed when the <guibutton>Home</guibutton>
-                  button on the toolbar is clicked, and also when &fr; is launched, by 
-                  entering an address in the <guilabel>Home page</guilabel> section.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  Choose the folder for downloaded files by clicking the <guilabel>
-                  Download folder</guilabel> button and selecting a folder. If you
-                  select <guilabel>Automatically download and open files</guilabel>
-                  you will not be prompted before files are download or opened.
-                </para>
-              </listitem>
-            </itemizedlist>
-          </sect3>
-          <sect3 id="fonts-and-colors-preferences">
-            <title>Fonts and Colors Preferences</title>
-            <para>
-              This section allows you to configure the style of text and the colors used
-              on web pages.
-            </para>
-            <para>
-              You can choose different font styles and sizes depending on the language 
-              that a page is written in. First select the language you want to configure 
-              from the <guilabel>For language</guilabel> drop-down list. To 
-              set the font for standard text, where the width of characters varies, 
-              use the <guilabel>Variable width</guilabel> drop down list 
-              and spin box. To set the font for fixed width text, where the width of 
-              characters is always the same, use the <guilabel>Fixed width</guilabel> 
-              drop down list and spin box.
-            </para>
-            <para>
-              You can also set a minimum size for web page fonts by using the <guilabel>
-              Minimum size</guilabel> spin box. Fonts smaller than this value will be 
-              increased to this size.
-            </para>
-            <para>
-              Web pages often specify their own font styles and sizes. You can make &fr; 
-              only use the fonts that you have chosen by selecting the <guilabel>Always 
-              use these fonts</guilabel> option.
-            </para>
-            <para>
-              Web pages may also specify their own colors for the background and for 
-              fonts. You can make &fr; always use the colors specifed by your current 
-              desktop theme by selecting the <guilabel>Always use the desktop theme 
-              colors</guilabel> option.
-            </para>
-          </sect3>
-          <sect3 id="privacy-preferences">
-            <title>Privacy Preferences</title>
-            <para>
-              &fr; allows you to configure a number of features which allow you to 
-              restrict what web pages can do:
-            </para>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  Select <guilabel>Allow popup windows</guilabel> if you want web pages 
-                  to be able to launch content in new windows automatically.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  Select <guilabel>Enable Java</guilabel> to allow pages to load Java 
-                  applets - programs which run inside web pages.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  Select <guilabel>Enable JavaScript</guilabel> to give web pages the
-                  capability to use the more advanced programming techniques of the 
-                  JavaScript language.
-                </para>
-              </listitem>
-            </itemizedlist>
-            <note>
-              <para>
-                Disabling these features may cause some pages to display incorrectly or
-                cause some loss of functionility. For Java to work, you need to install 
-                the Java plugin.
-              </para>
-            </note>
-            <para>
-              You can also configure how cookies are handled:
-            </para>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  Select <guilabel>Always accept</guilabel> to allow any site to set 
-                  cookies.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  Select <guilabel>Only from sites you visit</guilabel> to only allow 
-                  cookies to be set for sites which you have navigated to.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  Select <guilabel>Never accept</guilabel> to prevent sites from setting 
-                  cookies.
-                </para>
-              </listitem>
-            </itemizedlist>
-            <note>
-              <para>
-                Disabling or restricting cookies may disable access to parts of some sites or 
-                disable some of their features.
-              </para>
-            </note>
-            <para>
-              &fr; stores some of the content of web pages in temporary files to allow 
-              faster loading of the content when you next view them. The <guilabel>Disk 
-              space</guilabel> spin box allows you to specify the maximum amount of space 
-              &fr; can use for these files. Setting this value to zero will cause &fr; to 
-              never store temporary files. These temporary files can be removed by clicking 
-              the <guibutton>Clear</guibutton> button.
-            </para>
-          </sect3>
-          <sect3 id="language-preferences">
-            <title>Language Preferences</title>
-            <para>
-              The encoding of a page specifies the set of characters that are used in it.
-              The <guilabel>Encodings</guilabel> section configures how &fr; identifies
-              this set. The <guilabel>Default</guilabel> drop-down list allows 
-              you to set an encoding to fall back to when the page doesn't specify one.
-            </para>
-            <para>
-              The <guilabel>Autodetect</guilabel> drop-down list allows you to 
-              select a group of encodings from which &fr; will try to select to right 
-              encoding for the page if one is not specified. For example, if you normally 
-              visit Chinese pages, for which these may be several different encodings, 
-              you might set this to <guilabel>Chinese</guilabel>. To stop &fr; from 
-              trying to guess an encoding, select <guilabel>Off</guilabel>.
-            </para>
-            <para>
-              Some web sites have pages which are available in a number of different 
-              languages. You can set your prefered language by selecting an entry from
-              the <guilabel>Language</guilabel> drop down list. If you would
-              like to set one or more fall back languages, in case your prefered 
-              language isn't available, click <guibutton>More</guibutton> and add 
-              your back up languages to the list. Entries are listed in the order 
-              they will be checked with your prefered language at the top. You can 
-              reorder entries by dragging them.
-            </para>
-          </sect3>
-        </sect2>
+		  <title>Setting Your Preferences</title>
+		  <para>
+			You can customize &fr; to suit your personal needs by using the Preferences 
+			dialog which can be accessed by selecting <menuchoice> <guimenu>Edit</guimenu> 
+			<guimenuitem>Preferences</guimenuitem> </menuchoice>.
+		  </para>
+		  <sect3 id="general-preferences">
+			<title>General Preferences</title>
+			<para>
+			</para>
+			<itemizedlist>
+			  <listitem>
+				<para>
+				  Choose the page displayed when the <guibutton>Home</guibutton>
+				  button on the toolbar is clicked, and also when &fr; is launched, by 
+				  entering an address in the <guilabel>Home page</guilabel> section.
+				</para>
+			  </listitem>
+			  <listitem>
+				<para>
+				  Choose the folder for downloaded files by clicking the <guilabel>
+				  Download folder</guilabel> button and selecting a folder. If you
+				  select <guilabel>Automatically download and open files</guilabel>
+				  you will not be prompted before files are download or opened.
+				</para>
+			  </listitem>
+			</itemizedlist>
+		  </sect3>
+		  <sect3 id="fonts-and-colors-preferences">
+			<title>Fonts and Colors Preferences</title>
+			<para>
+			  This section allows you to configure the style of text and the colors used
+			  on web pages.
+			</para>
+			<para>
+			  You can choose different font styles and sizes depending on the language 
+			  that a page is written in. First select the language you want to configure 
+			  from the <guilabel>For language</guilabel> drop-down list. To 
+			  set the font for standard text, where the width of characters varies, 
+			  use the <guilabel>Variable width</guilabel> drop down list 
+			  and spin box. To set the font for fixed width text, where the width of 
+			  characters is always the same, use the <guilabel>Fixed width</guilabel> 
+			  drop down list and spin box.
+			</para>
+			<para>
+			  You can also set a minimum size for web page fonts by using the <guilabel>
+			  Minimum size</guilabel> spin box. Fonts smaller than this value will be 
+			  increased to this size.
+			</para>
+			<para>
+			  Web pages often specify their own font styles and sizes. You can make &fr; 
+			  only use the fonts that you have chosen by selecting the <guilabel>Always 
+			  use these fonts</guilabel> option.
+			</para>
+			<para>
+			  Web pages may also specify their own colors for the background and for 
+			  fonts. You can make &fr; always use the colors specifed by your current 
+			  desktop theme by selecting the <guilabel>Always use the desktop theme 
+			  colors</guilabel> option.
+			</para>
+		  </sect3>
+		  <sect3 id="privacy-preferences">
+			<title>Privacy Preferences</title>
+			<para>
+			  &fr; allows you to configure a number of features which allow you to 
+			  restrict what web pages can do:
+			</para>
+			<itemizedlist>
+			  <listitem>
+				<para>
+				  Select <guilabel>Allow popup windows</guilabel> if you want web pages 
+				  to be able to launch content in new windows automatically.
+				</para>
+			  </listitem>
+			  <listitem>
+				<para>
+				  Select <guilabel>Enable Java</guilabel> to allow pages to load Java 
+				  applets - programs which run inside web pages.
+				</para>
+			  </listitem>
+			  <listitem>
+				<para>
+				  Select <guilabel>Enable JavaScript</guilabel> to give web pages the
+				  capability to use the more advanced programming techniques of the 
+				  JavaScript language.
+				</para>
+			  </listitem>
+			</itemizedlist>
+			<note>
+			  <para>
+				Disabling these features may cause some pages to display incorrectly or
+				cause some loss of functionility. For Java to work, you need to install 
+				the Java plugin.
+			  </para>
+			</note>
+			<para>
+			  You can also configure how cookies are handled:
+			</para>
+			<itemizedlist>
+			  <listitem>
+				<para>
+				  Select <guilabel>Always accept</guilabel> to allow any site to set 
+				  cookies.
+				</para>
+			  </listitem>
+			  <listitem>
+				<para>
+				  Select <guilabel>Only from sites you visit</guilabel> to only allow 
+				  cookies to be set for sites which you have navigated to.
+				</para>
+			  </listitem>
+			  <listitem>
+				<para>
+				  Select <guilabel>Never accept</guilabel> to prevent sites from setting 
+				  cookies.
+				</para>
+			  </listitem>
+			</itemizedlist>
+			<note>
+			  <para>
+				Disabling or restricting cookies may disable access to parts of some sites or 
+				disable some of their features.
+			  </para>
+			</note>
+			<para>
+			  &fr; stores some of the content of web pages in temporary files to allow 
+			  faster loading of the content when you next view them. The <guilabel>Disk 
+			  space</guilabel> spin box allows you to specify the maximum amount of space 
+			  &fr; can use for these files. Setting this value to zero will cause &fr; to 
+			  never store temporary files. These temporary files can be removed by clicking 
+			  the <guibutton>Clear</guibutton> button.
+			</para>
+		  </sect3>
+		  <sect3 id="language-preferences">
+			<title>Language Preferences</title>
+			<para>
+			  The encoding of a page specifies the set of characters that are used in it.
+			  The <guilabel>Encodings</guilabel> section configures how &fr; identifies
+			  this set. The <guilabel>Default</guilabel> drop-down list allows 
+			  you to set an encoding to fall back to when the page doesn't specify one.
+			</para>
+			<para>
+			  The <guilabel>Autodetect</guilabel> drop-down list allows you to 
+			  select a group of encodings from which &fr; will try to select to right 
+			  encoding for the page if one is not specified. For example, if you normally 
+			  visit Chinese pages, for which these may be several different encodings, 
+			  you might set this to <guilabel>Chinese</guilabel>. To stop &fr; from 
+			  trying to guess an encoding, select <guilabel>Off</guilabel>.
+			</para>
+			<para>
+			  Some web sites have pages which are available in a number of different 
+			  languages. You can set your prefered language by selecting an entry from
+			  the <guilabel>Language</guilabel> drop down list. If you would
+			  like to set one or more fall back languages, in case your prefered 
+			  language isn't available, click <guibutton>More</guibutton> and add 
+			  your back up languages to the list. Entries are listed in the order 
+			  they will be checked with your prefered language at the top. You can 
+			  reorder entries by dragging them.
+			</para>
+		  </sect3>
+		</sect2>
 	<sect2 id="to-show-hide-window-components">
-          <title>To Show and Hide Browser Window Components</title>
-            <para>
-              You can show and hide browser window components as 
-              follows:
-            </para>
-      	    <itemizedlist>
-              <listitem>
-                <para>
-                  To hide the toolbars, choose <menuchoice>
-                  <guimenu>View</guimenu><guimenuitem>Toolbars
-                  </guimenuitem></menuchoice>. To display the
-                  toolbar again, choose <menuchoice><guimenu>
-                  View</guimenu><guimenuitem>Toolbars</guimenuitem>
-                  </menuchoice> again.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  To hide the bookmarks bar, choose <menuchoice>
-                  <guimenu>View</guimenu><guimenuitem>Bookmarks Bar
-                  </guimenuitem></menuchoice>. To display the bookmarks 
-                  bar again, choose <menuchoice><guimenu>View</guimenu>
-                  <guimenuitem>Bookmarks Bar</guimenuitem></menuchoice> 
-                  again.
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  To hide the statusbar, choose <menuchoice><guimenu>
-                  View</guimenu><guimenuitem>Statusbar</guimenuitem>
-                  </menuchoice>. To display the statusbar again, choose 
-                  <menuchoice><guimenu>View</guimenu><guimenuitem>
-                  Statusbar</guimenuitem></menuchoice> again.
-                </para>
-              </listitem> 
-           </itemizedlist>
-           <tip>
-             <para>
-               You can use fullscreen mode to make &fr; hide most of the window 
-               components. For details, see <xref linkend="using-fullscreen-mode"/>.
-             </para>
-           </tip>
-        </sect2>
+		  <title>To Show and Hide Browser Window Components</title>
+			<para>
+			  You can show and hide browser window components as 
+			  follows:
+			</para>
+			<itemizedlist>
+			  <listitem>
+				<para>
+				  To hide the toolbars, choose <menuchoice>
+				  <guimenu>View</guimenu><guimenuitem>Toolbars
+				  </guimenuitem></menuchoice>. To display the
+				  toolbar again, choose <menuchoice><guimenu>
+				  View</guimenu><guimenuitem>Toolbars</guimenuitem>
+				  </menuchoice> again.
+				</para>
+			  </listitem>
+			  <listitem>
+				<para>
+				  To hide the bookmarks bar, choose <menuchoice>
+				  <guimenu>View</guimenu><guimenuitem>Bookmarks Bar
+				  </guimenuitem></menuchoice>. To display the bookmarks 
+				  bar again, choose <menuchoice><guimenu>View</guimenu>
+				  <guimenuitem>Bookmarks Bar</guimenuitem></menuchoice> 
+				  again.
+				</para>
+			  </listitem>
+			  <listitem>
+				<para>
+				  To hide the statusbar, choose <menuchoice><guimenu>
+				  View</guimenu><guimenuitem>Statusbar</guimenuitem>
+				  </menuchoice>. To display the statusbar again, choose 
+				  <menuchoice><guimenu>View</guimenu><guimenuitem>
+				  Statusbar</guimenuitem></menuchoice> again.
+				</para>
+			  </listitem> 
+		   </itemizedlist>
+		   <tip>
+			 <para>
+			   You can use fullscreen mode to make &fr; hide most of the window 
+			   components. For details, see <xref linkend="using-fullscreen-mode"/>.
+			 </para>
+		   </tip>
+		</sect2>
 	<sect2 id="to-edit-toolbars">
-          <title>To Edit Your Toolbars</title>
-          <para>
-            You can customize the items which appear in your toolbars:
-          </para>
-          <itemizedlist>
-            <listitem>
-              <para>
-                To add or remove buttons from your toolbar, select 
-                <menuchoice><guimenu>Edit</guimenu><guimenuitem> 
-                Toolbars</guimenuitem></menuchoice>. Drag icons to and 
-                from the editor to add or remove them from your toolbar.
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                To add a new toolbar, click <guibutton>Add Toolbar
-                </guibutton> in the toolbar editor.
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                To remove a toolbar, remove all items from it. The 
-                toolbar will then automatically be removed.
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                Drag buttons, including bookmarks, to rearrange 
-                them either on the same toolbar 
-                or between different toolbars.
-              </para>
-             </listitem>
-           </itemizedlist>
-        </sect2>

-        <sect2 id="extending-epiphany">
-        <title>Extending &fr;</title>
-          <para>
-            Additional features can be added to &fr; by installing Extensions.

-            Examples of Extensions include Mouse Gestures which allows page 

-            navigation using cursor movements and Error Viewer and Validator 

-            which can check web pages for coding errors.
-          </para>

-          <para>

-            Please consult your system administrator to find out whether 

-            the extensions you require are installed, or see the <ulink
-            url="http://www.gnome.org/projects/epiphany/" type="http">Epiphany 
-            Web page</ulink> for installation instructions. 

-          </para>
-        </sect2>
+		  <title>To Edit Your Toolbars</title>
+		  <para>
+			You can customize the items which appear in your toolbars:
+		  </para>
+		  <itemizedlist>
+			<listitem>
+			  <para>
+				To add or remove buttons from your toolbar, select 
+				<menuchoice><guimenu>Edit</guimenu><guimenuitem> 
+				Toolbars</guimenuitem></menuchoice>. Drag icons to and 
+				from the editor to add or remove them from your toolbar.
+			  </para>
+			</listitem>
+			<listitem>
+			  <para>
+				To add a new toolbar, click <guibutton>Add Toolbar
+				</guibutton> in the toolbar editor.
+			  </para>
+			</listitem>
+			<listitem>
+			  <para>
+				To remove a toolbar, remove all items from it. The 
+				toolbar will then automatically be removed.
+			  </para>
+			</listitem>
+			<listitem>
+			  <para>
+				Drag buttons, including bookmarks, to rearrange 
+				them either on the same toolbar 
+				or between different toolbars.
+			  </para>
+			 </listitem>
+		   </itemizedlist>
+		</sect2>
+		<sect2 id="extending-epiphany">
+		<title>Extending &fr;</title>
+		  <para>
+			Additional features can be added to &fr; by installing Extensions.
+			Examples of Extensions include Mouse Gestures which allows page 
+			navigation using cursor movements and Error Viewer and Validator 
+			which can check web pages for coding errors.
+		  </para>
+		  <para>
+			Please consult your system administrator to find out whether 
+			the extensions you require are installed, or see the <ulink
+			url="http://www.gnome.org/projects/epiphany/" type="http">Epiphany 
+			Web page</ulink> for installation instructions. 
+		  </para>
+		</sect2>
   </sect1>
 
 <!-- ============= Shortcuts ===================================== -->
   <sect1 id="shortcuts">
-    <title>Shortcuts</title>
-    <para>
-    </para>
-    <sect2 id="keyboard-shortcuts">
-      <title>Keyboard Shortcuts</title>
-      <para>
-      </para>
-    <table frame="topbot" id="epiphany-TBL-3">
-      <title>General Shortcuts</title>
-      <tgroup cols="2" colsep="0" rowsep="0">
-        <colspec colname="colspec0" colwidth="29.39*"/>
-        <colspec colname="colspec1" colwidth="70.61*"/>
-        <thead>
-          <row rowsep="1">
-            <entry valign="top">
-              <para>
-                Shortcut
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Description
-              </para>
-            </entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                <keycap>Ctrl-O</keycap>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>
-                Open a file from a local folder.
-              </para>
-            </entry>
-          </row>
+	<title>Shortcuts</title>
+	<para>
+	</para>
+	<sect2 id="keyboard-shortcuts">
+	  <title>Keyboard Shortcuts</title>
+	  <para>
+	  </para>
+	<table frame="topbot" id="epiphany-TBL-3">
+	  <title>General Shortcuts</title>
+	  <tgroup cols="2" colsep="0" rowsep="0">
+		<colspec colname="colspec0" colwidth="29.39*"/>
+		<colspec colname="colspec1" colwidth="70.61*"/>
+		<thead>
+		  <row rowsep="1">
+			<entry valign="top">
+			  <para>
+				Shortcut
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Description
+			  </para>
+			</entry>
+		  </row>
+		</thead>
+		<tbody>
+		  <row>
+			<entry colname="colspec0" valign="top">
+			  <para>
+				<keycap>Ctrl-O</keycap>
+			  </para>
+			</entry>
+			<entry colname="colspec1" valign="top">
+			  <para>
+				Open a file from a local folder.
+			  </para>
+			</entry>
+		  </row>
 	  <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                <keycap>Shift-Ctrl-S</keycap>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>
-                Save the current document to a local folder.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>Ctrl-P</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Print the current document.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                <keycap>Ctrl-W</keycap>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>
-                Close the current tab or window.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                <keycap>F1</keycap>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>
-                Show help.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                <keycap>F7</keycap>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>
-                Toggle caret browsing mode.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                <keycap>Ctrl-D</keycap>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>
-                Bookmark current page.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                <keycap>Ctrl-B</keycap>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>
-                Show bookmarks manager.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                <keycap>Ctrl-H</keycap>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>
-                Show history manager.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                <keycap>Shift-Ctrl-T</keycap>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>
-                Toggle toolbar display.
-              </para>
-            </entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>   
+			<entry colname="colspec0" valign="top">
+			  <para>
+				<keycap>Shift-Ctrl-S</keycap>
+			  </para>
+			</entry>
+			<entry colname="colspec1" valign="top">
+			  <para>
+				Save the current document to a local folder.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>Ctrl-P</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Print the current document.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry colname="colspec0" valign="top">
+			  <para>
+				<keycap>Ctrl-W</keycap>
+			  </para>
+			</entry>
+			<entry colname="colspec1" valign="top">
+			  <para>
+				Close the current tab or window.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry colname="colspec0" valign="top">
+			  <para>
+				<keycap>F1</keycap>
+			  </para>
+			</entry>
+			<entry colname="colspec1" valign="top">
+			  <para>
+				Show help.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry colname="colspec0" valign="top">
+			  <para>
+				<keycap>F7</keycap>
+			  </para>
+			</entry>
+			<entry colname="colspec1" valign="top">
+			  <para>
+				Toggle caret browsing mode.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry colname="colspec0" valign="top">
+			  <para>
+				<keycap>Ctrl-D</keycap>
+			  </para>
+			</entry>
+			<entry colname="colspec1" valign="top">
+			  <para>
+				Bookmark current page.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry colname="colspec0" valign="top">
+			  <para>
+				<keycap>Ctrl-B</keycap>
+			  </para>
+			</entry>
+			<entry colname="colspec1" valign="top">
+			  <para>
+				Show bookmarks manager.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry colname="colspec0" valign="top">
+			  <para>
+				<keycap>Ctrl-H</keycap>
+			  </para>
+			</entry>
+			<entry colname="colspec1" valign="top">
+			  <para>
+				Show history manager.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry colname="colspec0" valign="top">
+			  <para>
+				<keycap>Shift-Ctrl-T</keycap>
+			  </para>
+			</entry>
+			<entry colname="colspec1" valign="top">
+			  <para>
+				Toggle toolbar display.
+			  </para>
+			</entry>
+		  </row>
+		</tbody>
+	  </tgroup>
+	</table>   
    <para>
    </para>
    <table frame="topbot" id="epiphany-TBL-4">
-      <title>Navigation Shortcuts</title>
-      <tgroup cols="2" colsep="0" rowsep="0">
-        <colspec colname="colspec0" colwidth="29.39*"/>
-        <colspec colname="colspec1" colwidth="70.61*"/>
-        <thead>
-          <row rowsep="1">
-            <entry valign="top">
-              <para>
-                Shortcut
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Description
-              </para>
-            </entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                <keycap>Ctrl-N</keycap>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>
-                Open a new window.
-              </para>
-            </entry>
-          </row>
+	  <title>Navigation Shortcuts</title>
+	  <tgroup cols="2" colsep="0" rowsep="0">
+		<colspec colname="colspec0" colwidth="29.39*"/>
+		<colspec colname="colspec1" colwidth="70.61*"/>
+		<thead>
+		  <row rowsep="1">
+			<entry valign="top">
+			  <para>
+				Shortcut
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Description
+			  </para>
+			</entry>
+		  </row>
+		</thead>
+		<tbody>
+		  <row>
+			<entry colname="colspec0" valign="top">
+			  <para>
+				<keycap>Ctrl-N</keycap>
+			  </para>
+			</entry>
+			<entry colname="colspec1" valign="top">
+			  <para>
+				Open a new window.
+			  </para>
+			</entry>
+		  </row>
 	  <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                <keycap>Ctrl-T</keycap>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>
-                Open a new tab.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                <keycap>Ctrl-L</keycap>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>
-                Focus the address bar.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>Alt-Left</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Go back.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>Alt-Right</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Go forward.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>Alt-Up</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Go up a level.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>Alt-Home</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Go to your home page.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>Esc</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Stop page loading.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>F6</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Switch to next frame.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>Shift-F6</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Switch to previous frame.
-              </para>
-            </entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table> 
+			<entry colname="colspec0" valign="top">
+			  <para>
+				<keycap>Ctrl-T</keycap>
+			  </para>
+			</entry>
+			<entry colname="colspec1" valign="top">
+			  <para>
+				Open a new tab.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry colname="colspec0" valign="top">
+			  <para>
+				<keycap>Ctrl-L</keycap>
+			  </para>
+			</entry>
+			<entry colname="colspec1" valign="top">
+			  <para>
+				Focus the address bar.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>Alt-Left</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Go back.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>Alt-Right</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Go forward.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>Alt-Up</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Go up a level.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>Alt-Home</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Go to your home page.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>Esc</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Stop page loading.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>F6</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Switch to next frame.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>Shift-F6</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Switch to previous frame.
+			  </para>
+			</entry>
+		  </row>
+		</tbody>
+	  </tgroup>
+	</table> 
    <para>
    </para>
    <table frame="topbot" id="epiphany-TBL-5">
-      <title>Tabbed Browsing Shortcuts</title>
-      <tgroup cols="2" colsep="0" rowsep="0">
-        <colspec colname="colspec0" colwidth="29.39*"/>
-        <colspec colname="colspec1" colwidth="70.61*"/>
-        <thead>
-          <row rowsep="1">
-            <entry valign="top">
-              <para>
-                Shortcut
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Description
-              </para>
-            </entry>
-          </row>
-        </thead>
-        <tbody> 
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>Ctrl-Page Up</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Focus next tab.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>Ctrl-Page Down</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Focus previous tab.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>Shift-Ctrl-Page Up</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Move tab left.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>Shift-Ctrl-Page Down</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Move tab right.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>Shift-Ctrl-M</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Detach tab.
-              </para>
-            </entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table> 
+	  <title>Tabbed Browsing Shortcuts</title>
+	  <tgroup cols="2" colsep="0" rowsep="0">
+		<colspec colname="colspec0" colwidth="29.39*"/>
+		<colspec colname="colspec1" colwidth="70.61*"/>
+		<thead>
+		  <row rowsep="1">
+			<entry valign="top">
+			  <para>
+				Shortcut
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Description
+			  </para>
+			</entry>
+		  </row>
+		</thead>
+		<tbody> 
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>Ctrl-Page Up</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Focus next tab.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>Ctrl-Page Down</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Focus previous tab.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>Shift-Ctrl-Page Up</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Move tab left.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>Shift-Ctrl-Page Down</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Move tab right.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>Shift-Ctrl-M</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Detach tab.
+			  </para>
+			</entry>
+		  </row>
+		</tbody>
+	  </tgroup>
+	</table> 
   <para>
   </para>
   <table frame="topbot" id="epiphany-TBL-6">
-      <title>Page Viewing Shortcuts</title>
-      <tgroup cols="2" colsep="0" rowsep="0">
-        <colspec colname="colspec0" colwidth="29.39*"/>
-        <colspec colname="colspec1" colwidth="70.61*"/>
-        <thead>
-          <row rowsep="1">
-            <entry valign="top">
-              <para>
-                Shortcut
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Description
-              </para>
-            </entry>
-          </row>
-        </thead>
-        <tbody> 
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>F11</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Toggle fullscreen mode.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>Ctrl-+</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Zoom text larger.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>Ctrl--</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Zoom text smaller.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>Ctrl-U</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                View page source.
-              </para>
-            </entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table> 
-    </sect2>
-    <sect2 id="mouse-shortcuts">
-      <title>Mouse Shortcuts</title>
-      <para>
-      </para>
-      <table frame="topbot" id="epiphany-TBL-7">
-      <title>Mouse Shortcuts</title>
-      <tgroup cols="2" colsep="0" rowsep="0">
-        <colspec colname="colspec0" colwidth="29.39*"/>
-        <colspec colname="colspec1" colwidth="70.61*"/>
-        <thead>
-          <row rowsep="1">
-            <entry valign="top">
-              <para>
-                Shortcut
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Description
-              </para>
-            </entry>
-          </row>
-        </thead>
-        <tbody> 
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>Middle-click (On a link)</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Open link in a new tab.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>Ctrl-Click (On a link)</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Open link in a new tab.
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
-                <keycap>Shift-Click (On a link)</keycap>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>
-                Download link.
-              </para>
-            </entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table> 
-    </sect2>
+	  <title>Page Viewing Shortcuts</title>
+	  <tgroup cols="2" colsep="0" rowsep="0">
+		<colspec colname="colspec0" colwidth="29.39*"/>
+		<colspec colname="colspec1" colwidth="70.61*"/>
+		<thead>
+		  <row rowsep="1">
+			<entry valign="top">
+			  <para>
+				Shortcut
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Description
+			  </para>
+			</entry>
+		  </row>
+		</thead>
+		<tbody> 
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>F11</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Toggle fullscreen mode.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>Ctrl-+</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Zoom text larger.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>Ctrl--</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Zoom text smaller.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>Ctrl-U</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				View page source.
+			  </para>
+			</entry>
+		  </row>
+		</tbody>
+	  </tgroup>
+	</table> 
+	</sect2>
+	<sect2 id="mouse-shortcuts">
+	  <title>Mouse Shortcuts</title>
+	  <para>
+	  </para>
+	  <table frame="topbot" id="epiphany-TBL-7">
+	  <title>Mouse Shortcuts</title>
+	  <tgroup cols="2" colsep="0" rowsep="0">
+		<colspec colname="colspec0" colwidth="29.39*"/>
+		<colspec colname="colspec1" colwidth="70.61*"/>
+		<thead>
+		  <row rowsep="1">
+			<entry valign="top">
+			  <para>
+				Shortcut
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Description
+			  </para>
+			</entry>
+		  </row>
+		</thead>
+		<tbody> 
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>Middle-click (On a link)</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Open link in a new tab.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>Ctrl-Click (On a link)</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Open link in a new tab.
+			  </para>
+			</entry>
+		  </row>
+		  <row>
+			<entry valign="top">
+			  <para>
+				<keycap>Shift-Click (On a link)</keycap>
+			  </para>
+			</entry>
+			<entry valign="top">
+			  <para>
+				Download link.
+			  </para>
+			</entry>
+		  </row>
+		</tbody>
+	  </tgroup>
+	</table> 
+	</sect2>
   </sect1>
 
 <!-- ============= About ========================================== -->
   <sect1 id="fr-about">
-    <title>About &fr;</title>
+	<title>About &fr;</title>
 
-    <para>
-      &fr; was written by Marco Presenti Gritti 
-      (<email>marco@gnome.org</email>). To find more information
-      about &fr;, please visit the <ulink
-      url="http://www.gnome.org/projects/epiphany/" type="http">Epiphany 
-      Web page</ulink>. 
-    </para>
+	<para>
+	  &fr; was written by Marco Presenti Gritti 
+	  (<email>marco@gnome.org</email>). To find more information
+	  about &fr;, please visit the <ulink
+	  url="http://www.gnome.org/projects/epiphany/" type="http">Epiphany 
+	  Web page</ulink>. 
+	</para>
 
-    <para>
-      This manual was written by David Bordoley 
-      (<email>bordoley@msu.edu</email>), Piers Cornwell 
-      (<email>piers@gnome.org</email>) and Patanjali Somayaji 
-      (<email>patanjali@codito.com</email>). 
-    </para>
+	<para>
+	  This manual was written by David Bordoley 
+	  (<email>bordoley@msu.edu</email>), Piers Cornwell 
+	  (<email>piers@gnome.org</email>) and Patanjali Somayaji 
+	  (<email>patanjali@codito.com</email>). 
+	</para>
 
-    <para>
-      This program is distributed under the terms of the GNU
-      General Public license as published by the Free Software
-      Foundation; either version 2 of the License, or (at your option)
-      any later version. A copy of this license can be found at this
-      <ulink url="ghelp:gpl" type="help">link</ulink>, or in the file
-      COPYING included with the source code of this program.
-    </para>
+	<para>
+	  This program is distributed under the terms of the GNU
+	  General Public license as published by the Free Software
+	  Foundation; either version 2 of the License, or (at your option)
+	  any later version. A copy of this license can be found at this
+	  <ulink url="ghelp:gpl" type="help">link</ulink>, or in the file
+	  COPYING included with the source code of this program.
+	</para>
   </sect1> 
 </article>
diff --git a/help/ChangeLog b/help/ChangeLog
index def55d6bb..9ac8d897a 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-19  Reinout van Schouwen <reinout@cs.vu.nl>
+
+	* C/epiphany.xml:
+	  Modify section on changing the Zoom factor
+
 2006-01-16  Reinout van Schouwen <reinout@cs.vu.nl>
 
 	*  C/figures/ephy-screenshot.png: 
diff --git a/po/ChangeLog b/po/ChangeLog
index 96789f205..84b2cbe26 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-19  Reinout van Schouwen <reinout@cs.vu.nl>
+
+	* nl.po: Updated Dutch translation
+
 2006-01-18  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
 	* es.po: Updated Spanish translation.
diff --git a/po/nl.po b/po/nl.po
index f33d94727..650efc410 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: epiphany.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-16 23:17+0100\n"
-"PO-Revision-Date: 2006-01-16 23:19+0100\n"
+"POT-Creation-Date: 2006-01-18 22:42+0100\n"
+"PO-Revision-Date: 2006-01-19 00:43+0100\n"
 "Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
@@ -162,8 +162,8 @@ msgstr "Epiphany webbrowser"
 # GNOME_epiphany_Automation.oaf.in.h:1
 # epiphany.desktop.in.h:2
 #. sets the name to appear in the window list applet when grouping windows
-#: ../data/epiphany.desktop.in.in.h:3 ../src/ephy-main.c:221
-#: ../src/ephy-main.c:232
+#: ../data/epiphany.desktop.in.in.h:3 ../src/ephy-main.c:223
+#: ../src/ephy-main.c:234
 msgid "Web Browser"
 msgstr "Webbrowser"
 
@@ -291,33 +291,45 @@ msgstr "Tijdspanne voor geschiedenis"
 msgid "Home page"
 msgstr "Startpagina"
 
-# src/mozilla_i18n.c:121
 #: ../data/epiphany.schemas.in.h:19
+msgid ""
+"How to present animated images. Possible values are \"normal\", \"once\" and "
+"\"disabled\"."
+msgstr ""
+"Hoe geanimeerde afbeeldingen worden getoond. Mogelijke waarden zijn " 
+"\"normal\", \"once\" en \"disabled\"."
+
+# src/mozilla_i18n.c:121
+#: ../data/epiphany.schemas.in.h:20
 msgid "ISO-8859-1"
 msgstr "ISO-8859-1"
 
+#: ../data/epiphany.schemas.in.h:21
+msgid "Image animation mode"
+msgstr "Afbeeldingsanimatiemodus"
+
 # src/prefs.c:397
 # ui/preferences.glade.h:103
-#: ../data/epiphany.schemas.in.h:20
+#: ../data/epiphany.schemas.in.h:22
 msgid "Languages"
 msgstr "Talen"
 
-#: ../data/epiphany.schemas.in.h:21
+#: ../data/epiphany.schemas.in.h:23
 msgid "Lists the active extensions."
 msgstr "Toont opsomming van actieve uitbreidingen."
 
-#: ../data/epiphany.schemas.in.h:22
+#: ../data/epiphany.schemas.in.h:24
 msgid "Match case for find in page"
 msgstr "Zoeken in pagina hoofdlettergevoelig"
 
-#: ../data/epiphany.schemas.in.h:23
+#: ../data/epiphany.schemas.in.h:25
 msgid ""
 "Middle click to open the web page pointed to by the currently selected text"
 msgstr ""
 "Klik met de middelste muisknop om de webpagina te openen waarnaar de op dit "
 "moment geselecteerde tekst verwijst."
 
-#: ../data/epiphany.schemas.in.h:24
+#: ../data/epiphany.schemas.in.h:26
 msgid ""
 "Middle clicking on the main view pane will open the web page pointed to by "
 "the currently selected text."
@@ -325,21 +337,25 @@ msgstr ""
 "Een middelste muisklik op het hoofdscherm zal de webpagina die op het "
 "klembord staat openen."
 
-#: ../data/epiphany.schemas.in.h:25
+#: ../data/epiphany.schemas.in.h:27
+msgid "Minimum font size"
+msgstr "Minimum lettergrootte"
+
+#: ../data/epiphany.schemas.in.h:28
 msgid "Preferred languages, two letter codes."
 msgstr "Voorkeurstalen, tweeletterige codes."
 
 # ui/preferences.glade.h:176
-#: ../data/epiphany.schemas.in.h:26
+#: ../data/epiphany.schemas.in.h:29
 msgid "Show bookmarks bar by default"
 msgstr "Standaard de bladwijzerwerkbalk weergeven"
 
 # ui/preferences.glade.h:175
-#: ../data/epiphany.schemas.in.h:27
+#: ../data/epiphany.schemas.in.h:30
 msgid "Show statusbar by default"
 msgstr "Standaard de statusbalk tonen"
 
-#: ../data/epiphany.schemas.in.h:28
+#: ../data/epiphany.schemas.in.h:31
 msgid ""
 "Show the history pages visited \"ever\", \"last_two_days\", \"last_three_days"
 "\", \"today\"."
@@ -347,29 +363,29 @@ msgstr ""
 "De geschiedenis weergeven van \"ever\" (alles), \"last_two_days\" (laatste "
 "twee dagen), \"last_three_days\" (laatste drie dagen), \"today\" (vandaag)."
 
-#: ../data/epiphany.schemas.in.h:29
+#: ../data/epiphany.schemas.in.h:32
 msgid "Show the tab bar also when there is only one tab open."
 msgstr "Tabbladen weergeven wanneer slechts 1 tabblad geopend is."
 
 # ui/preferences.glade.h:176
-#: ../data/epiphany.schemas.in.h:30
+#: ../data/epiphany.schemas.in.h:33
 msgid "Show toolbars by default"
 msgstr "Standaard de werkbalken tonen"
 
 # ui/preferences.glade.h:59
-#: ../data/epiphany.schemas.in.h:31
+#: ../data/epiphany.schemas.in.h:34
 msgid "Size of disk cache"
 msgstr "Schijfbuffergrootte"
 
-#: ../data/epiphany.schemas.in.h:32
+#: ../data/epiphany.schemas.in.h:35
 msgid "Size of disk cache, in MB."
 msgstr "Schijfbuffergrootte, in MB."
 
-#: ../data/epiphany.schemas.in.h:33
+#: ../data/epiphany.schemas.in.h:36
 msgid "The bookmark information shown in the editor view"
 msgstr "De getoonde bladwijzerinformatie in de editorweergave"
 
-#: ../data/epiphany.schemas.in.h:34
+#: ../data/epiphany.schemas.in.h:37
 msgid ""
 "The bookmark information shown in the editor view. Valid values in the list "
 "are \"address\" and \"title\"."
@@ -377,11 +393,11 @@ msgstr ""
 "De getoonde bladwijzerinformatie in de editorweergave. Geldige waardes in de "
 "lijst zijn \"address\" (adres) en \"title\" (titel)."
 
-#: ../data/epiphany.schemas.in.h:35
+#: ../data/epiphany.schemas.in.h:38
 msgid "The currently selected fonts language"
 msgstr "De taal van het op dit moment geselecteerde lettertype"
 
-#: ../data/epiphany.schemas.in.h:36
+#: ../data/epiphany.schemas.in.h:39
 msgid ""
 "The currently selected fonts language. Valid values are \"ar\" (arabic), \"x-"
 "baltic\" (baltic languages), \"x-central-euro\" (central european "
@@ -404,15 +420,15 @@ msgstr ""
 # src/context.c:62
 # src/history_callbacks.c:159
 # src/misc_callbacks.c:408
-#: ../data/epiphany.schemas.in.h:37
+#: ../data/epiphany.schemas.in.h:40
 msgid "The downloads folder"
 msgstr "De map voor downloads"
 
-#: ../data/epiphany.schemas.in.h:38
+#: ../data/epiphany.schemas.in.h:41
 msgid "The encoding autodetector. Empty string means autodetect is off"
 msgstr "De tekenset-autodetectie. Een lege tekenreeks zet de autodetectie uit"
 
-#: ../data/epiphany.schemas.in.h:39
+#: ../data/epiphany.schemas.in.h:42
 msgid ""
 "The encoding autodetector. Valid entries are \"\" (autodetectors off), "
 "\"cjk_parallel_state_machine\" (autodetect east asian encodings), "
@@ -435,11 +451,11 @@ msgstr ""
 "\" (autodetectie van traditionele chinese coderingen) en "
 "\"universal_charset_detector\" (meeste coderingen automatisch detecteren)."
 
-#: ../data/epiphany.schemas.in.h:40
+#: ../data/epiphany.schemas.in.h:43
 msgid "The page information shown in the history view"
 msgstr "De getoonde pagina-informatie in de geschiedenisweergave"
 
-#: ../data/epiphany.schemas.in.h:41
+#: ../data/epiphany.schemas.in.h:44
 msgid ""
 "The page information shown in the history view. Valid values in the list are "
 "\"address\", \"title\"."
@@ -447,7 +463,7 @@ msgstr ""
 "De getoonde pagina-informatie in de geschiedenisweergave. Geldige waarden in "
 "de lijst zijn \"address\" (adres) en \"title\" (titel)."
 
-#: ../data/epiphany.schemas.in.h:42
+#: ../data/epiphany.schemas.in.h:45
 msgid ""
 "The path of the folder where to download files to; or \"Downloads\" to use "
 "the default downloads folder, or \"Desktop\" to use the desktop folder."
@@ -457,11 +473,11 @@ msgstr ""
 "de bureaubladmap te gebruiken."
 
 # src/menubar.c:150
-#: ../data/epiphany.schemas.in.h:43
+#: ../data/epiphany.schemas.in.h:46
 msgid "Toolbar style"
 msgstr "Werkbalkstijl"
 
-#: ../data/epiphany.schemas.in.h:44
+#: ../data/epiphany.schemas.in.h:47
 msgid ""
 "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both"
 "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and "
@@ -472,29 +488,29 @@ msgstr ""
 "\"icons\", en \"text\"."
 
 # src/menubar.c:401
-#: ../data/epiphany.schemas.in.h:45
+#: ../data/epiphany.schemas.in.h:48
 msgid "Use own colors"
 msgstr "Eigen kleuren gebruiken"
 
 # src/menubar.c:396
-#: ../data/epiphany.schemas.in.h:46
+#: ../data/epiphany.schemas.in.h:49
 msgid "Use own fonts"
 msgstr "Eigen lettertypen gebruiken"
 
 # src/menubar.c:402
-#: ../data/epiphany.schemas.in.h:47
+#: ../data/epiphany.schemas.in.h:50
 msgid "Use your own colors instead of the colors the page requests."
 msgstr ""
 "Eigen kleuren gebruiken in plaats van de door het document gevraagde kleuren."
 
 # src/menubar.c:397
-#: ../data/epiphany.schemas.in.h:48
+#: ../data/epiphany.schemas.in.h:51
 msgid "Use your own fonts instead of the fonts the page requests."
 msgstr ""
 "Eigen lettertypen gebruiken in plaats van de door het document gevraagde "
 "lettertypen."
 
-#: ../data/epiphany.schemas.in.h:49
+#: ../data/epiphany.schemas.in.h:52
 msgid ""
 "When files cannot be opened by the browser they are automatically downloaded "
 "to the download folder and opened with the appropriate application."
@@ -502,7 +518,7 @@ msgstr ""
 "Wanneer de bestanden niet met de browser geopend kunnen worden, komen ze "
 "automatisch in de downloadmap terecht en opent de geschikte toepassing ze."
 
-#: ../data/epiphany.schemas.in.h:50
+#: ../data/epiphany.schemas.in.h:53
 msgid ""
 "Where to accept cookies from. Possible values are \"anywhere\", \"current "
 "site\" and \"nowhere\"."
@@ -511,26 +527,26 @@ msgstr ""
 "\" (overal vandaan), \"current site\" (huidige website) en \"nowhere"
 "\" (nooit)."
 
-#: ../data/epiphany.schemas.in.h:51
+#: ../data/epiphany.schemas.in.h:54
 msgid "Whether to print the date in the footer"
 msgstr "Of de datum afgedrukt moet worden in de voettekst"
 
-#: ../data/epiphany.schemas.in.h:52
+#: ../data/epiphany.schemas.in.h:55
 msgid "Whether to print the page address in the header"
 msgstr "Of het adres van de pagina moet worden afgedrukt in de koptekst."
 
-#: ../data/epiphany.schemas.in.h:53
+#: ../data/epiphany.schemas.in.h:56
 msgid "Whether to print the page numbers (x of total) in the footer"
 msgstr ""
 "Of de paginanummering (x van totaal) afgedrukt moet worden in de voettekst"
 
-#: ../data/epiphany.schemas.in.h:54
+#: ../data/epiphany.schemas.in.h:57
 msgid "Whether to print the page title in the header"
 msgstr "Of de paginatitel afgedrukt moet worden in de koptekst"
 
 # src/mozilla_i18n.c:39
 # ui/preferences.glade.h:212
-#: ../data/epiphany.schemas.in.h:55
+#: ../data/epiphany.schemas.in.h:58
 msgid "x-western"
 msgstr "x-western"
 
@@ -586,7 +602,7 @@ msgstr "Veld_waarde"
 
 # src/prefs.c:363
 #: ../data/glade/certificate-dialogs.glade.h:12
-#: ../data/glade/prefs-dialog.glade.h:23
+#: ../data/glade/prefs-dialog.glade.h:20
 msgid "General"
 msgstr "Algemeen"
 
@@ -635,7 +651,7 @@ msgstr "Cookies"
 # src/history_callbacks.c:159
 # src/misc_callbacks.c:408
 #. The name of the default downloads folder
-#: ../data/glade/epiphany.glade.h:4 ../lib/ephy-file-helpers.c:98
+#: ../data/glade/epiphany.glade.h:4 ../lib/ephy-file-helpers.c:101
 msgid "Downloads"
 msgstr "Downloads"
 
@@ -668,83 +684,63 @@ msgid "_Show password"
 msgstr "_Wachtwoord tonen"
 
 # ui/preferences.glade.h:50
-#: ../data/glade/prefs-dialog.glade.h:1 ../data/glade/print.glade.h:1
-msgid "<b>Colors</b>"
-msgstr "<b>Kleuren</b>"
-
-# ui/preferences.glade.h:50
-#: ../data/glade/prefs-dialog.glade.h:2
+#: ../data/glade/prefs-dialog.glade.h:1
 msgid "<b>Cookies</b>"
 msgstr "<b>Cookies</b>"
 
 # ui/preferences.glade.h:50
-#: ../data/glade/prefs-dialog.glade.h:3
+#: ../data/glade/prefs-dialog.glade.h:2
 msgid "<b>Downloads</b>"
 msgstr "<b>Downloads</b>"
 
 # src/menu_callbacks.c:1286
-#: ../data/glade/prefs-dialog.glade.h:4
+#: ../data/glade/prefs-dialog.glade.h:3
 msgid "<b>Encodings</b>"
 msgstr "<b>Coderingen</b>"
 
-# src/menu_callbacks.c:1286
-#: ../data/glade/prefs-dialog.glade.h:5
-msgid "<b>Fonts</b>"
-msgstr "<b>Lettertypen</b>"
-
 # src/menubar.c:473
-#: ../data/glade/prefs-dialog.glade.h:6
+#: ../data/glade/prefs-dialog.glade.h:4
 msgid "<b>Home page</b>"
 msgstr "<b>Startpagina</b>"
 
 # src/menu_callbacks.c:1286
-#: ../data/glade/prefs-dialog.glade.h:7
+#: ../data/glade/prefs-dialog.glade.h:5
 msgid "<b>Languages</b>"
 msgstr "<b>Talen</b>"
 
 # ui/preferences.glade.h:50
-#: ../data/glade/prefs-dialog.glade.h:8
+#: ../data/glade/prefs-dialog.glade.h:6
 msgid "<b>Temporary Files</b>"
 msgstr "<b>Tijdelijke bestanden</b>"
 
 # src/menu_callbacks.c:1286
-#: ../data/glade/prefs-dialog.glade.h:9
+#: ../data/glade/prefs-dialog.glade.h:7
 msgid "<b>Web Content</b>"
 msgstr "<b>Webinhoud</b>"
 
-#: ../data/glade/prefs-dialog.glade.h:10
+#: ../data/glade/prefs-dialog.glade.h:8
 msgid "A_utomatically download and open files"
 msgstr "Auto_matisch bestanden downloaden en openen"
 
 # src/prefs.c:397
 # ui/preferences.glade.h:103
-#: ../data/glade/prefs-dialog.glade.h:11
+#: ../data/glade/prefs-dialog.glade.h:9
 msgid "Add Language"
 msgstr "Taal toevoegen"
 
-# ui/preferences.glade.h:10
-#: ../data/glade/prefs-dialog.glade.h:12
-msgid "Al_ways use the desktop theme colors"
-msgstr "Altijd themakleuren ge_bruiken"
-
 # src/menubar.c:416
-#: ../data/glade/prefs-dialog.glade.h:13
+#: ../data/glade/prefs-dialog.glade.h:10
 msgid "Allow popup _windows"
 msgstr "Opduikvensters _toestaan"
 
-# ui/preferences.glade.h:18
-#: ../data/glade/prefs-dialog.glade.h:14
-msgid "Always use _these fonts"
-msgstr "Altijd de_ze lettertypen gebruiken"
-
 # ui/preferences.glade.h:28
-#: ../data/glade/prefs-dialog.glade.h:15
+#: ../data/glade/prefs-dialog.glade.h:11
 msgid "Au_todetect:"
 msgstr "Auto_detectie:"
 
 # src/prefs.c:397
 # ui/preferences.glade.h:103
-#: ../data/glade/prefs-dialog.glade.h:16
+#: ../data/glade/prefs-dialog.glade.h:12
 msgid "Choose a l_anguage:"
 msgstr "Kies een t_aal:"
 
@@ -753,72 +749,87 @@ msgstr "Kies een t_aal:"
 #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
 #. * Select All, Input Methods and Insert Unicode control character.)
 #.
-#: ../data/glade/prefs-dialog.glade.h:17
+#: ../data/glade/prefs-dialog.glade.h:13
 #: ../lib/widgets/ephy-location-entry.c:580 ../src/ephy-history-window.c:261
 msgid "Cl_ear"
 msgstr "_Wissen"
 
 # ui/preferences.glade.h:105
-#: ../data/glade/prefs-dialog.glade.h:18
+#: ../data/glade/prefs-dialog.glade.h:14
 msgid "De_fault:"
 msgstr "St_andaard:"
 
 # src/menubar.c:411
 # ui/preferences.glade.h:12
-#: ../data/glade/prefs-dialog.glade.h:19
+#: ../data/glade/prefs-dialog.glade.h:15
 msgid "Enable Java_Script"
 msgstr "Ja_vascript inschakelen"
 
-#: ../data/glade/prefs-dialog.glade.h:20
+#: ../data/glade/prefs-dialog.glade.h:16
 msgid "Enable _Java"
 msgstr "_Java inschakelen"
 
-# src/menubar.c:401
-#: ../data/glade/prefs-dialog.glade.h:21
-msgid "Fonts and Colors"
-msgstr "Lettertypen en kleuren"
+#: ../data/glade/prefs-dialog.glade.h:17
+msgid "Fonts"
+msgstr "Lettertypen"
+
+#: ../data/glade/prefs-dialog.glade.h:18
+msgid "Fonts & Style"
+msgstr "Lettertypen & Stijl"
 
 # src/prefs.c:397
 # ui/preferences.glade.h:103
-#: ../data/glade/prefs-dialog.glade.h:22
+#: ../data/glade/prefs-dialog.glade.h:19
 msgid "For l_anguage:"
 msgstr "Voor _taal:"
 
 # src/prefs.c:397
 # ui/preferences.glade.h:103
-#: ../data/glade/prefs-dialog.glade.h:24 ../src/prefs-dialog.c:1037
+#: ../data/glade/prefs-dialog.glade.h:21 ../src/prefs-dialog.c:1301
 msgid "Language"
 msgstr "Taal"
 
-#: ../data/glade/prefs-dialog.glade.h:25
+#: ../data/glade/prefs-dialog.glade.h:22
+msgid "Let web pages specify their own _colors"
+msgstr "Laat webpagina's hun eigen _kleuren bepalen"
+
+#: ../data/glade/prefs-dialog.glade.h:23
+msgid "Let web pages specify their own _fonts"
+msgstr "Laat webpagina's hun eigen lettert_ypen bepalen"
+
+#: ../data/glade/prefs-dialog.glade.h:24
 msgid "MB"
 msgstr "MB"
 
-#: ../data/glade/prefs-dialog.glade.h:26
+#: ../data/glade/prefs-dialog.glade.h:25
 msgid "Only _from sites you visit"
 msgstr "Alleen van webpagina's die u _bezoekt"
 
 # ui/preferences.glade.h:142
-#: ../data/glade/prefs-dialog.glade.h:27
+#: ../data/glade/prefs-dialog.glade.h:26
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../data/glade/prefs-dialog.glade.h:28
+#: ../data/glade/prefs-dialog.glade.h:27
 msgid "Privacy"
 msgstr "Privacy"
 
 # ui/preferences.glade.h:161
-#: ../data/glade/prefs-dialog.glade.h:29
+#: ../data/glade/prefs-dialog.glade.h:28
 msgid "Set to Current _Page"
 msgstr "Huidige _pagina instellen"
 
 # ui/preferences.glade.h:161
-#: ../data/glade/prefs-dialog.glade.h:30
+#: ../data/glade/prefs-dialog.glade.h:29
 msgid "Set to _Blank Page"
 msgstr "_Blanco pagina"
 
+#: ../data/glade/prefs-dialog.glade.h:30
+msgid "Use custom _stylesheet"
+msgstr "Aangepast stijl_blad gebruiken"
+
 #: ../data/glade/prefs-dialog.glade.h:31
-#: ../src/bookmarks/ephy-bookmark-properties.c:340
+#: ../src/bookmarks/ephy-bookmark-properties.c:596
 msgid "_Address:"
 msgstr "_Adres:"
 
@@ -826,36 +837,49 @@ msgstr "_Adres:"
 msgid "_Always accept"
 msgstr "_Altijd accepteren"
 
-# ui/preferences.glade.h:253
 #: ../data/glade/prefs-dialog.glade.h:33
+msgid "_Detailed Font Settings..."
+msgstr "Ge_detailleerde lettertypeninstellingen..."
+
+# ui/preferences.glade.h:253
+#: ../data/glade/prefs-dialog.glade.h:34
 msgid "_Disk space:"
 msgstr "_Schijfruimte:"
 
 # src/context.c:62
 # src/history_callbacks.c:159
 # src/misc_callbacks.c:408
-#: ../data/glade/prefs-dialog.glade.h:34
+#: ../data/glade/prefs-dialog.glade.h:35
 msgid "_Download folder:"
 msgstr "_Downloadmap:"
 
-#: ../data/glade/prefs-dialog.glade.h:35
+#: ../data/glade/prefs-dialog.glade.h:36
+msgid "_Edit Stylesheet..."
+msgstr "Stijlblad be_werken..."
+
+#: ../data/glade/prefs-dialog.glade.h:37
 msgid "_Fixed width:"
 msgstr "_Gelijke breedte:"
 
-#: ../data/glade/prefs-dialog.glade.h:36
+#: ../data/glade/prefs-dialog.glade.h:38
 msgid "_Minimum size:"
 msgstr "_Minimumgrootte:"
 
 # ui/preferences.glade.h:118
-#: ../data/glade/prefs-dialog.glade.h:37
+#: ../data/glade/prefs-dialog.glade.h:39
 msgid "_Never accept"
 msgstr "_Nooit accepteren"
 
-#: ../data/glade/prefs-dialog.glade.h:38
+#: ../data/glade/prefs-dialog.glade.h:40
 msgid "_Variable width:"
 msgstr "_Ongelijke breedte:"
 
 # ui/preferences.glade.h:50
+#: ../data/glade/print.glade.h:1
+msgid "<b>Colors</b>"
+msgstr "<b>Kleuren</b>"
+
+# ui/preferences.glade.h:50
 #: ../data/glade/print.glade.h:2
 msgid "<b>Footers</b>"
 msgstr "<b>Voettekst</b>"
@@ -941,7 +965,7 @@ msgstr ""
 # src/prefs_callbacks.c:237
 # src/prefs_callbacks.c:407
 #: ../embed/downloader-view.c:431 ../embed/downloader-view.c:436
-#: ../src/ephy-window.c:1465
+#: ../src/ephy-window.c:1469
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -988,6 +1012,11 @@ msgstr "%"
 msgid "Remaining"
 msgstr "Te gaan"
 
+#: ../embed/ephy-embed-shell.c:235
+msgid "Epiphany can't be used now. Mozilla initialization failed."
+msgstr ""
+"Epiphany kan nu niet gebruikt worden. Initialisatie van Mozilla mislukt."
+
 # src/mozilla_i18n.c:44
 #: ../embed/ephy-encodings.c:60
 msgid "Arabic (_IBM-864)"
@@ -1454,7 +1483,7 @@ msgid "Unknown (%s)"
 msgstr "Onbekend (%s)"
 
 # src/mozilla/mozilla.cpp:994
-#: ../embed/ephy-history.c:550
+#: ../embed/ephy-history.c:550 ../src/bookmarks/ephy-bookmark-properties.c:613
 msgid "All"
 msgstr "Alles"
 
@@ -1808,7 +1837,7 @@ msgstr "in het Internet Archive"
 # src/window.c:2279
 #: ../embed/mozilla/EphyHeaderSniffer.cpp:364
 #: ../src/bookmarks/ephy-bookmarks-import.c:245
-#: ../src/bookmarks/ephy-bookmarks-ui.c:481 ../src/ephy-session.c:775
+#: ../src/bookmarks/ephy-bookmarks.c:1111 ../src/ephy-session.c:775
 msgid "Untitled"
 msgstr "Naamloos"
 
@@ -2231,15 +2260,10 @@ msgstr "Bestanden"
 #. * in url-escaped UTF-8; that means that if you're choosing google,
 #. * the 'q=' part needs to come last.
 #.
-#: ../embed/mozilla/mozilla-embed-single.cpp:282
+#: ../embed/mozilla/mozilla-embed-single.cpp:293
 msgid "http://www.google.com/search?ie=UTF-8&oe=UTF-8&q="
 msgstr "http://www.google.nl/search?&ie=UTF-8&oe=UTF-8&q="
 
-#: ../embed/mozilla/mozilla-embed-single.cpp:682
-msgid "Epiphany can't be used now. Mozilla initialization failed."
-msgstr ""
-"Epiphany kan nu niet gebruikt worden. Initialisatie van Mozilla mislukt."
-
 #: ../embed/print-dialog.c:258
 msgid "Generating PDF is not supported"
 msgstr "Het genereren van een PDF is helaas niet mogelijk"
@@ -2275,7 +2299,7 @@ msgid "Sets the end of the range of pages to be printed"
 msgstr "Stelt het einde in van het af te drukken paginabereik"
 
 # src/toolbar.c:286
-#: ../embed/print-dialog.c:407 ../src/ephy-window.c:1285
+#: ../embed/print-dialog.c:407 ../src/ephy-window.c:1289
 msgid "Print"
 msgstr "Afdrukken"
 
@@ -2293,24 +2317,36 @@ msgid ""
 "GConf error:\n"
 "  %s"
 msgstr ""
-"GConf fout:\n"
+"GConf-fout:\n"
 "  %s"
 
 # src/menubar.c:150
-#: ../lib/egg/egg-editable-toolbar.c:487
+#: ../lib/egg/egg-editable-toolbar.c:1060
 msgid "_Move on Toolbar"
 msgstr "Ver_plaatsen op werkbalk"
 
+#: ../lib/egg/egg-editable-toolbar.c:1061
+msgid "Move the selected item on the toolbar"
+msgstr "Geselecteerd item op de werkbalk verplaatsen"
+
 # src/menubar.c:150
-#: ../lib/egg/egg-editable-toolbar.c:495
+#: ../lib/egg/egg-editable-toolbar.c:1062
 msgid "_Remove from Toolbar"
 msgstr "Ver_wijderen van werkbalk"
 
+#: ../lib/egg/egg-editable-toolbar.c:1063
+msgid "Remove the selected item from the toolbar"
+msgstr "Geselecteerd item van de werkbalk verwijderen"
+
 # src/menubar.c:150
-#: ../lib/egg/egg-editable-toolbar.c:524
+#: ../lib/egg/egg-editable-toolbar.c:1064
 msgid "_Remove Toolbar"
 msgstr "_Werkbalk verwijderen"
 
+#: ../lib/egg/egg-editable-toolbar.c:1065
+msgid "Remove the selected toolbar"
+msgstr "Geselecteerde werkbalk verwijderen"
+
 #: ../lib/egg/egg-toolbar-editor.c:439
 msgid "Separator"
 msgstr "Scheidingsteken"
@@ -2319,15 +2355,15 @@ msgstr "Scheidingsteken"
 msgid "All supported types"
 msgstr "Alle ondersteunde types"
 
-#: ../lib/ephy-file-helpers.c:327
+#: ../lib/ephy-file-helpers.c:330
 #, c-format
 msgid "\"%s\" exists, please move it out of the way."
-msgstr "'%s' bestaat. Haal het alstublieft uit de weg."
+msgstr "‘%s’ bestaat. Haal het alstublieft uit de weg."
 
-#: ../lib/ephy-file-helpers.c:333
+#: ../lib/ephy-file-helpers.c:336
 #, c-format
 msgid "Failed to create directory \"%s\"."
-msgstr "Kan de map '%s' niet aanmaken."
+msgstr "Kan de map ‘%s’ niet aanmaken."
 
 #: ../lib/ephy-gui.c:328
 #, c-format
@@ -2527,7 +2563,7 @@ msgid "select fonts for|Other Scripts"
 msgstr "Overige schriften"
 
 # src/menubar.c:416
-#: ../lib/ephy-stock-icons.c:54
+#: ../lib/ephy-stock-icons.c:55
 msgid "Popup Windows"
 msgstr "Opduikvensters"
 
@@ -2535,18 +2571,18 @@ msgstr "Opduikvensters"
 # src/toolbar.c:273
 # ui/epiphany.glade.h:78
 # ui/preferences.glade.h:88
-#: ../lib/ephy-stock-icons.c:55 ../src/ephy-history-window.c:1191
+#: ../lib/ephy-stock-icons.c:56 ../src/ephy-history-window.c:1179
 msgid "History"
 msgstr "Geschiedenis"
 
 # src/menubar.c:571
-#: ../lib/ephy-stock-icons.c:56 ../src/bookmarks/ephy-bookmarks-editor.c:684
+#: ../lib/ephy-stock-icons.c:57 ../src/bookmarks/ephy-bookmarks-editor.c:684
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1535
-#: ../src/bookmarks/ephy-topic-action.c:344 ../src/ephy-window.c:1291
+#: ../src/bookmarks/ephy-topic-action.c:402 ../src/ephy-window.c:1295
 msgid "Bookmarks"
 msgstr "Bladwijzers"
 
-#: ../lib/ephy-stock-icons.c:57 ../src/ephy-toolbar.c:312
+#: ../lib/ephy-stock-icons.c:58 ../src/ephy-toolbar.c:312
 msgid "Address Entry"
 msgstr "Adresingang"
 
@@ -2554,7 +2590,7 @@ msgstr "Adresingang"
 # src/context.c:62
 # src/history_callbacks.c:159
 # src/misc_callbacks.c:408
-#: ../lib/ephy-stock-icons.c:58
+#: ../lib/ephy-stock-icons.c:59
 msgid "_Download"
 msgstr "_Download"
 
@@ -2627,49 +2663,61 @@ msgstr "Epiphany desktopbestand-plugin"
 msgid "This plugin handles “.desktop” files containing web links."
 msgstr "Deze plugin kan ‘.desktop’-bestanden met webverwijzingen afhandelen."
 
-#: ../src/bookmarks/ephy-bookmark-action.c:284
+#: ../src/bookmarks/ephy-bookmark-action.c:287
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-# src/context.c:66
-#: ../src/bookmarks/ephy-bookmark-action.c:395
-#: ../src/bookmarks/ephy-bookmarks-editor.c:176
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1162
-#: ../src/ephy-history-window.c:173 ../src/ephy-history-window.c:711
-msgid "Open in New _Tab"
-msgid_plural "Open in New _Tabs"
-msgstr[0] "In nieuw _tabblad openen"
-msgstr[1] "In nieuwe _tabbladen openen"
-
-# src/context.c:60
-#. File Menu
-#: ../src/bookmarks/ephy-bookmark-action.c:401
-#: ../src/bookmarks/ephy-bookmarks-editor.c:173
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1159
-#: ../src/ephy-history-window.c:170 ../src/ephy-history-window.c:708
-msgid "Open in New _Window"
-msgid_plural "Open in New _Windows"
-msgstr[0] "In nieuw _venster openen"
-msgstr[1] "In nieuwe _vensters openen"
-
-#: ../src/bookmarks/ephy-bookmark-properties.c:225
+#: ../src/bookmarks/ephy-bookmark-properties.c:294
 #, c-format
 msgid "“%s” Properties"
 msgstr "‘%s’-eigenschappen"
 
+# ui/epiphany.glade.h:91
+#: ../src/bookmarks/ephy-bookmark-properties.c:433
+msgid "Open Icon"
+msgstr "Pictogram openen"
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:506
+msgid "From file..."
+msgstr "Van bestand..."
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:508
+msgid "None"
+msgstr "Geen"
+
+# ui/preferences.glade.h:105
+#: ../src/bookmarks/ephy-bookmark-properties.c:509 ../src/prefs-dialog.c:412
+msgid "Default"
+msgstr "Standaard"
+
 # ui/epiphany.glade.h:121
-#: ../src/bookmarks/ephy-bookmark-properties.c:321
-#: ../src/bookmarks/ephy-new-bookmark.c:231
+#: ../src/bookmarks/ephy-bookmark-properties.c:581
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:363
-#: ../src/bookmarks/ephy-new-bookmark.c:254
-msgid "To_pics:"
+#: ../src/bookmarks/ephy-bookmark-properties.c:604
+msgid "I_con:"
+msgstr "Pi_ctogram:"
+
+# ui/preferences.glade.h:195
+#: ../src/bookmarks/ephy-bookmark-properties.c:614
+#: ../src/bookmarks/ephy-topics-palette.c:274
+msgid "Subtopics"
+msgstr "Sub-onderwerpen"
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:615
+msgid "T_opics:"
 msgstr "_Onderwerpen:"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:134
+# ui/preferences.glade.h:195
+#. File Menu
+#: ../src/bookmarks/ephy-bookmark-properties.c:650
+#: ../src/bookmarks/ephy-bookmarks-editor.c:171
+msgid "_New Topic"
+msgstr "_Nieuw onderwerp"
+
+#: ../src/bookmarks/ephy-bookmarks-editor.c:135
 msgid "Remove from this topic"
 msgstr "Verwijderen uit dit onderwerp"
 
@@ -2677,7 +2725,7 @@ msgstr "Verwijderen uit dit onderwerp"
 # src/bookmarks_editor.c:1148
 # src/menubar.c:565
 #. Toplevel
-#: ../src/bookmarks/ephy-bookmarks-editor.c:163
+#: ../src/bookmarks/ephy-bookmarks-editor.c:164
 #: ../src/ephy-history-window.c:163 ../src/ephy-window.c:115
 msgid "_File"
 msgstr "_Bestand"
@@ -2685,7 +2733,7 @@ msgstr "_Bestand"
 # src/bookmarks_editor.c:946
 # src/bookmarks_editor.c:1149
 # src/menubar.c:566
-#: ../src/bookmarks/ephy-bookmarks-editor.c:164
+#: ../src/bookmarks/ephy-bookmarks-editor.c:165
 #: ../src/ephy-history-window.c:164 ../src/ephy-window.c:116
 msgid "_Edit"
 msgstr "Be_werken"
@@ -2693,77 +2741,91 @@ msgstr "Be_werken"
 # src/bookmarks_editor.c:950
 # src/bookmarks_editor.c:1150
 # src/menubar.c:567
-#: ../src/bookmarks/ephy-bookmarks-editor.c:165
+#: ../src/bookmarks/ephy-bookmarks-editor.c:166
 #: ../src/ephy-history-window.c:165 ../src/ephy-window.c:117
 msgid "_View"
 msgstr "Beel_d"
 
 # src/menubar.c:573
-#: ../src/bookmarks/ephy-bookmarks-editor.c:166
+#: ../src/bookmarks/ephy-bookmarks-editor.c:167
 #: ../src/ephy-history-window.c:166 ../src/ephy-window.c:122
 msgid "_Help"
 msgstr "_Hulp"
 
-# ui/preferences.glade.h:195
-#. File Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:170
-#: ../src/bookmarks/ephy-new-bookmark.c:294
-msgid "_New Topic"
-msgstr "_Nieuw onderwerp"
-
 # src/menubar.c:54
-#: ../src/bookmarks/ephy-bookmarks-editor.c:171
+#: ../src/bookmarks/ephy-bookmarks-editor.c:172
 msgid "Create a new topic"
 msgstr "Nieuw onderwerp aanmaken"
 
+# src/context.c:60
+#. File Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:174
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1159
+#: ../src/bookmarks/ephy-bookmarks-ui.c:268 ../src/ephy-history-window.c:170
+#: ../src/ephy-history-window.c:696
+msgid "Open in New _Window"
+msgid_plural "Open in New _Windows"
+msgstr[0] "In nieuw _venster openen"
+msgstr[1] "In nieuwe _vensters openen"
+
+#: ../src/bookmarks/ephy-bookmarks-editor.c:175
 msgid "Open the selected bookmark in a new window"
 msgstr "Geselecteerde bladwijzer openen in een nieuw venster"
 
+# src/context.c:66
 #: ../src/bookmarks/ephy-bookmarks-editor.c:177
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1162
+#: ../src/bookmarks/ephy-bookmarks-ui.c:257 ../src/ephy-history-window.c:173
+#: ../src/ephy-history-window.c:699
+msgid "Open in New _Tab"
+msgid_plural "Open in New _Tabs"
+msgstr[0] "In nieuw _tabblad openen"
+msgstr[1] "In nieuwe _tabbladen openen"
+
+#: ../src/bookmarks/ephy-bookmarks-editor.c:178
 msgid "Open the selected bookmark in a new tab"
 msgstr "Geselecteerde bladwijzer openen in een nieuw tabblad"
 
 # ui/epiphany.glade.h:103
-#: ../src/bookmarks/ephy-bookmarks-editor.c:179
+#: ../src/bookmarks/ephy-bookmarks-editor.c:180
 msgid "_Rename..."
 msgstr "_Hernoemen..."
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:180
+#: ../src/bookmarks/ephy-bookmarks-editor.c:181
 msgid "Rename the selected bookmark or topic"
 msgstr "Geselecteerde bladwijzer of onderwerp hernoemen"
 
 # src/bookmarks_editor.c:949
 # src/bookmarks_editor.c:1169
 # src/menubar.c:39
-#: ../src/bookmarks/ephy-bookmarks-editor.c:181
+#: ../src/bookmarks/ephy-bookmarks-editor.c:182
 #: ../src/ephy-history-window.c:176
 msgid "_Delete"
 msgstr "_Verwijderen"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:182
+#: ../src/bookmarks/ephy-bookmarks-editor.c:183
 msgid "Delete the selected bookmark or topic"
 msgstr "Geselecteerde bladwijzer of onderwerp verwijderen"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:184
+#: ../src/bookmarks/ephy-bookmarks-editor.c:185
 msgid "_Properties"
 msgstr "_Eigenschappen"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:185
+#: ../src/bookmarks/ephy-bookmarks-editor.c:186
 msgid "View or modify the properties of the selected bookmark"
 msgstr "Eigenschappen bekijken of bewerken van de geselecteerde bladwijzer"
 
 # src/bookmarks_editor.c:981
-#: ../src/bookmarks/ephy-bookmarks-editor.c:187
+#: ../src/bookmarks/ephy-bookmarks-editor.c:188
 msgid "_Import Bookmarks..."
 msgstr "Bladwijzers i_mporteren..."
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:188
+#: ../src/bookmarks/ephy-bookmarks-editor.c:189
 msgid "Import bookmarks from another browser or a bookmarks file"
 msgstr "Bladwijzers importeren van andere browser of bladwijzerbestand"
 
 # src/bookmarks_editor.c:981
-#: ../src/bookmarks/ephy-bookmarks-editor.c:190
+#: ../src/bookmarks/ephy-bookmarks-editor.c:191
 msgid "_Export Bookmarks..."
 msgstr "Bladwijzers e_xporteren..."
 
@@ -2771,20 +2833,20 @@ msgstr "Bladwijzers e_xporteren..."
 # src/prefs.c:365
 # src/toolbar.c:260
 # ui/bookmarks.glade.h:3
-#: ../src/bookmarks/ephy-bookmarks-editor.c:191
+#: ../src/bookmarks/ephy-bookmarks-editor.c:192
 msgid "Export bookmarks to a file"
 msgstr "Bladwijzers exporteren naar een bestand"
 
 # src/bookmarks_editor.c:945
 # src/menubar.c:91
-#: ../src/bookmarks/ephy-bookmarks-editor.c:193
+#: ../src/bookmarks/ephy-bookmarks-editor.c:194
 #: ../src/ephy-history-window.c:182 ../src/ephy-window.c:152
 msgid "_Close"
 msgstr "Sl_uiten"
 
 # GNOME_epiphany_Automation.oaf.in.h:1
 # epiphany.desktop.in.h:2
-#: ../src/bookmarks/ephy-bookmarks-editor.c:194
+#: ../src/bookmarks/ephy-bookmarks-editor.c:195
 msgid "Close the bookmarks window"
 msgstr "Bladwijzervenster sluiten"
 
@@ -2792,13 +2854,13 @@ msgstr "Bladwijzervenster sluiten"
 # src/window_callbacks.c:1145
 # src/window_callbacks.c:2880
 #. Edit Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:198
+#: ../src/bookmarks/ephy-bookmarks-editor.c:199
 #: ../src/ephy-history-window.c:187 ../src/ephy-window.c:164
 msgid "Cu_t"
 msgstr "K_nippen"
 
 # src/menubar.c:37
-#: ../src/bookmarks/ephy-bookmarks-editor.c:199
+#: ../src/bookmarks/ephy-bookmarks-editor.c:200
 #: ../src/ephy-history-window.c:188 ../src/ephy-window.c:165
 msgid "Cut the selection"
 msgstr "Selectie knippen"
@@ -2806,15 +2868,15 @@ msgstr "Selectie knippen"
 # src/bookmarks_editor.c:948
 # src/bookmarks_editor.c:1167
 # src/menubar.c:38
-#: ../src/bookmarks/ephy-bookmarks-editor.c:201
+#: ../src/bookmarks/ephy-bookmarks-editor.c:202
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1172
-#: ../src/ephy-history-window.c:190 ../src/ephy-history-window.c:721
+#: ../src/ephy-history-window.c:190 ../src/ephy-history-window.c:709
 #: ../src/ephy-window.c:167
 msgid "_Copy"
 msgstr "_Kopiëren"
 
 # src/menubar.c:38
-#: ../src/bookmarks/ephy-bookmarks-editor.c:202
+#: ../src/bookmarks/ephy-bookmarks-editor.c:203
 #: ../src/ephy-history-window.c:191 ../src/ephy-window.c:168
 msgid "Copy the selection"
 msgstr "Selectie kopiëren"
@@ -2822,87 +2884,86 @@ msgstr "Selectie kopiëren"
 # src/bookmarks_editor.c:949
 # src/bookmarks_editor.c:1169
 # src/menubar.c:39
-#: ../src/bookmarks/ephy-bookmarks-editor.c:204
+#: ../src/bookmarks/ephy-bookmarks-editor.c:205
 #: ../src/ephy-history-window.c:193 ../src/ephy-window.c:170
 msgid "_Paste"
 msgstr "_Plakken"
 
 # src/menubar.c:39
-#: ../src/bookmarks/ephy-bookmarks-editor.c:205
+#: ../src/bookmarks/ephy-bookmarks-editor.c:206
 #: ../src/ephy-history-window.c:194
 msgid "Paste the clipboard"
 msgstr "Plakken vanuit klembord"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:207
+#: ../src/bookmarks/ephy-bookmarks-editor.c:208
 #: ../src/ephy-history-window.c:196 ../src/ephy-window.c:173
 msgid "Select _All"
 msgstr "_Alles selecteren"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:208
+#: ../src/bookmarks/ephy-bookmarks-editor.c:209
 msgid "Select all bookmarks or text"
 msgstr "Alle bladwijzers of tekst selecteren"
 
 #. Help Menu
 #. Help menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:212
+#: ../src/bookmarks/ephy-bookmarks-editor.c:213
 #: ../src/ephy-history-window.c:204 ../src/ephy-window.c:264
 msgid "_Contents"
 msgstr "_Inhoud"
 
 # GNOME_epiphany_Automation.oaf.in.h:1
 # epiphany.desktop.in.h:2
-#: ../src/bookmarks/ephy-bookmarks-editor.c:213
+#: ../src/bookmarks/ephy-bookmarks-editor.c:214
 msgid "Display bookmarks help"
 msgstr "Hulp voor bladwijzers weergeven"
 
 # src/menubar.c:43
-#: ../src/bookmarks/ephy-bookmarks-editor.c:215
+#: ../src/bookmarks/ephy-bookmarks-editor.c:216
 #: ../src/ephy-history-window.c:207 ../src/ephy-window.c:267
 msgid "_About"
 msgstr "In_fo"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:216
+#: ../src/bookmarks/ephy-bookmarks-editor.c:217
 #: ../src/ephy-history-window.c:208 ../src/ephy-window.c:268
 msgid "Display credits for the web browser creators"
 msgstr "Namen van de webbrowser-auteurs weergeven"
 
 # ui/epiphany.glade.h:121
 #. View Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:229
+#: ../src/bookmarks/ephy-bookmarks-editor.c:230
 #: ../src/ephy-history-window.c:222
 msgid "_Title"
 msgstr "_Titel"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:230
+#: ../src/bookmarks/ephy-bookmarks-editor.c:231
 #: ../src/ephy-history-window.c:223
 msgid "Show only the title column"
 msgstr "Alleen de titelkolom weergeven"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:231
+#: ../src/bookmarks/ephy-bookmarks-editor.c:232
 #: ../src/ephy-history-window.c:226
 msgid "T_itle and Address"
 msgstr "_Titel en adres"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:232
+#: ../src/bookmarks/ephy-bookmarks-editor.c:233
 #: ../src/ephy-history-window.c:227
 msgid "Show both the title and address columns"
 msgstr "Zowel de titel- als adreskolom weergeven"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:273
-#: ../src/bookmarks/ephy-topics-selector.c:319
+#: ../src/bookmarks/ephy-bookmarks-editor.c:274
 msgid "Type a topic"
 msgstr "Geef een onderwerp"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:391
+#: ../src/bookmarks/ephy-bookmarks-editor.c:392
 #, c-format
 msgid "Delete topic “%s”?"
 msgstr "Onderwerp ‘%s’ verwijderen?"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:394
+#: ../src/bookmarks/ephy-bookmarks-editor.c:395
 msgid "Delete this topic?"
 msgstr "Dit onderwerp verwijderen?"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:396
+#: ../src/bookmarks/ephy-bookmarks-editor.c:397
 msgid ""
 "Deleting this topic will cause all its bookmarks to become uncategorized, "
 "unless they also belong to other topics. The bookmarks will not be deleted."
@@ -2914,7 +2975,7 @@ msgstr ""
 # src/bookmarks_editor.c:949
 # src/bookmarks_editor.c:1169
 # src/menubar.c:39
-#: ../src/bookmarks/ephy-bookmarks-editor.c:399
+#: ../src/bookmarks/ephy-bookmarks-editor.c:400
 msgid "_Delete Topic"
 msgstr "Onderwerp _verwijderen"
 
@@ -3031,29 +3092,28 @@ msgid "Import bookmarks from:"
 msgstr "Bladwijzers importeren uit:"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1168
-#: ../src/ephy-history-window.c:717
+#: ../src/ephy-history-window.c:705
 msgid "_Copy Address"
 msgstr "Adres _kopiëren"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1402
-#: ../src/ephy-history-window.c:1033
+#: ../src/ephy-history-window.c:1021
 msgid "_Search:"
 msgstr "_Zoeken:"
 
 # ui/preferences.glade.h:195
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1597
-#: ../src/bookmarks/ephy-topics-selector.c:198
 msgid "Topics"
 msgstr "Onderwerpen"
 
 # ui/epiphany.glade.h:121
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1667
-#: ../src/ephy-history-window.c:1316
+#: ../src/ephy-history-window.c:1304
 msgid "Title"
 msgstr "Titel"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1673
-#: ../src/ephy-history-window.c:1322
+#: ../src/ephy-history-window.c:1310
 msgid "Address"
 msgstr "Adres"
 
@@ -3062,49 +3122,49 @@ msgstr "Adres"
 #. * For instance in .nl these should be
 #. * "http://www.google.nl" and "http://www.google.nl/search?q=%s"
 #.
-#: ../src/bookmarks/ephy-bookmarks.c:96
+#: ../src/bookmarks/ephy-bookmarks.c:95
 msgid "Search the web"
 msgstr "Het web doorzoeken"
 
-#: ../src/bookmarks/ephy-bookmarks.c:96
+#: ../src/bookmarks/ephy-bookmarks.c:95
 #, c-format
 msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8"
 msgstr "http://www.google.nl/search?q=%s&ie=UTF-8&oe=UTF-8&"
 
-#: ../src/bookmarks/ephy-bookmarks.c:101
+#: ../src/bookmarks/ephy-bookmarks.c:100
 msgid "Entertainment"
 msgstr "Entertainment"
 
-#: ../src/bookmarks/ephy-bookmarks.c:102
+#: ../src/bookmarks/ephy-bookmarks.c:101
 msgid "News"
 msgstr "Nieuws"
 
 # src/menubar.c:477
-#: ../src/bookmarks/ephy-bookmarks.c:103
+#: ../src/bookmarks/ephy-bookmarks.c:102
 msgid "Shopping"
 msgstr "Winkelen"
 
-#: ../src/bookmarks/ephy-bookmarks.c:104
+#: ../src/bookmarks/ephy-bookmarks.c:103
 msgid "Sports"
 msgstr "Sport"
 
-#: ../src/bookmarks/ephy-bookmarks.c:105
+#: ../src/bookmarks/ephy-bookmarks.c:104
 msgid "Travel"
 msgstr "Reizen"
 
-#: ../src/bookmarks/ephy-bookmarks.c:106
+#: ../src/bookmarks/ephy-bookmarks.c:105
 msgid "Work"
 msgstr "Werk"
 
 # src/bookmarks_editor.c:981
 #. translators: the %s is the title of the bookmark
-#: ../src/bookmarks/ephy-bookmarks.c:471
+#: ../src/bookmarks/ephy-bookmarks.c:470
 #, c-format
 msgid "Update bookmark “%s”?"
 msgstr "Bladwijzer ‘%s’ bijwerken?"
 
 #. translators: the %s is a URL
-#: ../src/bookmarks/ephy-bookmarks.c:476
+#: ../src/bookmarks/ephy-bookmarks.c:475
 #, c-format
 msgid "The bookmarked page has moved to “%s”."
 msgstr "De pagina waar de bladwijzer naar verwijst is verhuisd naar ‘%s’."
@@ -3113,14 +3173,14 @@ msgstr "De pagina waar de bladwijzer naar verwijst is verhuisd naar ‘%s’."
 # src/prefs.c:365
 # src/toolbar.c:260
 # ui/bookmarks.glade.h:3
-#: ../src/bookmarks/ephy-bookmarks.c:480
+#: ../src/bookmarks/ephy-bookmarks.c:479
 msgid "_Don't Update"
 msgstr "_Niet bijwerken"
 
 # src/bookmarks_editor.c:949
 # src/bookmarks_editor.c:1169
 # src/menubar.c:39
-#: ../src/bookmarks/ephy-bookmarks.c:482
+#: ../src/bookmarks/ephy-bookmarks.c:481
 msgid "_Update"
 msgstr "_Bijwerken"
 
@@ -3128,7 +3188,7 @@ msgstr "_Bijwerken"
 # src/prefs.c:365
 # src/toolbar.c:260
 # ui/bookmarks.glade.h:3
-#: ../src/bookmarks/ephy-bookmarks.c:485
+#: ../src/bookmarks/ephy-bookmarks.c:484
 msgid "Update Bookmark?"
 msgstr "Bladwijzer bijwerken?"
 
@@ -3136,7 +3196,7 @@ msgstr "Bladwijzer bijwerken?"
 #. Translators: The text before the "|" is context to help you decide on
 #. * the correct translation. You MUST OMIT it in the translated string.
 #. Translators: this topic contains all bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:873
+#: ../src/bookmarks/ephy-bookmarks.c:869
 msgid "bookmarks|All"
 msgstr "Alle"
 
@@ -3144,14 +3204,14 @@ msgstr "Alle"
 #. Translators: The text before the "|" is context to help you decide on
 #. * the correct translation. You MUST OMIT it in the translated string.
 #. Translators: this topic contains the most used bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:909
+#: ../src/bookmarks/ephy-bookmarks.c:905
 msgid "bookmarks|Most Visited"
 msgstr "Meest bezocht"
 
 #. Translators: The text before the "|" is context to help you decide on
 #. * the correct translation. You MUST OMIT it in the translated string.
 #. Translators: this topic contains the not categorized bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:928
+#: ../src/bookmarks/ephy-bookmarks.c:924
 msgid "bookmarks|Not Categorized"
 msgstr "Niet ingedeeld"
 
@@ -3160,39 +3220,93 @@ msgstr "Niet ingedeeld"
 #. * the correct translation. You MUST OMIT it in the translated string.
 #. Translators: this is an automatic topic containing local websites bookmarks
 #. * autodiscovered with zeroconf.
-#: ../src/bookmarks/ephy-bookmarks.c:953
+#: ../src/bookmarks/ephy-bookmarks.c:949
 msgid "bookmarks|Local Sites"
 msgstr "Lokale pagina's"
 
+# src/bookmarks.c:245
+# src/prefs.c:365
+# src/toolbar.c:260
+# ui/bookmarks.glade.h:3
+#: ../src/bookmarks/ephy-bookmark-factory-action.c:316
+msgid "Quick Bookmark"
+msgstr "Snelle bladwijzer"
+
+#. Add popup menu actions that are specific to the bookmark widgets
+#: ../src/bookmarks/ephy-bookmarks-ui.c:246
+msgid "Properties"
+msgstr "Eigenschappen"
+
+# src/bookmarks_menus.c:525
+# ui/bookmarks.glade.h:47
+#: ../src/bookmarks/ephy-bookmarks-ui.c:247
+msgid "Show properties for this bookmark"
+msgstr "Eigenschappen van deze bladwijzer weergeven"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:258
+msgid "Open this bookmark in a new tab"
+msgstr "Deze bladwijzer openen in een nieuw tabblad"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:269
+msgid "Open this bookmark in a new window"
+msgstr "Deze bladwijzer openen in een nieuw venster"
+
 # src/menubar.c:571
-#: ../src/bookmarks/ephy-new-bookmark.c:275
-msgid "Add Bookmark"
-msgstr "Bladwijzer toevoegen"
+#: ../src/bookmarks/ephy-bookmarks-ui.c:453
+msgid "Bookmark exists"
+msgstr "Bladwijzer bestaat al"
 
-#: ../src/bookmarks/ephy-new-bookmark.c:312
+#: ../src/bookmarks/ephy-bookmarks-ui.c:456
 #, c-format
 msgid "You already have a bookmark titled “%s” for this page."
 msgstr "U heeft al een bladwijzer met de titel ‘%s’ voor deze pagina."
 
-#: ../src/bookmarks/ephy-new-bookmark.c:324
+#: ../src/bookmarks/ephy-bookmarks-ui.c:466
+msgid "_Create New"
+msgstr "Nieu_we maken"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:472
 msgid "_View Properties"
 msgstr "_Eigenschappen bekijken"
 
-# src/bookmarks.c:245
-# src/prefs.c:365
-# src/toolbar.c:260
-# ui/bookmarks.glade.h:3
-#: ../src/bookmarks/ephy-new-bookmark.c:329
-msgid "Duplicated Bookmark"
-msgstr "Dubbele bladwijzer"
+# src/menubar.c:571
+#: ../src/bookmarks/ephy-bookmarks-ui.c:481
+msgid "Bookmark Exists"
+msgstr "Bladwijzer bestaat al"
 
-# src/bookmarks.c:245
-# src/prefs.c:365
-# src/toolbar.c:260
-# ui/bookmarks.glade.h:3
-#: ../src/bookmarks/ephy-bookmark-factory-action.c:316
-msgid "Quick Bookmark"
-msgstr "Snelle bladwijzer"
+#: ../src/bookmarks/ephy-bookmarks-ui.c:569
+#, c-format
+msgid ""
+"You already have a topic named “%s”.\n"
+"Please use a new topic name."
+msgstr ""
+"U heeft al een onderwerp met de titel ‘%s’.\n"
+"Gebruik een nieuwe naam voor het onderwerp."
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:610
+#, c-format
+msgid "New topic for “%s”"
+msgstr "Nieuw onderwerp voor ‘%s’"
+
+# ui/preferences.glade.h:195
+#: ../src/bookmarks/ephy-bookmarks-ui.c:624
+msgid "New topic"
+msgstr "Nieuw onderwerp"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:628
+msgid "Enter a unique name for the topic."
+msgstr "Voer een unieke naam in voor het onderwerp."
+
+# src/menubar.c:468
+# ui/preferences.glade.h:262
+#: ../src/bookmarks/ephy-bookmarks-ui.c:660
+msgid "Create"
+msgstr "Maken"
+
+# ui/preferences.glade.h:195
+#: ../src/bookmarks/ephy-bookmarks-ui.c:663
+msgid "New Topic"
+msgstr "Nieuw onderwerp"
 
 # src/context.c:66
 #: ../src/bookmarks/ephy-open-tabs-action.c:64
@@ -3209,6 +3323,37 @@ msgstr "Gerelateerd"
 msgid "Quick Topic"
 msgstr "Snel onderwerp"
 
+# ui/preferences.glade.h:195
+#: ../src/bookmarks/ephy-topics-palette.c:203
+msgid "No topics"
+msgstr "Geen onderwerpen"
+
+# ui/preferences.glade.h:7
+#: ../src/bookmarks/ephy-topics-palette.c:273
+msgid "Selection"
+msgstr "Selectie"
+
+# src/bookmarks_editor.c:949
+# src/bookmarks_editor.c:1169
+# src/menubar.c:39
+#: ../src/bookmarks/ephy-topics-palette.c:273
+msgid "No selected topics"
+msgstr "Geen geselecteerde onderwerpen"
+
+#: ../src/bookmarks/ephy-topics-palette.c:274
+msgid "No more subtopics"
+msgstr "Geen sub-onderwerpen meer"
+
+# src/history.c:860
+# src/mozilla_i18n.c:40
+#: ../src/bookmarks/ephy-topics-palette.c:275
+msgid "Other"
+msgstr "Overige"
+
+#: ../src/bookmarks/ephy-topics-palette.c:275
+msgid "No other topics"
+msgstr "Geen andere onderwerpen"
+
 # src/prefs.c:385
 # ui/epiphany.glade.h:36
 #: ../src/ephy-encoding-dialog.c:340
@@ -3356,17 +3501,17 @@ msgstr ""
 msgid "Clear History"
 msgstr "Geschiedenis opschonen"
 
-#: ../src/ephy-history-window.c:1042
+#: ../src/ephy-history-window.c:1030
 msgid "Last 30 minutes"
 msgstr "Afgelopen 30 minuten"
 
-#: ../src/ephy-history-window.c:1043
+#: ../src/ephy-history-window.c:1031
 msgid "Today"
 msgstr "Vandaag"
 
 #. keep this in sync with embed/ephy-history.c's HISTORY_PAGE_OBSOLETE_DAYS
-#: ../src/ephy-history-window.c:1044 ../src/ephy-history-window.c:1047
-#: ../src/ephy-history-window.c:1051
+#: ../src/ephy-history-window.c:1032 ../src/ephy-history-window.c:1035
+#: ../src/ephy-history-window.c:1039
 #, c-format
 msgid "Last %d day"
 msgid_plural "Last %d days"
@@ -3374,45 +3519,45 @@ msgstr[0] "Laatste %d dag"
 msgstr[1] "Laatste %d dagen"
 
 # ui/epiphany.glade.h:109
-#: ../src/ephy-history-window.c:1253
+#: ../src/ephy-history-window.c:1241
 msgid "Sites"
 msgstr "Sites"
 
 # src/main.c:102
-#: ../src/ephy-main.c:58
+#: ../src/ephy-main.c:60
 msgid "Open a new tab in an existing window"
 msgstr "Een nieuw tabblad openen in een bestaand venster"
 
 # src/main.c:111
-#: ../src/ephy-main.c:61
+#: ../src/ephy-main.c:63
 msgid "Run in full screen mode"
 msgstr "In schermvullende modus uitvoeren"
 
-#: ../src/ephy-main.c:64
+#: ../src/ephy-main.c:66
 msgid "Load the given session file"
 msgstr "Het gegeven sessiebestand laden"
 
-#: ../src/ephy-main.c:65 ../src/ephy-main.c:71
+#: ../src/ephy-main.c:67 ../src/ephy-main.c:73
 msgid "FILE"
 msgstr "BESTAND"
 
 # src/main.c:133
-#: ../src/ephy-main.c:67
+#: ../src/ephy-main.c:69
 msgid "Add a bookmark (don't open any window)"
 msgstr "Voeg bladwijzer toe (zonder een nieuw venster te openen)"
 
 # src/main.c:134
 # ui/bookmarks.glade.h:41
 # ui/epiphany.glade.h:125
-#: ../src/ephy-main.c:68
+#: ../src/ephy-main.c:70
 msgid "URL"
 msgstr "URL"
 
-#: ../src/ephy-main.c:70
+#: ../src/ephy-main.c:72
 msgid "Import bookmarks from the given file"
 msgstr "Bladwijzers importeren van het gegeven bestand"
 
-#: ../src/ephy-main.c:73
+#: ../src/ephy-main.c:75
 msgid "Launch the bookmarks editor"
 msgstr "Bladwijzerbeheer starten"
 
@@ -4141,76 +4286,84 @@ msgstr "Afbeelding _gebruiken als achtergrond"
 msgid "Copy I_mage Address"
 msgstr "Afbeeldingsadres _kopiëren"
 
-#: ../src/ephy-window.c:703
+#: ../src/ephy-window.c:351
+msgid "St_art Animation"
+msgstr "A_nimatie starten"
+
+#: ../src/ephy-window.c:353
+msgid "St_op Animation"
+msgstr "Animatie st_oppen"
+
+#: ../src/ephy-window.c:707
 msgid "There are unsubmitted changes to form elements"
 msgstr "Er zijn niet-verstuurde wijzigingen in delen van het formulier"
 
-#: ../src/ephy-window.c:707
+#: ../src/ephy-window.c:711
 msgid "If you close the document anyway, you will lose that information."
 msgstr "Als u het document desondanks sluit, verliest u die informatie."
 
-#: ../src/ephy-window.c:711
+#: ../src/ephy-window.c:715
 msgid "Close _Document"
 msgstr "Do_cument sluiten"
 
 # src/bookmarks_editor.c:942
 # src/menubar.c:34
-#: ../src/ephy-window.c:1281 ../src/window-commands.c:295
+#: ../src/ephy-window.c:1285 ../src/window-commands.c:279
 msgid "Open"
 msgstr "Openen"
 
 # src/menubar.c:63
-#: ../src/ephy-window.c:1283 ../src/window-commands.c:321
+#: ../src/ephy-window.c:1287 ../src/window-commands.c:305
 msgid "Save As"
 msgstr "Opslaan als"
 
 # src/menubar.c:571
-#: ../src/ephy-window.c:1287
+#: ../src/ephy-window.c:1291
 msgid "Bookmark"
 msgstr "Bladwijzer"
 
 # src/toolbar.c:351
-#: ../src/ephy-window.c:1289
+#: ../src/ephy-window.c:1293
 msgid "Find"
 msgstr "Zoeken"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1302
+#: ../src/ephy-window.c:1306
 msgid "Larger"
 msgstr "Groter"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1305
+#: ../src/ephy-window.c:1309
 msgid "Smaller"
 msgstr "Kleiner"
 
-#: ../src/ephy-window.c:1468
+#: ../src/ephy-window.c:1472
 msgid "Insecure"
 msgstr "Onveilig"
 
 # src/mozilla/mozilla.cpp:996
 # src/persistent_data_manager.c:374
 # src/persistent_data_manager.c:609
-#: ../src/ephy-window.c:1473
+#: ../src/ephy-window.c:1477
 msgid "Broken"
 msgstr "Gebroken"
 
-#: ../src/ephy-window.c:1486
+#: ../src/ephy-window.c:1490
 msgid "Low"
 msgstr "Laag"
 
 # src/mozilla/mozilla.cpp:1982
-#: ../src/ephy-window.c:1493
+#: ../src/ephy-window.c:1497
 msgid "High"
 msgstr "Hoog"
 
-#: ../src/ephy-window.c:1503
+#: ../src/ephy-window.c:1507
 #, c-format
 msgid "Security level: %s"
 msgstr "Beveiligingsniveau: %s"
 
 # src/menubar.c:416
-#: ../src/ephy-window.c:1543
+#: ../src/ephy-window.c:1547
 #, c-format
 msgid "%d hidden popup window"
 msgid_plural "%d hidden popup windows"
@@ -4218,40 +4371,40 @@ msgstr[0] "%d verborgen opduikvenster"
 msgstr[1] "%d verborgen opduikvensters"
 
 # src/context.c:1075
-#: ../src/ephy-window.c:1838
+#: ../src/ephy-window.c:1842
 #, c-format
 msgid "Open image “%s”"
 msgstr "Afbeelding ‘%s’ openen"
 
 # src/context.c:68
-#: ../src/ephy-window.c:1843
+#: ../src/ephy-window.c:1847
 #, c-format
 msgid "Use as desktop background “%s”"
 msgstr "Gebruiken als werkbladachtergrond ‘%s’"
 
 # src/context.c:67
-#: ../src/ephy-window.c:1848
+#: ../src/ephy-window.c:1852
 #, c-format
 msgid "Save image “%s”"
 msgstr "Afbeelding ‘%s’ opslaan"
 
-#: ../src/ephy-window.c:1853
+#: ../src/ephy-window.c:1857
 #, c-format
 msgid "Copy image address “%s”"
 msgstr "Afbeeldingsadres ‘%s’ kopiëren"
 
-#: ../src/ephy-window.c:1866
+#: ../src/ephy-window.c:1870
 #, c-format
 msgid "Send email to address “%s”"
 msgstr "E-mail versturen naar adres ‘%s’"
 
-#: ../src/ephy-window.c:1872
+#: ../src/ephy-window.c:1876
 #, c-format
 msgid "Copy email address “%s”"
 msgstr "E-mailadres ‘%s’ kopiëren"
 
 # src/menubar.c:63
-#: ../src/ephy-window.c:1884
+#: ../src/ephy-window.c:1888
 #, c-format
 msgid "Save link “%s”"
 msgstr "Verwijzing ‘%s’ opslaan"
@@ -4259,12 +4412,12 @@ msgstr "Verwijzing ‘%s’ opslaan"
 # src/context.c:64
 # src/history_callbacks.c:165
 # src/misc_callbacks.c:412
-#: ../src/ephy-window.c:1890
+#: ../src/ephy-window.c:1894
 #, c-format
 msgid "Bookmark link “%s”"
 msgstr "Bladwijzer maken van verwijzing ‘%s’"
 
-#: ../src/ephy-window.c:1896
+#: ../src/ephy-window.c:1900
 #, c-format
 msgid "Copy link's address “%s”"
 msgstr "Verwijzing-adres ‘%s’ kopiëren"
@@ -4337,17 +4490,17 @@ msgstr "Gebruikerswachtwoord"
 # src/context.c:62
 # src/history_callbacks.c:159
 # src/misc_callbacks.c:408
-#: ../src/popup-commands.c:239
+#: ../src/popup-commands.c:232
 msgid "Download Link"
 msgstr "Verwijzing downloaden"
 
 # src/menubar.c:63
-#: ../src/popup-commands.c:247
+#: ../src/popup-commands.c:240
 msgid "Save Link As"
 msgstr "Verwijzing opslaan als"
 
 # src/context.c:67
-#: ../src/popup-commands.c:254
+#: ../src/popup-commands.c:247
 msgid "Save Image As"
 msgstr "Afbeelding opslaan als"
 
@@ -4410,7 +4563,7 @@ msgstr "Afdrukvoorbeeld sluiten"
 #.
 #. Translators: The text before the "|" is context to help you decide on
 #. * the correct translation. You MUST OMIT it in the translated string.
-#: ../src/prefs-dialog.c:729 ../src/prefs-dialog.c:737
+#: ../src/prefs-dialog.c:993 ../src/prefs-dialog.c:1001
 #, c-format
 msgid "language|%s (%s)"
 msgstr "%s (%s)"
@@ -4420,43 +4573,43 @@ msgstr "%s (%s)"
 #. * Translators: this refers to a user-define language code
 #. * (one which isn't in our built-in list).
 #.
-#: ../src/prefs-dialog.c:748
+#: ../src/prefs-dialog.c:1012
 #, c-format
 msgid "language|User defined (%s)"
 msgstr "Gebruikergedefinieerd (%s)"
 
 # src/prefs.c:397
 # ui/preferences.glade.h:103
-#: ../src/prefs-dialog.c:770
+#: ../src/prefs-dialog.c:1034
 #, c-format
 msgid "System language (%s)"
 msgid_plural "System languages (%s)"
 msgstr[0] "Systeemtaal (%s)"
 msgstr[1] "Systeemtalen (%s)"
 
-#: ../src/prefs-dialog.c:1157
+#: ../src/prefs-dialog.c:1421
 msgid "Select a Directory"
 msgstr "Kies een map"
 
-#: ../src/window-commands.c:726 ../src/window-commands.c:743
+#: ../src/window-commands.c:710 ../src/window-commands.c:727
 msgid "Contact us at:"
 msgstr "Wij zijn te bereiken op:"
 
-#: ../src/window-commands.c:729
+#: ../src/window-commands.c:713
 msgid "Contributors:"
 msgstr "Met bijdragen van:"
 
-#: ../src/window-commands.c:734
+#: ../src/window-commands.c:718
 msgid "Past developers:"
 msgstr "Ex-ontwikkelaars:"
 
-#: ../src/window-commands.c:744
+#: ../src/window-commands.c:728
 msgid "<epiphany-list@gnome.org> or <gnome-doc-list@gnome.org>"
 msgstr "<epiphany-list@gnome.org> of <gnome-doc-list@gnome.org>"
 
 # GNOME_epiphany_Automation.oaf.in.h:1
 # epiphany.desktop.in.h:2
-#: ../src/window-commands.c:749
+#: ../src/window-commands.c:733
 msgid "GNOME Web Browser"
 msgstr "GNOME-webbrowser"
 
@@ -4468,7 +4621,7 @@ msgstr "GNOME-webbrowser"
 #. * this translation; in that case, please write each of them on a separate
 #. * line seperated by newlines (\n).
 #.
-#: ../src/window-commands.c:763
+#: ../src/window-commands.c:747
 msgid "translator-credits"
 msgstr ""
 "Vincent van Adrighem \n"
@@ -4480,10 +4633,37 @@ msgstr ""
 
 # GNOME_epiphany_Automation.oaf.in.h:1
 # epiphany.desktop.in.h:2
-#: ../src/window-commands.c:766
+#: ../src/window-commands.c:750
 msgid "GNOME Web Browser Website"
 msgstr "Webstek van de GNOME-webbrowser"
 
+# src/menu_callbacks.c:1286
+#~ msgid "<b>Fonts</b>"
+#~ msgstr "<b>Lettertypen</b>"
+
+# ui/preferences.glade.h:10
+#~ msgid "Al_ways use the desktop theme colors"
+#~ msgstr "Altijd themakleuren ge_bruiken"
+
+# ui/preferences.glade.h:18
+#~ msgid "Always use _these fonts"
+#~ msgstr "Altijd de_ze lettertypen gebruiken"
+
+# src/menubar.c:401
+#~ msgid "Fonts and Colors"
+#~ msgstr "Lettertypen en kleuren"
+
+# src/menubar.c:571
+#~ msgid "Add Bookmark"
+#~ msgstr "Bladwijzer toevoegen"
+
+# src/bookmarks.c:245
+# src/prefs.c:365
+# src/toolbar.c:260
+# ui/bookmarks.glade.h:3
+#~ msgid "Duplicated Bookmark"
+#~ msgstr "Dubbele bladwijzer"
+
 # ui/epiphany.glade.h:63
 #~ msgid "Epiphany automation"
 #~ msgstr "Epiphany automatisering"
@@ -4630,10 +4810,6 @@ msgstr "Webstek van de GNOME-webbrowser"
 #~ msgid "_Show in Bookmarks Bar"
 #~ msgstr "_Weergeven in bladwijzerwerkbalk"
 
-#~ msgid "Show the selected bookmark or topic in the bookmarks bar"
-#~ msgstr ""
-#~ "Geselecteerde bladwijzer of onderwerp weergeven in de bladwijzerwerkbalk"
-
 #~ msgid "Empty"
 #~ msgstr "Leeg"
 
@@ -4645,11 +4821,6 @@ msgstr "Webstek van de GNOME-webbrowser"
 #~ msgid "_Bookmarks Bar"
 #~ msgstr "_Bladwijzerwerkbalk"
 
-# src/bookmarks_menus.c:525
-# ui/bookmarks.glade.h:47
-#~ msgid "Show or hide bookmarks bar"
-#~ msgstr "Bladwijzerwerkbalk weergeven/verbergen"
-
 # src/context.c:80
 #~ msgid "_Save Background As..."
 #~ msgstr "Achtergrond _opslaan als..."
@@ -4848,13 +5019,6 @@ msgstr "Webstek van de GNOME-webbrowser"
 #~ msgid "_Right:"
 #~ msgstr "_Rechts:"
 
-# ui/preferences.glade.h:7
-#~ msgid "_Selection"
-#~ msgstr "_Selectie"
-
-#~ msgid "_to:"
-#~ msgstr "_tot:"
-
 #~ msgid ""
 #~ "The server may be busy or you may have a networkconnection problem. Try "
 #~ "again later."