Imported Upstream version 2.0

3 files changed, 217 insertions, 112 deletions

diff --git a/docs/handbook/fi/docbook/hdbk-config.docbook b/docs/handbook/fi/docbook/hdbk-config.docbook
index 86932de..9e7cdea 100644
--- a/docs/handbook/fi/docbook/hdbk-config.docbook
+++ b/docs/handbook/fi/docbook/hdbk-config.docbook
@@ -4,7 +4,7 @@
 asetetaan. Ohjelmassa tämä löytyy päävalikon <guimenu>Asetukset</guimenu> 
 -kohdasta.</para>
   <sect1 id="hdbk-config-bt">
-    <title>Aseta &bibletime; -ikkuna</title>
+    <title>Configure &bibletime; Dialog</title>
     <para>&bibletime; käyttöliittymä voidaan muokata monella tavalla tarpeittesi 
 mukaan. Pääset asetusikkunaan valitsemalla 
 <menuchoice><guimenu>Asetukset</guimenu></menuchoice> <guimenuitem>Aseta 
diff --git a/docs/handbook/fi/docbook/hdbk-operation.docbook b/docs/handbook/fi/docbook/hdbk-operation.docbook
index 6066e82..1abd686 100644
--- a/docs/handbook/fi/docbook/hdbk-operation.docbook
+++ b/docs/handbook/fi/docbook/hdbk-operation.docbook
@@ -177,7 +177,7 @@ of a bible that you're reading) just like you are used to from other
 programs. This function can be reached either by clicking with the 
 <mousebutton>right</mousebutton>mouse button and selecting 
 <guimenuitem>Find...</guimenuitem>, or by using the hotkey <keycombo 
-action="simul">&Ctrl; <keycap>F</keycap></keycombo>. Read on to learn how 
+action="simul"> <keycap>&Ctrl;F</keycap></keycombo>. Read on to learn how 
 you can search in entire works.</para>
     </sect2>
 
@@ -264,8 +264,8 @@ number H8077, use 'strong:H8077'.</para>
             </tbody>
           </tgroup>
         </table></para>
-        <para>BibleTime käyttää Lucene-hakukonetta hakuihisi. Siinä on monta 
-edistyksellistä ominaisuutta ja voit lukea niistä lisää osoitteessa: <ulink 
+        <para>&bibletime; uses the Lucene search engine to perform your searches. It has 
+many advanced features, and you can read more about it here: <ulink 
 url="http://lucene.apache.org/java/docs/index.html"> 
 http://lucene.apache.org/java/docs/index.html</ulink></para>
       </sect3>
diff --git a/docs/handbook/fi/docbook/hdbk-reference.docbook b/docs/handbook/fi/docbook/hdbk-reference.docbook
index 7fba391..fde9e2a 100644
--- a/docs/handbook/fi/docbook/hdbk-reference.docbook
+++ b/docs/handbook/fi/docbook/hdbk-reference.docbook
@@ -18,8 +18,8 @@ section</link>.</para>
             <term>
               <menuchoice>
                 <shortcut>
-                  <keycombo action="simul">&Ctrl;
-                  <keycap>Q</keycap></keycombo>
+                  <keycombo action="simul">
+                  <keycap>&Ctrl;Q</keycap></keycombo>
                 </shortcut>
                 <guimenu>
                 <inlinemediaobject>
@@ -32,8 +32,8 @@ section</link>.</para>
             </term>
             <listitem>
               <para>
-              <action>Sulkee BibleTime-ohjelman.</action> BibleTime kysyy sinulta, 
-haluatko tallettaa tallentamattomat muutokset levylle.</para>
+              <action>Closes &bibletime;.</action> &bibletime; will ask you if you want to 
+write unsaved changes to disk.</para>
             </listitem>
           </varlistentry>
         </variablelist>
@@ -129,8 +129,8 @@ piilotetuksi.</para>
           <term>
             <menuchoice>
               <shortcut>
-                <keycombo action="simul">&Alt;&Ctrl;
-                <keycap>F</keycap></keycombo>
+                <keycombo action="simul">
+                <keycap>&Ctrl;&Alt;F</keycap></keycombo>
               </shortcut>
               <guimenu>
               <inlinemediaobject>
@@ -151,8 +151,8 @@ teoksia voidaan lisätä hakuikkunassa.</para>
           <term>
             <menuchoice>
               <shortcut>
-                <keycombo action="simul">&Ctrl;
-                <keycap>O</keycap></keycombo>
+                <keycombo action="simul">
+                <keycap>&Ctrl;O</keycap></keycombo>
               </shortcut>
               <guimenu>
               <inlinemediaobject>
@@ -171,23 +171,21 @@ teoksia voidaan lisätä hakuikkunassa.</para>
         </varlistentry>
       </variablelist>
     </sect2>
+
     <sect2 id="hdbk-reference-menus-window">
       <title>
         <guimenu>Window</guimenu>
       </title>
+
       <variablelist>
         <varlistentry id="hdbk-reference-menus-window-savesession">
           <term>
             <menuchoice>
-              <guimenu>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="i_sidetree.png" format="PNG" />
-                </imageobject>
-              </inlinemediaobject>Window</guimenu>
+              <guimenu> Window</guimenu>
               <guimenuitem>Save session</guimenuitem>
             </menuchoice>
           </term>
+
           <listitem>
             <para>
             <action>Tallettaa suoraan nykyisen istunnon</action>. Tämä avaa 
@@ -196,91 +194,152 @@ talletettavaksi. Se korvaataan nykyisellä istunnollasi. Katso seuraavasta,
 miten istunnon voi tallettaa uudeksi istunnoksi.</para>
           </listitem>
         </varlistentry>
+
         <varlistentry id="hdbk-reference-menus-window-savenewsession">
           <term>
             <menuchoice>
               <shortcut>
-                <keycombo action="simul">&Alt;&Ctrl;
-                <keycap>S</keycap></keycombo>
+                <keycombo action="simul">
+                <keycap>&Ctrl;&Alt;S</keycap></keycombo>
               </shortcut>
-              <guimenu>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="i_sidetree.png" format="PNG" />
-                </imageobject>
-              </inlinemediaobject>Window</guimenu>
-              <guimenuitem>Save as new Session</guimenuitem>
+              <guimenu>Window</guimenu>
+              <guimenuitem>Save as new session</guimenuitem>
             </menuchoice>
           </term>
+
           <listitem>
             <para>
             <action>Tallettaa nykyisen istunnon uudella nimellä</action>. Tämä kysyy 
 uutta nimeä istunnon talletukselle.</para>
           </listitem>
         </varlistentry>
+
         <varlistentry id="hdbk-reference-menus-window-loadsession">
           <term>
             <menuchoice>
+              <guimenu>Window</guimenu>
+              <guimenuitem>Load session</guimenuitem>
+            </menuchoice>
+          </term>
+
+          <listitem>
+            <para>
+            <action>Lataa olemassaolevan istunnon</action>. Tämä avaa kontekstivalikon, 
+josta voit valita olemassaolevan istunnon ladattavaksi.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="hdbk-reference-menus-window-deletesession">
+          <term>
+            <menuchoice>
+              <guimenu>Window</guimenu>
+              <guimenuitem>Delete session</guimenuitem>
+            </menuchoice>
+          </term>
+
+          <listitem>
+            <para>
+            <action>Poistaa olemassaolevan istunnon</action>. Tämä avaa 
+kontekstivalikon, jossa voit valita olemassaolevan istunnon poistettavaksi.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="hdbk-reference-menus-window-arrangement_mode">
+          <term>
+            <menuchoice>
+              <guimenu>Window</guimenu>
+              <guimenuitem>Arrangement mode</guimenuitem>
+            </menuchoice>
+          </term>
+
+          <listitem>
+            <para>
+            <action>Controls the basic window arrangement behaviour</action>. In the 
+opening context menu, you can either specify that you want to take care of 
+the window arrangement yourself (Manual mode) or have &bibletime; handle it 
+for you (Automatic modes, just try them out!).</para>
+          </listitem>
+        </varlistentry>
+
+        <!--- TODO add submen items here -->
+<varlistentry id="hdbk-reference-menus-window-cascade">
+          <term>
+            <menuchoice>
+              <shortcut>
+                <keycombo action="simul">
+                <keycap>&Ctrl;J</keycap></keycombo>
+              </shortcut>
               <guimenu>
               <inlinemediaobject>
                 <imageobject>
-                  <imagedata fileref="i_sidetree.png" format="PNG" />
+                  <imagedata fileref="i_cascade.png" format="PNG" />
                 </imageobject>
               </inlinemediaobject>Window</guimenu>
-              <guimenuitem>Load session</guimenuitem>
+              <guimenuitem>Cascade</guimenuitem>
             </menuchoice>
           </term>
+
           <listitem>
             <para>
-            <action>Lataa olemassaolevan istunnon</action>. Tämä avaa kontekstivalikon, 
-josta voit valita olemassaolevan istunnon ladattavaksi.</para>
+	      <action>Cascades all open windows</action>.
+	    </para>
           </listitem>
         </varlistentry>
-        <varlistentry id="hdbk-reference-menus-window-deletesession">
+
+        <varlistentry id="hdbk-reference-menus-window-tilevertically">
           <term>
             <menuchoice>
+              <shortcut>
+                <keycombo action="simul">
+                <keycap>&Ctrl;G</keycap></keycombo>
+              </shortcut>
               <guimenu>
               <inlinemediaobject>
                 <imageobject>
-                  <imagedata fileref="i_sidetree.png" format="PNG" />
+                  <imagedata fileref="i_tile_vert.png" format="PNG" />
                 </imageobject>
               </inlinemediaobject>Window</guimenu>
-              <guimenuitem>Delete session</guimenuitem>
+              <guimenuitem>Tile vertically</guimenuitem>
             </menuchoice>
           </term>
+
           <listitem>
             <para>
-            <action>Poistaa olemassaolevan istunnon</action>. Tämä avaa 
-kontekstivalikon, jossa voit valita olemassaolevan istunnon poistettavaksi.</para>
+	      <action>Automatically tiles all open windows vertically</action>.
+	    </para>
           </listitem>
         </varlistentry>
-        <varlistentry id="hdbk-reference-menus-window-arrangement_mode">
+
+        <varlistentry id="hdbk-reference-menus-window-tilehorizontally">
           <term>
             <menuchoice>
+              <shortcut>
+                <keycombo action="simul">
+                <keycap>&Ctrl;H</keycap></keycombo>
+              </shortcut>
               <guimenu>
               <inlinemediaobject>
                 <imageobject>
-                  <imagedata fileref="i_cascade_auto.png"
-                  format="PNG" />
+                  <imagedata fileref="i_tile_horiz.png" format="PNG" />
                 </imageobject>
               </inlinemediaobject>Window</guimenu>
-              <guimenuitem>Arrangement mode</guimenuitem>
+              <guimenuitem>Tile horizontally</guimenuitem>
             </menuchoice>
           </term>
+
           <listitem>
             <para>
-            <action>Controls the basic window arrangement behaviour</action>. In the 
-opening context menu, you can either specify that you want to take care of 
-the window arrangement yourself (Manual mode) or have &bibletime; handle it 
-for you (Automatical modes, just try them out!).</para>
+	      <action>Automatically tiles all open windows horizontally</action>.
+	    </para>
           </listitem>
         </varlistentry>
+
         <varlistentry id="hdbk-reference-menus-window-closeall">
           <term>
             <menuchoice>
               <shortcut>
-                <keycombo action="simul">&Alt;&Ctrl;
-                <keycap>W</keycap></keycombo>
+                <keycombo action="simul">
+                <keycap>&Ctrl;&Alt;W</keycap></keycombo>
               </shortcut>
               <guimenu>
               <inlinemediaobject>
@@ -291,6 +350,7 @@ for you (Automatical modes, just try them out!).</para>
               <guimenuitem>Close all</guimenuitem>
             </menuchoice>
           </term>
+
           <listitem>
             <para>
             <action>Sulkee kaikki avoimet ikkunat</action>.</para>
@@ -298,6 +358,7 @@ for you (Automatical modes, just try them out!).</para>
         </varlistentry>
       </variablelist>
     </sect2>
+
     <sect2 id="hdbk-reference-menus-settings">
       <title>
         <guimenu>Settings</guimenu>
@@ -449,151 +510,195 @@ can look it up in <link linkend="hdbk-reference-menus">this section</link>.</par
         <tbody>
           <row>
             <entry>
-              <keycombo action="simul">&Alt;
-              <keycap>Left</keycap></keycombo>
+              <keycombo action="simul">
+              <keycap>&Alt;Left</keycap></keycombo>
             </entry>
             <entry>Siirtyy lukuikkunan historiassa taaksepäin.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">&Alt;
-              <keycap>Right</keycap></keycombo>
+              <keycombo action="simul">
+              <keycap>&Alt;Right</keycap></keycombo>
             </entry>
             <entry>Siirtyy lukuikkunan historiassa eteenpäin</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">&Alt;&Ctrl;
-              <keycap>F</keycap></keycombo>
+              <keycombo action="simul">
+              <keycap>&Ctrl;&Alt;F</keycap></keycombo>
             </entry>
             <entry>
             <link linkend="hdbk-reference-menus-search-defaultbible"> <menuchoice> 
 <guimenu>Search</guimenu> <guimenuitem>Search in default bible</guimenuitem> 
-</menuchoice> </link>equivalent; opens the search dialog to search in the 
+</menuchoice> </link> equivalent; opens the search dialog to search in the 
 default bible.</entry>
           </row>
+
           <row>
             <entry>
-              <keycombo action="simul">&Alt;&Ctrl;
-              <keycap>G</keycap></keycombo>
+              <keycombo action="simul">
+              <keycap>&Ctrl;&Alt;G</keycap></keycombo>
             </entry>
+
             <entry>
-            <menuchoice> <guimenu>Window</guimenu> <guimenuitem>Arrangement 
+	      <menuchoice> <guimenu>Window</guimenu> <guimenuitem>Arrangement 
 mode</guimenuitem> <guimenuitem>Auto-tile vertically</guimenuitem> 
-</menuchoice>equivalent; toggle automatic window tiling.</entry>
+</menuchoice> equivalent; toggle automatic window tiling.
+	    </entry>
           </row>
+
           <row>
             <entry>
-              <keycombo action="simul">&Alt;&Ctrl;
-              <keycap>H</keycap></keycombo>
+              <keycombo action="simul">
+              <keycap>&Ctrl;&Alt;H</keycap></keycombo>
             </entry>
             <entry>
             <menuchoice> <guimenu>Window</guimenu> <guimenuitem>Arrangement 
 mode</guimenuitem> <guimenuitem>Auto-tile horizontally</guimenuitem> 
-</menuchoice>equivalent; toggle automatic window tiling.</entry>
+</menuchoice> equivalent; toggle automatic window tiling.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">&Alt;&Ctrl;
-              <keycap>J</keycap></keycombo>
+              <keycombo action="simul">
+              <keycap>&Ctrl;&Alt;J</keycap></keycombo>
             </entry>
             <entry>
-            <menuchoice> <guimenu>Ikkuna</guimenu> 
-<guimenuitem>Sijoittelutila</guimenuitem> <guimenuitem>Sarjoita 
-automaattisesti</guimenuitem> </menuchoice> automaattinen ikkunoiden 
-sarjoitus pois/päälle.</entry>
+            <menuchoice> <guimenu>Window</guimenu> <guimenuitem>Arrangement 
+mode</guimenuitem> <guimenuitem>Auto-cascade</guimenuitem> </menuchoice> 
+equivalent; toggle automatic window cascading.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">&Alt;&Ctrl;
-              <keycap>M</keycap></keycombo>
+              <keycombo action="simul">
+              <keycap>&Ctrl;&Alt;M</keycap></keycombo>
             </entry>
             <entry>
-            <menuchoice> <guimenu>Ikkuna</guimenu> 
-<guimenuitem>Sijoittelutila</guimenuitem> 
-<guimenuitem>Manuaalinen</guimenuitem> </menuchoice> aseta ikkunoita 
-manuaalisesti.</entry>
+            <menuchoice> <guimenu>Window</guimenu> <guimenuitem>Arrangement 
+mode</guimenuitem> <guimenuitem>Manual mode</guimenuitem> </menuchoice> 
+equivalent; toggle manual window placement.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">&Alt;&Ctrl;
-              <keycap>S</keycap></keycombo>
+              <keycombo action="simul">
+              <keycap>&Ctrl;&Alt;S</keycap></keycombo>
             </entry>
             <entry>
             <link linkend="hdbk-reference-menus-window-savenewsession"> <menuchoice> 
-<guimenu>Ikkuna</guimenu> <guimenuitem>Tallenna uutena 
-istuntona</guimenuitem> </menuchoice> </link> tallentaa nykyisen asetelman 
-uudeksi istunnoksi.</entry>
+<guimenu>Window</guimenu> <guimenuitem>Save as new session</guimenuitem> 
+</menuchoice> </link> equivalent; saves current layout as new session.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">&Alt;&Ctrl;
-              <keycap>W</keycap></keycombo>
+              <keycombo action="simul">
+              <keycap>&Ctrl;&Alt;W</keycap></keycombo>
             </entry>
             <entry>
             <link linkend="hdbk-reference-menus-window-closeall"> <menuchoice> 
-<guimenu>Ikkuna</guimenu> <guimenuitem>Sulje kaikki</guimenuitem> 
-</menuchoice> </link> sulkee kaikki avoimet ikkunat.</entry>
+<guimenu>Window</guimenu> <guimenuitem>Close all</guimenuitem> </menuchoice> 
+</link> equivalent; closes all open windows.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">&Ctrl;
-              <keycap>-</keycap></keycombo>
+              <keycombo action="simul">
+              <keycap>&Ctrl;-</keycap></keycombo>
             </entry>
             <entry>Loitonna. Tämä pienentää kirjasimen kokoa lukuikkunoissa.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">&Ctrl;
-              <keycap>+</keycap></keycombo>
+              <keycombo action="simul">
+              <keycap>&Ctrl;+</keycap></keycombo>
             </entry>
             <entry>Lähennä. Tämä suurentaa kirjasimen kokoa lukuikkunoissa.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">&Ctrl;
-              <keycap>A</keycap></keycombo>
+              <keycombo action="simul">
+              <keycap>&Ctrl;A</keycap></keycombo>
             </entry>
             <entry>Valitse kaikki. Tämä valitsee kaikki tekstit lukuikkunassa.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">&Ctrl;
-              <keycap>C</keycap></keycombo>
+              <keycombo action="simul">
+              <keycap>&Ctrl;C</keycap></keycombo>
             </entry>
             <entry>Kopioi. Tämä kopioi valitun tekstin leikepöydälle.</entry>
           </row>
+
           <row>
             <entry>
-              <keycombo action="simul">&Ctrl;
-              <keycap>F</keycap></keycombo>
+              <keycombo action="simul">
+              <keycap>&Ctrl;F</keycap></keycombo>
             </entry>
             <entry>Haku. Tämä etsii lukuikkunan tekstistä.</entry>
           </row>
+
+          <row>
+            <entry>
+              <keycombo action="simul">
+              <keycap>&Ctrl;G</keycap></keycombo>
+            </entry>
+
+            <entry>
+	      <link linkend="hdbk-reference-menus-window-tilevertically"> <menuchoice> 
+<guimenu>Window</guimenu> <guimenuitem>Tile vertically</guimenuitem> 
+</menuchoice> </link> equivalent.
+            </entry>
+          </row>
+
+          <row>
+            <entry>
+              <keycombo action="simul">
+              <keycap>&Ctrl;H</keycap></keycombo>
+            </entry>
+
+            <entry>
+	      <link linkend="hdbk-reference-menus-window-tilehorizontally"> <menuchoice> 
+<guimenu>Window</guimenu> <guimenuitem>Tile horizontally</guimenuitem> 
+</menuchoice> </link> equivalent.
+            </entry>
+          </row>
+
+          <row>
+            <entry>
+              <keycombo action="simul">
+              <keycap>&Ctrl;J</keycap></keycombo>
+            </entry>
+
+            <entry>
+	      <link linkend="hdbk-reference-menus-window-cascade"> <menuchoice> 
+<guimenu>Window</guimenu> <guimenuitem>Cascade</guimenuitem> </menuchoice> 
+</link> windows equivalent.
+            </entry>
+          </row>
+
           <row>
             <entry>
-              <keycombo action="simul">&Ctrl;
-              <keycap>O</keycap></keycombo>
+              <keycombo action="simul">
+              <keycap>&Ctrl;O</keycap></keycombo>
             </entry>
             <entry>
             <link linkend="hdbk-reference-menus-search-openworks"> <menuchoice> 
-<guimenu>Etsi</guimenu> <guimenuitem>Etsi avoimista teoksista</guimenuitem> 
-</menuchoice> </link> avaa hakuikkunan kaikkiin nyt avattuihin teoksiin.</entry>
+<guimenu>Search</guimenu> <guimenuitem>Search in open work(s)</guimenuitem> 
+</menuchoice> </link> equivalent; opens the search dialog to search in all 
+currently opened works.</entry>
           </row>
+
           <row>
             <entry>
-              <keycombo action="simul">&Ctrl;
-              <keycap>Q</keycap></keycombo>
+              <keycombo action="simul">
+              <keycap>&Ctrl;Q</keycap></keycombo>
             </entry>
             <entry>
             <link linkend="hdbk-reference-menus-file-quit"> <menuchoice> 
-<guimenu>Tiedosto</guimenu> <guimenuitem>Lopeta</guimenuitem> </menuchoice> 
-</link> sulkee &bibletime;-sovelluksen.</entry>
+<guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem> </menuchoice> 
+</link> equivalent; closes &bibletime;.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">&Ctrl;
-              <keycap>W</keycap></keycombo>
+              <keycombo action="simul">
+              <keycap>&Ctrl;W</keycap></keycombo>
             </entry>
             <entry>Sulkee nykyisen ikkunan.</entry>
           </row>
@@ -604,8 +709,8 @@ uudeksi istunnoksi.</entry>
               </keycombo>
             </entry>
             <entry>
-            <menuchoice> <guimenu>Ohje</guimenu> <guimenuitem>Käsikirja</guimenuitem> 
-</menuchoice> avaa käsikirjan.</entry>
+            <menuchoice> <guimenu>Help</guimenu> <guimenuitem>Handbook</guimenuitem> 
+</menuchoice> equivalent; opens the handbook.</entry>
           </row>
           <row>
             <entry>
@@ -614,8 +719,8 @@ uudeksi istunnoksi.</entry>
               </keycombo>
             </entry>
             <entry>
-            <menuchoice> <guimenu>Ohje</guimenu> <guimenuitem>Raamatun tutkimisen 
-Howto</guimenuitem> </menuchoice> avaa Raamatun tutkimisen Howto-ikkunan.</entry>
+            <menuchoice> <guimenu>Help</guimenu> <guimenuitem>BibleStudy 
+Howto</guimenuitem> </menuchoice> equivalent; opens the BibleStudy Howto.</entry>
           </row>
           <row>
             <entry>
@@ -625,9 +730,9 @@ Howto</guimenuitem> </menuchoice> avaa Raamatun tutkimisen Howto-ikkunan.</entry
             </entry>
             <entry>
             <link linkend="hdbk-reference-menus-settings-bookshelf_manager"> 
-<menuchoice> <guimenu>Asetukset</guimenu> <guimenuitem>Kirjahyllyn 
-hallinta</guimenuitem> </menuchoice> </link> avaa kirjahyllyn 
-hallintapaneelin.</entry>
+<menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Bookshelf 
+Manager</guimenuitem> </menuchoice> </link> equivalent; opens the Bookshelf 
+Manager.</entry>
           </row>
           <row>
             <entry>
@@ -637,8 +742,8 @@ hallintapaneelin.</entry>
             </entry>
             <entry>
             <link linkend="hdbk-reference-menus-view-showbookshelf"> <menuchoice> 
-<guimenu>Näytä</guimenu> <guimenuitem>Näytä kirjahylly</guimenuitem> 
-</menuchoice> </link> näyttää/piilottaa kirjahyllyn.</entry>
+<guimenu>View</guimenu> <guimenuitem>Show Bookshelf</guimenuitem> 
+</menuchoice> </link> equivalent; toggles display of the Bookshelf.</entry>
           </row>
           <row>
             <entry>
@@ -648,8 +753,8 @@ hallintapaneelin.</entry>
             </entry>
             <entry>
             <link linkend="hdbk-reference-menus-view-showmag"> <menuchoice> 
-<guimenu>Näytä</guimenu> <guimenuitem>Näytä suurennuslasi</guimenuitem> 
-</menuchoice> </link> näyttää/piilottaa suurennuslasin.</entry>
+<guimenu>View</guimenu> <guimenuitem>Show mag</guimenuitem> </menuchoice> 
+</link> equivalent; toggles display of the mag(nifying glass).</entry>
           </row>
         </tbody>
       </tgroup>