gtranslator r3869 - in trunk: . help/sr src



Author: psanxiao
Date: Mon Oct 27 16:55:27 2008
New Revision: 3869
URL: http://svn.gnome.org/viewvc/gtranslator?rev=3869&view=rev

Log:
	Patch by Baris Cicek  <baris teamforce name tr>

	* src/profile.{ch}:
	* src/actions-file.c:
	Now when the program is closed, the profiles file is
	created in the tmp directory and if the profiles list
	were stored correctly, then it's moved to the config
	directory. (Fixes bug #556569)

Modified:
   trunk/ChangeLog
   trunk/help/sr/gtranslator.xml
   trunk/src/actions-file.c
   trunk/src/profile.c
   trunk/src/profile.h

Modified: trunk/help/sr/gtranslator.xml
==============================================================================
--- trunk/help/sr/gtranslator.xml	(original)
+++ trunk/help/sr/gtranslator.xml	Mon Oct 27 16:55:27 2008
@@ -1,452 +1,591 @@
-<?xml version="1.0"?>
-<!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.0">
-    <!ENTITY manualversion "0.5">
-    <!ENTITY app "ÐÐÑÐÐÐÐÐÐÐÑ">
+<?xml version="1.0" encoding="utf-8"?>
+<!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 "2.0">
+<!ENTITY manualversion "0.6">
+<!ENTITY app "Gtranslator">
 ]>
 <!-- ================ Document Header ================= -->
-
 <article id="index" lang="sr">
 
   <articleinfo>
-    <title>ÐÐÑÑÑÑÐÐ ÐÐ ÐÐÑÐÐÐÐÐÐÐÑ</title>
+    <title>Gtranslator Manual</title>
 
     <copyright>
-	    <year>2001</year>
-	    <holder>ÐÐÐÐ ÐÐÐÐÑ (Emese Kovacs)</holder>
+      <year>2008</year>
+      <holder>Igalia</holder>
+      <year>2001</year>
+      <holder>Emese Kovacs</holder>
     </copyright>
 
-    <copyright>
-	    <year>2003</year>
-	    <holder>ÐÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐÐÐÑ</holder>
-    </copyright>
+    <!-- Translators: uncomment this
+	 <copyright>
+	   <year>2003</year>
+	   <holder>ME_THE_TRANSLATOR</holder>
+	 </copyright>
+	 -->
 
-    <publisher>
-	    <publishername>ÐÑÐÑÐÐÐÑ ÐÐÐÐ ÐÐÐÑÐÐÐÑÐÑÐÑÐ</publishername>
+    <publisher role="maintainer">
+      <publishername>GNOME Documentation Project</publishername>
     </publisher>
 
-    <releaseinfo>ÐÐÐ ÑÐ ÑÐÑÑÑÑÐÐ ÐÐ &app; , ÐÐÑÐÐÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐ &manualversion;.</releaseinfo>
+    <releaseinfo>This is version 0.6 of Gtranslator manual.</releaseinfo>
 
     <legalnotice id="feedback">
-	    <title>ÐÐÐÑÐÑÐÐ ÐÐÑÐÑÐÐÑÐÑÐ</title>
-	    <para>
-		    ÐÐÐÐ ÐÐ ÐÑÐÑÐÐÐÐÐ ÐÑÐÑÐÑ ÐÐÐ ÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÐ ÐÐ ÑÐÐ ÐÑÐÐÑÐÐ 
-		    ÐÐÐ ÐÐÐ ÑÐÑÑÑÑÐÐ, ÐÐÐÐÐ ÐÐÐÐÐÐÐÑÑÐ
-		    <ulink type="help" url="ghelp:gnome-feedback">
-		    ÐÐÐ ÑÐÑÑÑÑÐÐ.
-		    </ulink>
-	    </para>
+      <title>Feedback Information</title>
+      <para>
+	To report a bug or make a suggestion regarding this
+	application or this documentation, please see the
+	<ulink type="help" url="ghelp:gnome-feedback">
+	  GNOME Feedback Page
+	</ulink>
+      </para>
     </legalnotice>
-
+    
     <authorgroup>
-	    <author>
-		    <firstname>ÐÐÐÐ</firstname>
-		    <surname>ÐÐÐÐÑ</surname>
-		    <affiliation>
-			    <orgname>ÐÑÐÑÐÐÐÑ ÐÐÐÐ ÐÐÐÑÐÐÐÑÐÑÐÑÐ</orgname>
-			    <address><email>emese gnome hu</email></address>
-		    </affiliation>
-            </author>
+      <author>
+	<firstname>Pablo</firstname>	
+	<surname>Sanxiao</surname>
+	<affiliation>
+	  <orgname>Igalia</orgname>
+	  <addres><email>psanxiao gmail com</email></addres>
+	</affiliation>
+      </author>
+      <author>
+	<firstname>Emese</firstname>
+	<surname>Kovacs</surname>
+	<affiliation>
+	  <orgname>GNOME Documentation Project</orgname>
+	  <address><email>emese gnome hu</email></address>
+	</affiliation>
+      </author>
     </authorgroup>
 
     <revhistory>
-	    <revision>
-		    <revnumber>&app; ÑÐÑÑÑÑÐÐ Ð&manualversion;</revnumber>
-		    <date>ÐÐÐÑÑÑ 2003</date>
-		    <revdescription>
-			    <para role="author">ÐÐÐÐ ÐÐÐÐ (Abel Cheung)</para>
-			    <para role="publisher">
-				ÐÑÐÑÐÐÐÑ ÐÐÐÐ ÐÐÐÑÐÐÐÑÐÑÐÑÐ
-			    </para>
-		    </revdescription>
-	    </revision>
-	    <revision>
-		    <revnumber>&app; ÑÐÑÑÑÑÐÐ Ð0.4</revnumber>
-		    <date>ÐÐÐÑÑÑ 2001</date>
-		    <revdescription>
-			    <para role="author">ÐÐÐÐ ÐÐÐÐÑ</para>
-			    <para role="publisher">
-				ÐÑÐÑÐÐÐÑ ÐÐÐÐ ÐÐÐÑÐÐÐÑÐÑÐÑÐ
-			    </para>
-		    </revdescription>
-	    </revision>
+      <revision>
+	<revnumber>Gtranslator Manual V0.6</revnumber>
+	<date>September 2008</date>
+	<revdescription>
+	  <para role="author">Pablo Sanxiao</para>
+	  <para role="publisher">
+	    Igalia
+	  </para>
+	</revdescription>
+      </revision>
+
+      <revision>
+	<revnumber>Gtranslator Manual V0.6</revnumber>
+	<date>August 2003</date>
+	<revdescription>
+	  <para role="author">Abel Cheung</para>
+	  <para role="publisher">
+	    GNOME Documentation Project
+	  </para>
+	</revdescription>
+      </revision>
+      <revision>
+	<revnumber>Gtranslator Manual V0.4</revnumber>
+	<date>August 2001</date>
+	<revdescription>
+	  <para role="author">Emese Kovacs</para>
+	  <para role="publisher">
+	    GNOME Documentation Project
+	  </para>
+	</revdescription>
+      </revision>
     </revhistory>
 
+    <abstract role="description">
+      <para>Gtranslator is an enhanced gettext PO file editor for the GNOME desktop environment.</para>
+    </abstract>
+
   </articleinfo>
   
-<!-- ================ Document Body ================= -->
+  <!-- ================ Document Body ================= -->
 
-<!-- ==== Introduction ====== -->
+  <!-- ==== Introduction ====== -->
 
   <sect1 id="gtranslator-introduction">
-    <title>ÐÐÐÐ</title>
+    <title>Introduction</title>
 
     <para>
-	<application>&app;</application> ÐÐÐ ÐÑÐÐ ÑÐÐÐÐ ÑÐÐÐÐÐ ÐÑÐÑÐÑÐÐ ÑÑÑÐÑÐ ÐÐ ÑÑÐÑÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐÐ (ÐÐÐÐ. gettext po files). ÐÑÐÐÑÐÐ ÐÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÑÐ ÐÐ ÐÐÐ ÐÐÑÐÐ ÐÑÐÑÐÑÐ ÐÑÐÐ ÐÐÑÐÑÐÐ, ÐÑÐÐÐÐÐÐÐ Ð ÐÐÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐÐ Ð ÐÐÐ ÐÐÐÐÑÑ ÑÐ ÑÑÐÑÐÐ ÐÐÑÐ ÐÑÐÐÐÐÑÑÐ ÐÑÐÑ ÐÐÑÑÐÐ Ñ ÑÐÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÐÑ ÐÐÑÐÐÐÑÐÑÐ. 
+      <application>Gtranslator</application> offers you a comfortable graphical
+      interface to edit gettext PO files. It allows you to easily
+      navigate among fuzzy, translated and untranslated messages and has
+      a status bar displaying the number of messages for each category.
     </para>
 
     <para>
-	<application>&app;</application> ÐÐÐ ÐÑÐÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐ ÑÑÐÑÐÐÐ Ð ÑÑÐÐ ÑÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐÐ Ð ÐÐ ÐÑÐÐÑÐ ÑÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ ÐÑÐÐ ÐÐÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐÑÑÐÐ ÐÐÑÐÑÐÐÐ (ÐÐÐÐ. Gnome-VFS). ÐÐÑÐÐ ÑÐÐÐ, ÐÑÐÐÑÐÐ ÐÐÐÐÑÑÐÐÐ ÐÐ ÑÑÐÐÐÐÐÑÐ ÑÑÐÑÑ ÐÐÑÐÑÐÐÑ ÑÐ ÐÑÐÐÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ (ÐÐÐÐ. pot dile), Ð ÑÐ ÑÐÐ ÐÐ ÐÑÐÑÐÑÐÐÐ ÑÑÑÐÑÐ!
+      <application>Gtranslator</application> features opening and editing some PO 
+      files at the same time including to manage their headers, seeing the
+      developer's information for each message (comments, context) and set
+      new personal comments.
     </para>
 
     <para>
-	ÐÑÐÐÑÐÑÐ ÐÑÑÐÐÐÑÑÐÐÐ ÐÑÐÐÐÑÐÑÐ ÐÑÐÐÑÐÐÐ <application>&app;</application> ÐÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐ <quote>ÐÐÑÑÐÐÐÑÐ</quote> ÑÐÐ. âmsgidâ Ð âmsgstrâ ÐÐÑÐÐÐ ÐÐ ÑÐÑÐÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐÐ Ð ÐÐ ÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÐÐ ÐÑÐÑÐÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐ ÐÑÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐ.
+      The profiles function allows you to have different <quote>accounts</quote>
+      with the necessary information to fill the header. The option <quote>use my
+      options to complete the following entries</quote> in the edit header dialog
+      takes the information from the active profile in order to fill the header values.
     </para>
 
     <para>
-	ÐÐÐÐ ÐÐ ÐÐÐÑÐÐÑÐÐ ÐÑÐÐÑÐÐ <application>&app;</application>, ÐÐ <guimenu>ÐÐÐÐÐÐÐ ÐÐÐÐÑÐ</guimenu> ÐÐÐÐÐÑÐÑÐ ÑÐÐÐÐ ÑÑÐÐÐÐ:
-	<menuchoice>
-	  <guimenu> âÐÑÐÐÑÐÐÐâ </guimenu>
-	  <guisubmenu> âÐÐÐÐÐÑÐÐ ÐÐÐÑÐâ </guisubmenu>
-	  <guimenuitem> &app; </guimenuitem>
-	</menuchoice>
-	 ÐÐÐ
-	Ñ ÐÐÐÐÑÐ ÐÐÑÐÐÐÐ ÐÐÐÐÑÑÐ: gtranslator.
+      The new system of translation memories let you use your own translated PO files in
+      order to create a database that will offer you possible options to translate the 
+      current message.
+    </para>
+
+    <para>
+     <application>Gtranslator</application> provide a plugin system which makes it easily extending.
+     It include some useful plugins such as svn plugin in order to do the checkouts from
+     the repository and commit the new translations. There are also plugins to visualize the
+     source code where a message is, search in translation memories web services like Open Tran...
+    </para>
+
+    <para>
+      To run <application>Gtranslator</application>, select 
+      <menuchoice>
+	<guimenu>Programs</guimenu>
+	<guisubmenu>Development</guisubmenu>
+	<guimenuitem>Gtranslator</guimenuitem>
+      </menuchoice>
+      from the <guimenu>Main Menu</guimenu>, or type
+      <command>gtranslator</command> on the command line.
     </para>
 
   </sect1>
 
   <sect1 id="gtranslator-usage">
-    <title>ÐÐÑÐÑÑÐÑÐ ÐÑÐÐÑÐÐÐ</title>
+    <title>Using Gtranslator</title>
 
     <para>
-	<application>&app;</application> ÐÑÐÐÑÑÐÐÑÐ ÑÐÐÐÐ ÐÐÑÐÐ ÐÑÐÑÐÑÐÐ ÐÐÑÑÐÐÑÐ  ÐÐÑÐ ÐÐÐÐÑÑÐÐÐ ÐÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐÐ. ÐÐÐÑ ÐÐÐÑÐÐ ÐÐÐÑÑÑÐ ÐÑÐÐÐÐÑ ÑÐÐÑÑÐÐÑ ÐÑÐÐÑÐÐÐ <application>&app;</application>.
+      <application>Gtranslator</application> is a full
+      featured graphical environment that makes it possible to
+      translate PO files painlessly. This section describes basic
+      usage of <application>Gtranslator</application>.
     </para>
 
     <sect2 id="gtranslator-basic-usage">
-      <title>ÐÑÐÐÐÐÐ ÑÐÐÑÑÐÐÐ</title>
+      <title>Basic usage</title>
 
       <para>
-	ÐÐÐÐ ÐÐÐÑÐÐÐÑÐ <application>&app;</application>, ÐÑÐÐÑÐ ÑÐ
-	<interface>ÐÐÐÐÐÐ ÐÑÐÐÐÑ ÐÑÐÐÑÐÐÐ</interface>.
+	Starting <application>Gtranslator</application> opens the 
+	<interface>Main window</interface>.
       </para>
 
       <figure id="gtranslator-mainwindow-screenshot">
-	<title>ÐÐÐÐÐÐ ÐÑÐÐÐÑ ÐÑÐÐÑÐÐÐ</title>
+	<title>Main Window</title>
 	<screenshot>
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="figures/mainwindow.png" format="PNG"/>
+	      <imagedata fileref="figures/mainwindow.png" format="PNG" contentwidth="5cm"/>
 	    </imageobject>
 	    <textobject>
-	      <phrase>&app; Main Window</phrase>
+	      <phrase>Gtranslator Main Window</phrase>
 	    </textobject>
 	  </mediaobject>
 	</screenshot>
       </figure>
 
-<!--
-      <FIGURE FLOAT="0" id="MAINWINDOW-FIG">
-        <title>Gtranslator Main Window</title>
-        <SCREENSHOT>
-          <SCREENINFO>Gtranslator Main Window</SCREENINFO>
-          <GRAPHIC FILEREF="figures/mainwindow" FORMAT="PNG"
-          SRCCREDIT="emese"></GRAPHIC>
-        </SCREENSHOT>
-      </FIGURE>
--->
+      <!--
+	  <FIGURE FLOAT="0" id="MAINWINDOW-FIG">
+            <title>Gtranslator Main Window</title>
+            <SCREENSHOT>
+              <SCREENINFO>Gtranslator Main Window</SCREENINFO>
+              <GRAPHIC FILEREF="figures/mainwindow" FORMAT="PNG"
+		       SRCCREDIT="emese"></GRAPHIC>
+            </SCREENSHOT>
+	  </FIGURE>
+	  -->
 
       <para>
-	<interface>ÐÐÐÐÐÐ ÐÑÐÐÐÑ ÐÑÐÐÑÐÐÐ</interface> ÑÐ ÐÐÐÐÑÐÐ Ñ ÑÑÐ ÐÐÑÐ ÐÐÐÐÑÑÐ:
+	The <interface>Main window</interface> is divided into three main area:
 	<itemizedlist>
-		<listitem>
-		<para>
-			<interface> ÐÐÐÐÑÐ ÐÐÐÐÑÐ</interface>
-			ÐÐÐ ÐÐÐÐÑÑÐÐÐ ÐÑÐÑÑÑÐ ÐÑÐÐÑÐÐÑÐÐÐ ÐÐÐÐÑÑ.</para>
-		</listitem>
-		<listitem>
-		<para>
-			<interface> ÐÐÐÐÑÐ ÑÐ ÐÐÐÑÐÐÐ</interface>
-			ÐÐÐ ÐÐÐÐÑÑÐÐÐÑÑ ÐÑÐ ÐÑÐÑÑÑÐ ÑÐÑÑÐ ÐÐÑÐÑÑÐÐÐÐ ÑÑÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐ ÑÐ ÐÐÑÐÑÐÐÐÐÐ, ÑÑÐÐÑÐÑÐÐÐ ÐÐ ÐÑÐÑÐÑÐ Ð ÑÑÐÐÑÐÑÐÐÐ ÐÐ ÐÑÐÑÐÐÑÐÑÐ.
-		</para>
-		</listitem>
-		<listitem>
-		<para>
-			<interface> ÐÐÐÐÐ ÐÑÐÑÑÐÑ</interface>
-			ÐÐÐ ÐÐÐÐÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐ Ð ÑÑÐÐÐÑÐ ÐÐÑÑÐÐ ÑÐÐÑÐÐÐÐ Ñ ÐÐÑÐÑÐÐÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐÐ.
-		</para>
-		</listitem>
+	  <listitem>
+	    <para>
+	      The <interface>menubar</interface>
+	      allows you the access the application menu.</para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      The <interface>toolbar</interface>
+	      allow you quick access to frequently used file management,
+	      navigation and compile functions.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      The <interface>workspace</interface>
+	      allows you to visualize and edit the messages contained
+	      in the PO file. This area on its part is divided in another
+	      three. On the top is the message area with all messages of
+	      the PO file and its state. Under the message area, on the left
+	      is where it's showed the original message and the box where write
+	      the translation. Finally, on the right there is a panel with
+	      auxiliar information to help in the translation process.
+	    </para>
+	  </listitem>
 	</itemizedlist>
       </para>
 
       <sect3 id="gtranslator-configuration">
-        <title>ÐÐÐÐÑÐÐÐÑÐ</title>
+        <title>Configuration</title>
         <para>
-          <application>&app;</application> ÐÐÐÐÑÐÐÐÑÐ ÑÐ ÐÐÐÑ ÐÐÑÐÑÐ ÑÐÐÐÐÐ ÐÐÑÐÑÐÐ ÑÐÐÐÐÑÐÑ ÑÑÐÐÐÐ ÐÐÐÐÑÐ: 
+          <application>Gtranslator</application> settings can be modified by choosing
 	  <menuchoice>
-	    <guimenu> âÐÑÐÑÐÐÐÑÐâ </guimenu>
-	    <guimenuitem> âÐÐÑÑÐÐÐÐâ </guimenuitem>
-	  </menuchoice>.
+	    <guimenu>Edit</guimenu>
+	    <guimenuitem>Preferences</guimenuitem>
+	  </menuchoice>
+	  menuitem.
 	</para>
       </sect3>
 
       <sect3 id="gtranslator-loading-file">
-	<title>ÐÑÐÑÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ</title>
+	<title>Loading a PO file</title>
 
 	<para>
-	  ÐÐÐÐ ÐÐ ÑÑÐÑÐÐÐ ÐÐÑÐÑÐÐÑ ÑÐ ÐÑÐÐÐÐÐÐ, ÑÐÐÐÐ ÐÐÑÐÑÑÐ ÑÐÐÐÐÑÐ ÑÑÐÐÐÐ ÐÐÐÐÑÐ:
+	  To load a PO file, use the 
 	  <menuchoice>
-	    <guisubmenu> âÐÐÑÐÑÐÐÐâ </guisubmenu>
-	    <guimenuitem> âÐÑÐÐÑÐ...â </guimenuitem>
-	  </menuchoice>.
-	  ÐÐ ÑÐ ÐÑÐÐÑÐÑÐ ÐÑÐÐÐÑÑÐ: <guilabel>â&app; â ÐÑÐÑÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐâ</guilabel>.
-	  ÐÑÐÑÑÐÐÐÑÐ ÑÐÑÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÐ ÑÐÑÑÐÐÑÐ, ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑ ÑÐ ÐÑÐÐÐÐÐÐ ÐÐÑÑ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ Ð ÐÑÐÑÐÑÐÐÑÐ ÐÑÐÐÐ <guibutton> âÐ ÑÐÐÑâ </guibutton>.
-	</para>
-
-	<para>
-	  <application>&app;</application> ÐÐÐ ÐÑÐÐ ÐÐÐÑÑÐÐÑÑ ÐÐ ÐÑÐÐÑÐÑÐ 
-	  ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐÐ ÐÐÑÑÑÐÐÐÐÐ ÑÐÑÑÐÐÐ ÐÐÑÐÑÐÐÐ.
-	  ÐÐÐ ÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÑÐÑÐ ÑÐÐÐÐÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑÐ ÑÐÑÑÑÑÐ (ÐÐÐÐ. URI - Uniform Resources Identificators) ÐÐ ÐÑÐÑÑÑÐ ÐÐÑÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÐÐÐÐ ÑÐÑÑÐÐÑ. ÐÑÐÐÑÑÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐÐ ÑÑ. ÐÑÐÑÑÑÐÐ ÑÑ:
-	  <itemizedlist>
-	    <listitem>
-		<para>ÐÐÐÐÐÐÐ âfile://â ÐÑÐÑÑÑÐ ÐÐÐ Ñ ÐÑÐÐÐÑÑ:
-		<command>file://localhost/<replaceable>ÐÑÑÐÑÐ_ÐÐ_ÐÐÑÐÑÐÐÐ</replaceable></command></para>
-	    </listitem>
-	    <listitem>
-		<para>ÑÐÐÑÐÐÐ âhttp://â; ÐÑÐÑÑÑÐ ÐÐÐ Ñ ÐÑÐÐÐÑÑ:
-		<command>http://www.gtranslator.org/gtranslator/gtranslator.pot</command>
-		</para>
-	    </listitem>
-	    <listitem>
-		<para>ÑÐÐÑÐÐÐ âftp://â; ÐÑÐÑÑÑÐ ÐÐÐ Ñ ÐÑÐÐÐÑÑ:
-		<command>ftp://<replaceable>ftp.somewhere.org</replaceable>/<replaceable>pub/tr.po</replaceable></command>
-		</para>
-	    </listitem>
-	  </itemizedlist>
+	    <guisubmenu>File</guisubmenu>
+	    <guimenuitem>Open</guimenuitem>
+	  </menuchoice>
+	  menuitem. It will
+	  bring up the <guilabel>Open file for translation</guilabel> dialog
+	  box. Browse through your computer filesystem, choose the PO file
+	  you wish to open and click <guibutton>OK</guibutton>.
 	</para>
 
-        <note>
-	  <title>ÐÑÐÑÐÐÐÑÐ ÑÐÐÐÑÐÑ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐÐ</title>
-	  <para>
-	  <application>&app;</application> ÐÐÐÐ ÐÐ ÐÑÐÐÑÐ ÑÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ.
-	  ÐÑÐÑÐÑÐÐÑÐ ÐÐ ÐÐÐÐÐÑÑ <guibutton>âÐÑÐÐÑÐâ</guibutton>. ÐÐÐ ÐÐÐ ÐÑÐÐÑÐ ÐÑÐÐÐÑÑÐ:
-	  <guilabel> â&app; â ÐÑÐÑÐÑ ÐÐÑÐÑÐÐÑ ÑÐ ÐÑÐÐÐÐÐÐâ </guilabel>. ÐÐÐÐÐÑÐÑÐ ÑÐÐÐÑ ÑÐÐÐÑÑ ÐÐÑÐÑÐÐÑ
-	  ÑÐ ÐÑÐÐÐÐÐÐ (ÐÑÐÐÐÐÐÐÑÐ ÑÐ ÐÐ ÐÐÑÑÐÐÐÑ .gz). ÐÑÐÑÐÑÐÐÑÐ ÐÑÐÐÐ
-	  <guibutton> âÐ ÑÐÐÑâ </guibutton>. ÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐ ÑÐÑÑÐÐÑ ÐÐÐÑÐ ÐÐÑÑÐÐÐÑÐÐ
-	  ÐÑÐÐÑÐÐ <command>gzip</command> , ÐÐÐÐÑÐ ÐÑÐÐÑÐÑÐ
-	  ÐÐÑÐÑÐÐÐ ÑÐÐÐÑÐ ÑÐ ÐÐÐÐ ÐÐÐÑÐÐ.</para>
-	</note>
-
       </sect3>
       
       <sect3 id="gtranslator-edit-file">
-        <title>ÐÑÐÑÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ</title>
-        <para>(ÐÐÐÐÐÑÑÐÐÐ) ÐÐÐÑÑÐÐÐ ÐÐÐÐÐÐ, ÐÐÐ ÐÑÐÑÐÑÐÑÑÐ, ÑÑÐÑÐ ÐÐÑÑÐÐ, ÐÑÐÐÐÐÐ ÐÑÐÑÐÑÐ.</para>
-        <para>(ÐÐÐÐÐÑÑÐÐÐ) ÐÐÐÐ ÑÐÐÐÑ ÐÐ ÐÐÑÐÑÑÐÑÐ âÑÑÐÐÐÐâ ÐÑÐÐÐÐÐ.</para>
+        <title>Editing PO file</title>
+        <para> 
+	  The message area show all the messages in the PO file and their state.
+	  It is possible going to one specific message by clicking on it directly.
+	  You can also move through the messages with the buttons in the toolbar:
+	   <emphasis>forward</emphasis> and <emphasis>back</emphasis>. In the menu
+	  using
+	  <menuchoice>
+	    <guisubmenu>Go</guisubmenu>
+	    <guimenuitem>next fuzzy</guimenuitem>
+	  </menuchoice>
+	  and 
+	  <menuchoice>
+	    <guisubmenu>GO</guisubmenu>
+	    <guimenuitem>previous fuzzy</guimenuitem>
+	  </menuchoice>
+	  it is possible moving directly among fuzzy messages and using
+	  <menuchoice>
+	    <guisubmenu>Go</guisubmenu>
+	    <guimenuitem>next untranslated</guimenuitem>
+	  </menuchoice>
+	  and 
+	  <menuchoice>
+	    <guisubmenu>GO</guisubmenu>
+	    <guimenuitem>previous untranslated</guimenuitem>
+	  </menuchoice>
+	  it is possible moving directly among untranslated messages.
+	</para>
+
       </sect3>
 
       <sect3 id="gtranslator-save-file">
-        <title>ÐÑÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ</title>
-        <para>(ÐÐÐÐÐÑÑÐÐÐ) ÐÐÐÐ ÑÐÑÑÐÐÑÐ, ÑÐÑÑÐÐÑÐ Ñ ÑÐÐÐÑÐÐ ÐÐÐÐÐÑ.</para>
-        <para>(ÐÐÐÐÐÑÑÐÐÐ) ÐÐÐÐ ÑÐÐÐÑ ÐÐ ÑÐÑÑÑÐÐÐÑÐ Ð ÐÑÐÑÑÑÐÐÐÑÐ ÑÐÐÐÐÑÐÑÐ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÐ.</para>
+        <title>Saving PO file</title>
+        <para>
+	  When a PO file has been modified (in a message or in the header)
+	  a <quote>*</quote> appears before its name in the window title or in the tab
+	  if you are editing some PO files at the same time.
+	</para>
+	<para>
+	  If you close the PO file at this moment, then, the close dialog will be showed
+	  to you with this aspect:
+	</para>
+	
+	<figure id="gtranslator-closedialog-screenshot">
+	  <title>Close Dialog</title>
+	  <screenshot>
+	    <mediaobject>
+	      <imageobject>
+		<imagedata fileref="figures/closedialog.png" format="PNG"/>
+	      </imageobject>
+	      <textobject>
+		<phrase>Gtranslator Close Dialog</phrase>
+	      </textobject>
+	    </mediaobject>
+	  </screenshot>
+	</figure>
+	
       </sect3>
     </sect2>
-
-
+    
     <sect2 id="gtranslator-advanced-feature">
-      <title>ÐÐÐÑÐÐÐÐ ÐÐÐÑÑÐÐÑÑÐ</title>
-      <para>(ÐÐÐÐÐÑÑÐÐÐ) ÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑÑÐÐÑÑÐ, ÐÑÑÐÐÐÑÑÐÐ ÐÑÐÐÐÑÐÑÐ, ÐÑÐÑÑÐÐÐÐÐÑÐ ÐÐÐÐÑÑ ÑÐÐÑÐÐÑÐÐÑ ÐÐÑÐÐÐ, ÐÐÑÑÐÑÐÑÐ ÐÑÐÐÐÐÐ...</para>
+      <title>Advanced features</title>
+      <para>
+	<application>Gtranslator</application> offeres to translator many features in
+	order to do the translation process easier and confortable.
+      </para>
 
-      <sect3 id="gtranslator-advanced-autotranslate">
-	<title>ÐÑÑÐÐÐÑÑÐÐ ÐÑÐÐÐÑÐÑÐ</title>
-	<para>(ÐÐÐÐÐÑÑÐÐÐ) ÐÐ ÑÐ ÐÐÐÐ ÐÐÐÑÑÐÐÑÑ.</para>
-      </sect3>
-      <sect3 id="gtranslator-advanced-update">
-	<title>ÐÐÑÑÐÑÐÑÐ</title>
-	<para>(ÐÐÐÐÐÑÑÐÐÐ) ÐÐÑÐÑÑÐÑÐ <application>intltool</application> ÐÐÐÑÐ.</para>
+      <sect3 id="gtranslator-advanced-profiles">
+	<title>Profiles</title>
+	<para> The profiles feature provides to translator the possibility of
+	  having differents <quote>accounts</quote> with the basic information about
+	  herself and the language.
+	</para>
+	<para>
+	  At the same time there is only one profile active. You can choose in a easy way
+	  through the preferences which is this profile. When you save a PO file and
+	  you have activated the option <quote>use my options to complete the following
+	  entries</quote> in the header dialog, <application>Gtranslator</application> will
+	  fill this fields with the information in the active profile.
+	</para>
+	
+	<figure id="gtranslator-profiles-screenshot">
+	  <title>Profiles Dialog</title>
+	  <screenshot>
+	    <mediaobject>
+	      <imageobject>
+		<imagedata fileref="figures/profiles.png" format="PNG"/>
+	      </imageobject>
+	      <textobject>
+		<phrase>Gtranslator Profiles Dialog</phrase>
+	      </textobject>
+	    </mediaobject>
+	  </screenshot>
+	</figure>
+	
       </sect3>
-      <sect3 id="gtranslator-advanced-search">
-	<title>ÐÑÐÑÑÐÐÐÐÐÑÐ ÐÐÐÐÑÑ ÑÐÐÑÐÐÑÐÐÑ ÐÐÑÐÐÐ</title>
-	<para>(ÐÐÐÐÐÑÑÐÐÐ) ÐÐÐ ÐÐÐÑÑÐÐÑÑ ÑÐÑ ÑÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐ Ñ ÐÑÐÐÑÐÐ.</para>
+      <sect3 id="gtranslator-advanced-translation_memory">
+	<title>Translation Memory</title>
+	
+	<para>
+	  The translation memory let you reuse the translations. It is a database
+	  that contains messages and their correspondent translatation for a specific
+	  language. 
+	</para>
+	
+	<para>
+	  <application>Gtranslator</application> offers the possibility of creating translation
+	  memories in two different ways. You can create the translation memory from a
+	  directory that contains PO files (see <xref linkend="gtranslator-preferences"/>).
+	  The program will create also a new entry in the translation memory each time that
+	  you translate a new message.
+	</para>
+	
+	<para>
+	  The manner of using the translation memory it is very easy. With the translation
+	  memory panel active (if it is not active go to 
+	  <menuchoice>
+	    <guisubmenu>View</guisubmenu>
+	    <guimenuitem>Translation Memory</guimenuitem>
+	  </menuchoice> 
+	) you will can see the options that the translation memory offers you in order
+	to translate the current message. If you can choose one of them, just use the keyboard
+	acceleator associated to that option.
+	</para>
+
+	<figure id="gtranslator-tm-screenshot">
+	  <title>Translation Memory</title>
+	  <screenshot>
+	    <mediaobject>
+	      <imageobject>
+		<imagedata fileref="figures/tm.png" format="PNG"/>
+	      </imageobject>
+	      <textobject>
+		<phrase>Gtranslator Translation Memory</phrase>
+	      </textobject>
+	    </mediaobject>
+	  </screenshot>
+	</figure>
+
+	<para>
+	  The level column show you in percentage how much the option coincide with the original
+	  message. The options are ordering by level.
+	</para>
+	
       </sect3>
+      
     </sect2>
-
-    <!-- ==================== Toolbar ====================== -->
+ 
+   <!-- ==================== Toolbar ====================== -->
     <sect2 id="gtranslator-toolbar">
-      <title>ÐÐÐÐÑÐ ÑÐ ÐÐÐÑÐÐÐ</title>
+      <title>Toolbar</title>
+      
       <para>
-	ÐÐÐÐÑÐ ÑÐ ÐÐÐÑÐÐÐ ÐÐÐÐÐÐÑÑÑÐ ÐÑÐÑÑÑÐ ÐÐÐÐÐ ÐÐÐÑÐÐ ÑÐÑÑÐ ÐÐÑÐÑÑÐÐÐÐ ÑÐÐÑÐÐÐ.
+	The toolbar provides access to several commonly used routines.
+	It is easily customizable. You can add or remove buttons as follow:
       </para>
-
+      
+      <para>
+	Go to
+	<menuchoice>
+	  <guimenu>Edit</guimenu>
+	  <guimenuitem>Toolbar</guimenuitem>
+	</menuchoice>.
+	 The next dialog it will be showed you:
+      </para>
+      
       <figure id="gtranslator-toolbar-screenshot">
-	<title>ÐÐÐÐÑÐ ÑÐ ÐÐÐÑÐÐÐ</title>
+	<title>Tool Bar</title>
 	<screenshot>
 	  <mediaobject>
 	    <imageobject>
-		<imagedata fileref="figures/toolbar.png" format="PNG"/>
+	      <imagedata fileref="figures/toolbar.png" format="PNG"/>
 	    </imageobject>
 	    <textobject>
-		<phrase>&app; Tool Bar</phrase>
+	      <phrase>Gtranslator Tool Bar</phrase>
 	    </textobject>
 	  </mediaobject>
 	</screenshot>
       </figure>
 
-<!--
-      <FIGURE FLOAT="0" id="FIGURE-USAGE-TOOLBAR">
-        <title>Gtranslator Toolbar</title>
-        <SCREENSHOT>
-          <SCREENINFO>Gtranslator Toolbar</SCREENINFO>
-          <GRAPHIC FILEREF="figures/toolbar" FORMAT="PNG">
-          </GRAPHIC>
-        </SCREENSHOT>
-      </FIGURE>
--->
+      <para>
+	You can add or remove buttons just drag and drop them between 
+	the toolbar and the toolbar editor.
+      </para>
 
       <sect3 id="gtranslator-toolbar-file">
-	<title>ÐÐÐÐÑÐ ÑÐ ÐÐÐÑÐÐÐ ÐÐ ÑÐÑÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐÐÐ</title>
+	<title>File management buttons in the toolbar</title>
 
 	<para>
-		ÐÐÐÐÑÐ ÑÐ ÐÐÐÑÐÐÐ ÐÐ ÑÐÑÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÑÑÐÐÐ ÐÐ ÐÑÐÐ ÐÑÐÑÑÑÐÐÑÐ ÐÐÐÐÐ ÑÐÑÑÐ ÐÐÑÐÑÑÐÐÐÐ ÑÑÐÐÑÐÑÐÐÐ ÐÐ ÑÐÑÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐÐÐ.
+	  The file management buttons lets you access frequently
+	  used file management funcions quickly.
 	</para>
 	<variablelist>
 	  <varlistentry>
-		<term><guiicon>ÐÑÐÐÑÐ</guiicon></term>
-		<listitem>
-		<para>ÐÑÐÐÑÐ ÐÑÐÐÐÑÑÐ: <guilabel>â&app; â ÐÑÐÑÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ</guilabel>.
-		</para>
-		</listitem>
+	    <term><guiicon>Open</guiicon></term>
+	    <listitem>
+	      <para>Brings up the <guilabel>Open file for translation</guilabel> dialog.
+	      </para>
+	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-		<term><guiicon>ÐÐÑÑÐÐÑ</guiicon></term>
-		<listitem>
-		<para>ÐÑÐÐ ÐÐÑÐÑÐÐÑ ÑÐ ÐÑÐÐÐÐÐÐ.</para>
-		</listitem>
+	    <term><guiicon>Save</guiicon></term>
+	    <listitem>
+	      <para>Saves the PO file.</para>
+	    </listitem>
 	  </varlistentry>
           <varlistentry>
-		<term><guiicon>ÐÐÑÑÐÐÑ ÐÐÐ</guiicon></term>
-		<listitem>
-		<para>ÐÑÐÐ ÐÐÑÐÑÐÐÑ ÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐ ÐÑÑÐÐÐ ÐÐÐÐÐÐ.</para>
-		</listitem>
-	  </varlistentry>
-	  <varlistentry>
-		<term><guiicon>ÐÑÐÑÐÐÑÐ</guiicon></term>
-		<listitem>
-		<para>ÐÑÐÑÐÐÑÐ ÐÐÑÐÑÐÐÑ ÑÐ ÐÑÐÐÐÐÐÐ Ñ ÐÐÐÐÑÐÐ ÐÐÐÐÐ ÐÐÑÐÑÑÐÐ ÐÐÐÑÐ <command>msgfmt</command>.</para>
-		</listitem>
-	  </varlistentry>
-	  <varlistentry>
-		<term><guiicon>ÐÐÑÑÐÑÐÑ</guiicon></term>
-		<listitem>
-		<para>
-		ÐÐÑÑÐÑÐ ÐÐÑÐÑÐÐÑ ÑÐ ÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÑÐÑÑÐÑÐÐ ÐÐÑÐÐÐÐ
-		<command>intltool-update</command> ÐÐÑÐ ÑÐ ÐÐÐ
-		<application>intltool</application> ÐÐÐÐÑÐ.
-		ÐÐÐÐ ÐÐ ÑÐÐ ÑÐ ÑÐÐÐÐÐ, ÐÐÑÐÑÐ ÐÐ ÑÐ ÑÐÐÑÐÑÐ ÐÐ ÑÐ ÐÐÑÐÑÐÐÐ 
-		ÐÐ ÐÐÐÐÑ <filename>POTFILES.in</filename> Ñ
-		ÐÑÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÑ Ñ ÐÐÑÐÐ ÑÐ Ð ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÑÐÐ ÐÑÐÐÐÐÐÐ.
-		</para>
-		</listitem>
-	  </varlistentry>
-	  <varlistentry>
-		<term><guiicon>ÐÐÐÐÐÐÑÐ</guiicon></term>
-		<listitem>
-		<para>
-		ÐÑÐÐÑÐ ÐÑÐÐÐÑÑÐ <guilabel> âÐÐÑÐÐÐÐÐÐÐÑ â ÐÐÐÐÐÐÑÐâ </guilabel>
-		ÑÐ ÑÐÑÐÑÐÐÑÐÐ ÐÐÑÐ ÐÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ.
-		</para>
-		</listitem>
-	  </varlistentry>
-	  <varlistentry>
-		<term><guiicon>ÐÐÐÐÐÐÐ</guiicon></term>
-		<listitem>
-		<para>ÐÐÐÐÐÐÐ ÐÐÑÑ ÐÐÑÐÐÐÑÑ ÑÐÐÑÑ.</para>
-		</listitem>
+	    <term><guiicon>Save as</guiicon></term>
+	    <listitem>
+	      <para>Saves the PO file under a different name.</para>
+	    </listitem>
 	  </varlistentry>
-<!--
 	  <varlistentry>
-		<term><guiicon>Options</guiicon></term>
-		<listitem>
-		<para>Opens the <guilabel>Preferences</guilabel> window.</para>
-		</listitem>
+	    <term><guiicon>Header</guiicon></term>
+	    <listitem>
+	      <para>
+		Brings up the <guilabel>Edit Header</guilabel> dialog box
+		with a form that lets you fill in the fields of the PO files
+		header.
+	      </para>
+	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-		<term><guiicon>Exit</guiicon></term>
-		<listitem>
-		<para>Exits the application.</para>
-		</listitem>
+	    <term><guiicon>Undo</guiicon></term>
+	    <listitem>
+	      <para>Undoes your last action.</para>
+	    </listitem>
 	  </varlistentry>
--->
         </variablelist>
       </sect3>
 
       <sect3 id="gtranslator-toolbar-navigation">
-        <title>ÐÐÐÐÑÐ ÑÐ ÐÐÐÑÐÐÐ ÐÐ ÐÑÐÑÐÑÐ</title>
+        <title>Navigation buttons in the toolbar</title>
 
         <para>
-		ÐÐÐÐÑÐ ÑÐ ÐÐÐÑÐÐÐ ÐÐ ÐÑÐÑÐÑÐ ÐÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÑÐ ÐÑÐÑÐÑÐ ÐÑÐÐ ÐÐÑÑÐÐ. ÐÐÐÐÑÐ ÐÐÐ ÐÐÐÑÑÑÐ ÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐ ÐÐ ÐÑÑÐÑÐ ÑÐÑÐÐÑ ÐÐÐÐÐÑ.
+	  The navigation buttons allows you to navigate among
+	  messages. It also lets you search for strings, or
+	  search and replace strings.
 	</para> 
 
 	<variablelist>
 	  <varlistentry>
-		<term><guiicon>ÐÑÐÐ</guiicon></term>
-		<listitem>
-		<para>ÐÐÐÑÐ ÐÐ ÐÑÐÑ ÐÐÑÑÐÑ.</para>
-		</listitem>
+	    <term><guiicon>First</guiicon></term>
+	    <listitem>
+	      <para>Jumps to the first message.</para>
+	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-		<term><guiicon>ÐÑÐÑÑÐÐÐÐ</guiicon></term>
-		<listitem>
-		<para>ÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÑ ÐÐÑÑÐÑ.</para>
-		</listitem>
+	    <term><guiicon>Last</guiicon></term>
+	    <listitem>
+	      <para>Jumps to the last message.</para>
+	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-		<term><guiicon>ÐÐÐÐÐÑÐ</guiicon></term>
-		<listitem>
-		<para>ÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÑÐÑ.</para>
-		</listitem>
+	    <term><guiicon>Forward</guiicon></term>
+	    <listitem>
+	      <para>Jumps to the next message.</para>
+	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-		<term><guiicon>ÐÐÑÐÐÐÑÐ</guiicon></term>
-		<listitem>
-		<para>ÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐÑÑ ÐÐÑÑÐÑ.</para>
-		</listitem>
+	    <term><guiicon>Back</guiicon></term>
+	    <listitem>
+	      <para>Jumps to the previous message.</para>
+	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-		<term><guiicon>ÐÐÐÑÐÐÐÐÐÐÐ</guiicon></term>
-		<listitem>
-		<para>ÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐÐÐÐÐÐÑ ÐÐÑÑÐÑ.</para>
-		</listitem>
+	    <term><guiicon>Next Fuzzy</guiicon></term>
+	    <listitem>
+	      <para>Jumps to next fuzzy message.</para>
+	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-		<term><guiicon>ÐÐÑÐÑÐÐ</guiicon></term>
-		<listitem>
-		<para>ÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÑÐÑ ÐÐÑÑÐÑ.</para>
-		</listitem>
+	    <term><guiicon>Previous Fuzzy</guiicon></term>
+	    <listitem>
+	      <para>Jumps to the previous fuzzy message.</para>
+	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-		<term><guiicon>ÐÐÐÐÐ ÐÑÐÑ</guiicon></term>
-		<listitem>
-		<para>ÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐ ÑÐÐÐÐ ÐÑÐÑ ÐÐÑÑÐÐ.</para>
-		</listitem>
+	    <term><guiicon>Next Untranslated</guiicon></term>
+	    <listitem>
+	      <para>Jumps to the next untranslated message.</para>
+	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-		<term><guiicon>ÐÑÐÐÐÑÐ</guiicon></term>
-		<listitem>
-		<para>
-			ÐÑÐÐÑÐ ÐÑÐÐÐÑÑÐ <guilabel> âÐÑÐÐÐÑÐ Ñ ÐÐÑÐÑÐÑÐ ÑÐ ÐÑÐÐÐÐÐÐâ </guilabel>
-			. ÐÐÐ ÐÐÐ ÐÐÐÑÑÑÐ ÐÐ ÐÑÐÑÑÐÐÑÑÐÑÐ ÐÐÑÑÐÐ Ñ ÐÐÑÐÑÐÑÐ ÑÐ ÐÑÐÐÐÐÐÐ. ÐÐÐÐÑÐ ÐÐÐÐÑÐÑÐ ÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐÐÐÐÐÐ ÑÐÐÐ ÑÐÑÑÐÑ ÐÑÐÐÐÐÐÐÐÐÑ ÐÐÑÑÐÐ, ÐÑÐÐÐÐÐÐÐÑ ÐÐÑÑÐÐ, ÐÐÐÐÐÐÐÐ ÐÐÐ ÑÐÑÑÐÑ ÑÐÐÑ ÐÐÐÐÐÐÐÐÑ ÐÐÑÑÐÐ.
-		</para>
-		</listitem>
+	    <term><guiicon>Previous Untranslated</guiicon></term>
+	    <listitem>
+	      <para>Jumps to the previous untranslated message.</para>
+	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-		<term><guiicon>ÐÐÐÐÐÐ</guiicon></term>
-		<listitem>
-		<para>
-			ÐÑÐÐÑÐ ÐÑÐÐÐÑÑÐ <guilabel> â&app; â ÐÐÐÐÐÐâ </guilabel>.
-		 ÐÐÐ ÐÑÐÐÐÑÑÐ ÐÐÐ ÐÐÐÐÑÑÐÐÐ ÐÐ ÑÐÐÑÐÑÐ ÐÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐÐ ÐÐÐÐÑÑÑÐÑÐ ÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐ.
-		</para>
-		</listitem>
+	    <term><guiicon>Next Fuzzy or Untranslated</guiicon></term>
+	    <listitem>
+	      <para>Jumps to the next fuzzy or unstranslated message.</para>
+	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-		<term><guiicon>ÐÐÐÑ</guiicon></term>
-		<listitem>
-		<para>
-			ÐÑÐÐÑÐ ÐÑÐÐÐÑÑÐ  <guilabel> â&app; â ÐÑÐÑÑÐÐÐ ÐÐÑÐÐÐ ÑÐÐÐÐÐÑÑÐ ÐÐÐÑÐ</guilabel>. ÐÐÐ ÐÐÐ ÐÐÐÐÑÑÐÐÐ ÐÑÐÑÑÐÐÑ ÐÐÑÐÐÐ ÑÐÐÐÐÐÑÑÐ ÐÐÐÑÐ ÑÑ. ÐÑÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐ.
-		</para>
-		</listitem>
+	    <term><guiicon>Previous Fuzzy or Untranslated</guiicon></term>
+	    <listitem>
+	      <para>Jumps to the previous fuzzy or untranslated message.</para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guiicon>Jump to</guiicon></term>
+	    <listitem>
+	      <para>Jumps to the specified message number.</para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guiicon>Find</guiicon></term>
+	    <listitem>
+	      <para>
+		Opens the <guilabel>Find</guilabel>
+		dialog box. This dialog lets you search for strings
+		in the PO file. You can choose to find strings
+		inside original messages only, translated messages,
+		comments or all of the above. 
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guiicon>Replace</guiicon></term>
+	    <listitem>
+	      <para>
+		Opens the <guilabel>Replace dialog box</guilabel>.
+		This dialog lets you enter a string to search for
+		and a string to replace it with.
+	      </para>
+	    </listitem>
 	  </varlistentry>
 	</variablelist>
       </sect3>
@@ -455,11 +594,11 @@
 
     <!-- ================ Menu bar ================= -->
     <sect2 id="gtranslator-menubar">
-      <title>ÐÐÐÐÑÐ ÐÐÐÐÑÐ</title>
+      <title>Menu Bar</title>
 
       <para>
-	ÐÐÐÐÑÐ ÐÐÐÐÑÐ, ÐÐÑÐ ÑÐ ÑÐÐÑÑÐÐÐ ÐÑÐ ÐÑÑÑ 
-	<guilabel>ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÐÑÐÐÑÐÐÐ</guilabel> , ÑÐÐÑÐÐ ÑÐÐÐÐÑÐ ÑÑÐÐÐÐ:
+	The menu bar, located at the top of the
+	<guilabel>Main Window</guilabel>, contains the following menus:
       </para>
 
       <variablelist>
@@ -467,295 +606,239 @@
 	<!-- ================ File menu ================= -->
 	<varlistentry>
 
-	  <term><guimenu>ÐÐÑÐÑÐÐÐ</guimenu></term>
+	  <term><guimenu>File</guimenu></term>
 
 	  <listitem>
-	    <para>ÐÐÐ ÑÑÐÐÐÐ ÑÐÐÑÐÐ: 
+	    <para>This menu contains: 
 
-	    <itemizedlist>
+	      <itemizedlist>
 
 		<listitem>
-		<para>
-			<menuchoice>
-			  <shortcut>
-			    <keycombo>
-				<keycap>ALT</keycap><keycap>C</keycap>
-			    </keycombo>
-			  </shortcut>
-			  <guimenuitem>ÐÑÐÑÐÐÑÐ</guimenuitem>
-			</menuchoice>
-			ÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÑÐ Ñ ÐÐÐÐÑÐÐ ÐÐÐÐÐ.
-		</para>
+		  <para>
+		    <menuchoice>
+		      <shortcut>
+			<keycombo>
+			  <keycap>Control</keycap><keycap>O</keycap>
+			</keycombo>
+		      </shortcut>
+		      <guimenuitem>Open</guimenuitem>
+		    </menuchoice>
+		    This opens a PO file.
+		  </para>
 		</listitem>
 
 		<listitem>
-                <para>
-			<menuchoice>
-			  <shortcut>
-				<keycap>F5</keycap>
-			  </shortcut>
-			  <guimenuitem>ÐÐÑÑÐÑÐÑ</guimenuitem>
-			</menuchoice>
-			ÐÐÐÐ ÑÐ ÐÐÑÑÐÑÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐ.
-		</para>
+		  <para>
+		    <menuchoice>
+		      <guimenuitem>Recent Files</guimenuitem>
+		    </menuchoice>
+		    This shows a list of your recently opened PO files.
+		  </para>
 		</listitem>
 
 		<listitem>
-		<para>
-			<menuchoice>
-			  <shortcut>
-				<keycap>F10</keycap>
-			  </shortcut>
-			  <guimenuitem>ÐÑÑÐÐÐÑÑÐÐ ÐÑÐÐÐÐÐ</guimenuitem>
-			</menuchoice>
-			ÐÐÐÐ ÑÐ ÐÑÑÐÐÐÑÑÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÑÐÑÐÐ ÐÑÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐ.
-		</para>
+		  <para>
+		    <menuchoice>
+		      <shortcut>
+			<keycombo>
+			  <keycap>Ctrl</keycap><keycap>S</keycap>
+			</keycombo>
+		      </shortcut>
+		      <guimenuitem>Save</guimenuitem>
+		    </menuchoice>
+		    This saves your file.
+		  </para>
 		</listitem>
 
 		<listitem>
-		<para>
-			<menuchoice>
-			  <shortcut>
-				<keycap>F3</keycap>
-			  </shortcut>
-			  <guimenuitem>ÐÑÐÐÑÐ</guimenuitem>
-			</menuchoice>
-			ÐÐÐÐ ÑÐ ÐÑÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ.
-		</para>
+		  <para>
+		    <menuchoice>
+		      <shortcut>
+			<keycombo>
+			  <keycap>Ctrl</keycap><keycap>Shift</keycap><keycap>S</keycap>
+			</keycombo>
+		      </shortcut>
+		      <guimenuitem>Save As</guimenuitem>
+		    </menuchoice>
+		    This saves your PO file under a different name.
+		  </para>
 		</listitem>
 
 		<listitem>
-		<para>
-			<menuchoice>
-			  <shortcut>
-				<keycap>F?</keycap>
-			  </shortcut>
-			  <guimenuitem>ÐÑÐÐÑÐ ÑÐ ÐÐÑÐÑÐ</guimenuitem>
-			</menuchoice>
-			ÐÐÐÐ ÑÐ ÐÑÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÑÐÑÐÐ FTP ÐÐÐ HTTP ÐÑÐÑÐÐÐÐÐ.
-		</para>
+		  <para>
+		    <menuchoice>
+		      <shortcut>
+			<keycombo>
+			  <keycap>Ctrl</keycap><keycap>W</keycap>
+			</keycombo>
+		      </shortcut>
+		      <guimenuitem>Close</guimenuitem>
+		    </menuchoice>
+		    This closes your file.
+		  </para>
 		</listitem>
 
 		<listitem>
+		  <para>
+		    <menuchoice>
+		      <shortcut>
+			<keycombo>
+			  <keycap>Ctrl</keycap><keycap>Q</keycap>
+			</keycombo>
+		      </shortcut>
+		      <guimenuitem>Exit</guimenuitem>
+		    </menuchoice>
+		    This quits the application.
+		  </para>
+		</listitem>
+
+              </itemizedlist>
+            </para>
+          </listitem>
+	</varlistentry>
+
+	<!-- ================ Edit menu ================= -->
+	<varlistentry>
+          <term><guimenu>Edit</guimenu></term>
+
+	  <listitem>
+            <para>This menu contains:</para> 
+            <itemizedlist>
+
+	      <listitem>
 		<para>
-			<menuchoice>
-			  <shortcut>
-			    <keycombo>
-				<keycap>Ctrl</keycap><keycap>S</keycap>
-			    </keycombo>
-			  </shortcut>
-			  <guimenuitem>ÐÐÑÑÐÐÑ</guimenuitem>
-			</menuchoice>
-			ÐÐÐÐ ÑÐ ÑÑÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ.
+		  <menuchoice>
+		    <shortcut>
+		      <keycombo>
+			<keycap>Ctrl</keycap><keycap>Z</keycap>
+		      </keycombo>
+		    </shortcut>
+		    <guimenuitem>Undo</guimenuitem>
+		  </menuchoice>
+		  This undoes your last change.
 		</para>
-		</listitem>
+	      </listitem>
 
-		<listitem>
+	      <listitem>
 		<para>
-			<menuchoice>
-			  <shortcut>
-			    <keycombo>
-				<keycap>Ctrl</keycap><keycap>Shift</keycap><keycap>S</keycap>
-			    </keycombo>
-			  </shortcut>
-			  <guimenuitem>ÐÐÑÑÐÐÑ ÐÐÐ...</guimenuitem>
-			</menuchoice>
-			ÐÐÐÐ ÑÐ ÑÑÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ â ÑÐÐÐ ÐÐÐ ÐÑÑÐÐÐ ÐÐÐÐÐÐ.
+		  <menuchoice>
+		    <shortcut>
+		      <keycombo>
+			<keycap>Ctrl</keycap><keycap>X</keycap>
+		      </keycombo>
+		    </shortcut>
+		    <guimenuitem>Cut</guimenuitem>
+		  </menuchoice>
+		  This removes any text or data which is selected and
+		  places it in the buffer.
 		</para>
-		</listitem>
+	      </listitem>
 
-		<listitem>
+	      <listitem>
 		<para>
-			<menuchoice>
-			  <guimenuitem>ÐÑÐÑÐ</guimenuitem>
-			</menuchoice>
-			ÐÐÐÐ ÑÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐ Ñ ÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÑÑÐÑÐ.
+		  <menuchoice>
+		    <shortcut>
+		      <keycombo>
+			<keycap>Ctrl</keycap><keycap>C</keycap>
+		      </keycombo>
+		    </shortcut>
+		    <guimenuitem>Copy</guimenuitem>
+		  </menuchoice>
+		  This copies any text or data which is selected into
+		  the buffer.
 		</para>
-		</listitem>
+	      </listitem>
 
-		<listitem>
+	      <listitem>
 		<para>
-			<menuchoice>
-			  <shortcut>
-			    <keycombo>
-				<keycap>Ctrl</keycap><keycap>W</keycap>
-			    </keycombo>
-			  </shortcut>
-			  <guimenuitem>ÐÐÑÐÐÑÐ</guimenuitem>
-			</menuchoice>
-			ÐÐÐÐ ÑÐ ÐÐÑÐÐÑÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ.
+		  <menuchoice>
+		    <shortcut>
+		      <keycombo>
+			<keycap>Ctrl</keycap><keycap>V</keycap>
+		      </keycombo>
+		    </shortcut>
+		    <guimenuitem>Paste</guimenuitem>
+		  </menuchoice>
+		  This pastes any text or data
+		  which is copied into the buffer.
 		</para>
-		</listitem>
+	      </listitem>
 
-		<listitem>
+	      <listitem>
 		<para>
-			<menuchoice>
-			  <guimenuitem>ÐÐÐÑÐ ÐÑÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ</guimenuitem>
-			</menuchoice>
-			ÐÐÐÐ ÑÐ ÐÑÐÐÐÐÑÑÐ ÑÐÐÑÐÐ ÑÐÐÑÐ ÐÑÐÐÑÐÐÐÑ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ.
+		  <menuchoice>
+		    <guimenuitem>Clear</guimenuitem>
+		  </menuchoice>
+		  This removes the selected text.
 		</para>
-		</listitem>
+	      </listitem>
 
-		<listitem>
+	      <listitem>
 		<para>
-			<menuchoice>
-			  <shortcut>
-			    <keycombo>
-				<keycap>Ctrl</keycap><keycap>E</keycap>
-			    </keycombo>
-			  </shortcut>
-			  <guimenuitem>ÐÐÐÐÐÐ UTF-8 ÐÐÐÐÑ</guimenuitem>
-			</menuchoice>
-			ÐÐÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ Ñ UTF-8 ÐÐÐÐÐ ÐÐÐÐÑ.
+                  <guimenuitem>Header...</guimenuitem>
+		  This opens a dialog box which allows you to edit
+		  information stored in the PO file header.
 		</para>
-		</listitem>
+	      </listitem>
 
-		<listitem>
+	      <listitem>
 		<para>
-			<menuchoice>
-			  <shortcut>
-			    <keycombo>
-				<keycap>Ctrl</keycap><keycap>I</keycap>
-			    </keycombo>
-			  </shortcut>
-			  <guimenuitem>ÐÐÐÐÐ UTF-8 ÐÐÐÐÑ</guimenuitem>
-			</menuchoice>
-			ÐÐÐÐ ÑÐ ÑÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ Ñ UTF-8 ÐÐÐÐÐÐ ÐÐÐÐÑÑ.
+                  <guimenuitem>Comment...</guimenuitem>
+		  This allows to write a comment associates
+		  to one message.
 		</para>
-		</listitem>
+	      </listitem>
 
-		<listitem>
+	      <listitem>
 		<para>
-			<menuchoice>
-			  <shortcut>
-			    <keycombo>
-				<keycap>Ctrl</keycap><keycap>Q</keycap>
-			    </keycombo>
-			  </shortcut>
-			  <guimenuitem>ÐÐÐÑÐ</guimenuitem>
-			</menuchoice>
-			ÐÐÐÐ ÑÐ ÐÐÐÑÑÑÐ ÐÑÐÐÑÐÐ.
+		  <menuchoice>
+		    <shortcut>
+		      <keycombo>
+			<keycap>Ctrl</keycap><keycap>Space</keycap>
+		      </keycombo>
+		    </shortcut>
+		    <guimenuitem>Copy Message to Translation</guimenuitem>
+		  </menuchoice>
+		  This pastes the text from the original message in the
+		  translated message.
 		</para>
-		</listitem>
+	      </listitem>
 
-            </itemizedlist>
-            </para>
-          </listitem>
-	</varlistentry>
+	      <listitem>
+		<para>
+		  <menuchoice>
+		    <shortcut>
+		      <keycombo>
+			<keycap>Ctrl</keycap><keycap>U</keycap>
+		      </keycombo>
+		    </shortcut>
+		    <guimenuitem>Toogle Fuzzy Status</guimenuitem>
+		  </menuchoice>
+		  This set the current message to fuzzy.
+		</para>
+	      </listitem>
 
-	<!-- ================ Edit menu ================= -->
-	<varlistentry>
-          <term><guimenu>ÐÑÐÑÐÐÐÑÐ</guimenu></term>
+	      <listitem>
+		<para>
+		  <guimenuitem>Translation memory</guimenuitem>
+		  This shows the options in the translation memory 
+		  for the current message.
+		</para>
+	      </listitem>
 
-	  <listitem>
-            <para>ÐÐÐÑ ÐÐÐÐ ÑÐÐÑÐÐ:</para> 
-            <itemizedlist>
-
-		<listitem>
-		<para>
-			<menuchoice>
-			  <shortcut>
-			    <keycombo>
-				<keycap>Ctrl</keycap><keycap>Z</keycap>
-			    </keycombo>
-			  </shortcut>
-			  <guimenuitem>ÐÐÐÐÐÐÐ</guimenuitem>
-			</menuchoice>
-			ÐÐÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐ.
-		</para>
-		</listitem>
-
-		<listitem>
-		<para>
-			<menuchoice>
-			  <shortcut>
-			    <keycombo>
-				<keycap>Ctrl</keycap><keycap>X</keycap>
-			    </keycombo>
-			  </shortcut>
-			  <guimenuitem>ÐÑÐÑÐ</guimenuitem>
-			</menuchoice>
-			ÐÐÐÐ ÑÐ ÐÑÐÐÐÑÑÐ ÐÐÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÑ ÐÐÐ ÐÐÐÐÑÐÐ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ.
-		</para>
-		</listitem>
-
-		<listitem>
-		<para>
-			<menuchoice>
-			  <shortcut>
-			    <keycombo>
-				<keycap>Ctrl</keycap><keycap>C</keycap>
-			    </keycombo>
-			  </shortcut>
-			  <guimenuitem>ÐÐÐÐÐÐ</guimenuitem>
-			</menuchoice>
-			ÐÐÐÐ ÑÐ ÑÐÐÐÐÐÐÐ ÐÐÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÑ ÐÐÐ ÐÐÐÐÑÐÐ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ.
-		</para>
-		</listitem>
-
-		<listitem>
-		<para>
-			<menuchoice>
-			  <shortcut>
-			    <keycombo>
-				<keycap>Ctrl</keycap><keycap>V</keycap>
-			    </keycombo>
-			  </shortcut>
-			  <guimenuitem>ÐÐÐÑÐ</guimenuitem>
-			</menuchoice>
-			ÐÐÐÐ ÑÐ ÐÑÐÐÐÑÐ ÑÐÐÐÐÐÐÐ ÐÐÐ ÐÑÐÑÐÐÐ ÑÐÐÑÑ ÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ Ñ ÐÑÐÐÑÐÐ.
-		</para>
-		</listitem>
-
-		<listitem>
-		<para>
-			<menuchoice>
-			  <shortcut>
-			    <keycombo>
-				<keycap>Ctrl</keycap><keycap>D</keycap>
-			    </keycombo>
-			  </shortcut>
-			  <guimenuitem>ÐÐÐÐÐÐ</guimenuitem>
-			</menuchoice>
-			ÐÐÐÐ ÑÐ ÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÑ.
-		</para>
-		</listitem>
-
-		<listitem>
-		<para>
-			<guimenuitem>ÐÑÐÐÐÑÐ...</guimenuitem>
-			ÐÐÐÐ ÑÐ ÐÑÐÐÑÐ ÐÑÐÐÐÑÑÐ
-                	<guilabel>âÐÑÐÐÐÑÐ Ñ ÐÐÑÐÑÐÑÐ ÑÐ ÐÑÐÐÐÐÐÐâ</guilabel>.
-		</para>
-		</listitem>
-
-		<listitem>
-		<para>
-                	<guimenuitem>ÐÐÑÐ ÑÐÐÐÐÑÐ</guimenuitem>
-			ÐÐÐÐ ÑÐ ÑÑÐÐÐ ÑÐÐÐÐÑÐ ÐÐÑÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐ ÐÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ.
-		</para>
-		</listitem>
-
-		<listitem>
-		<para>
-			<guimenuitem>ÐÐÐÐÐÐ...</guimenuitem>
-			ÐÐÐÐ ÑÐ ÐÑÐÐÑÐ ÐÑÐÐÐÑÑÐ âÐÐÑÐÐÐÐÐÐÐÑ â ÐÐÐÐÐÐ.
-		</para>
-		</listitem>
-
-		<listitem>
+	      <listitem>
 		<para>
-			<guimenuitem>ÐÐÑÑÐÐÐ ÑÐÐÑ</guimenuitem>
-			ÐÐÐÐ ÑÐ ÐÑÐÐÑÐ ÐÑÐÐÐÑÑÐ âÐÐÑÐÐÐÐÐÐÐÑ â ÐÑÐÑÑÐÐÐ ÐÑÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐâ. ÐÐÐ ÐÐÐ ÐÐÐÐÑÑÐÐÐ ÐÐ ÐÑÐÑÑÐÐÑÑÐÑÐ ÐÑÐÐÐÐÐÐÐÑÐÑ ÐÐÐÐÑÐÑÑ.
+		  <guimenuitem>Toolbar</guimenuitem>
+		  This opens the <guilabel>Toolbar Editor</guilabel>.
 		</para>
-		</listitem>
+	      </listitem>
 
-		<listitem>
+	      <listitem>
 		<para>
-                	<guimenuitem>ÐÐÐÐÐÐÑÐ</guimenuitem>
-			ÐÐÐÐ ÑÐ ÐÑÐÐÑÐ ÐÑÐÐÐÑÑÐ âÐÐÑÐÐÐÐÐÐÐÑ â ÐÐÐÐÐÐÑÐâ, ÐÐÑÐ ÐÐÐ ÐÐÐÐÑÑÐÐÐ ÐÐ ÑÑÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ Ñ ÐÐÐÐÐÐÑÑ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ.
+		  <guimenuitem>Preferences</guimenuitem>
+		  This opens the <guilabel>Preferences</guilabel> dialog.
 		</para>
-		</listitem>
+	      </listitem>
 
 	    </itemizedlist>
 	  </listitem>
@@ -763,19 +846,25 @@
 
 	<!-- ================ View menu ================= -->
 	<varlistentry>
-	  <term><guimenu>ÐÑÐÐÐÐ</guimenu></term>
+	  <term><guimenu>View</guimenu></term>
 	  <listitem>
-	    <para>ÐÐÐÑ ÐÐÐÐ ÑÐÐÑÐÐ:</para> 
+	    <para>This menu contains:</para> 
 
 	    <itemizedlist>
 
-		<listitem>
+	      <listitem>
                 <para>
-			<guisubmenu>ÐÐÐÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐÐÑÐ</guisubmenu>
-			ÐÐÐÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÑÐ ÐÐÑÑ ÐÐÐÑÐÐÑ ÐÐÐÐÐÐÐÑÐÑÑ ÐÐÑÐ
-			ÐÐ ÐÐÐÐÐÐ ÑÐ ÐÐÑÑÐÐÐÐ.
+		  <guisubmenu>Context</guisubmenu>
+		  This shows or hides the context panel. 
 		</para>
-		</listitem>
+	      </listitem>
+
+	      <listitem>
+                <para>
+		  <guisubmenu>Translation Memory</guisubmenu>
+		  This shows or hides the translation memory panel. 
+		</para>
+	      </listitem>
 
             </itemizedlist>
           </listitem>
@@ -783,98 +872,154 @@
 
 	<!-- ================ Go menu ================= -->
 	<varlistentry>
-	  <term><guimenu>ÐÐÑÑÐÐ</guimenu></term>
+	  <term><guimenu>Go</guimenu></term>
 	  <listitem>
-	    <para>ÐÐÐÑ ÐÐÐÐ ÑÐÐÑÐÐ:</para>
+	    <para>This menu contains:</para>
 
 	    <itemizedlist>
 
-		<listitem>
+	      <listitem>
 		<para>
-			<guimenuitem>ÐÑÐÐ</guimenuitem>
-			(ÐÐÐÐÐÑÑÐÐÐ)
+		  <guimenuitem>First</guimenuitem>
+		  Go to the first message.
 		</para>
-		</listitem>
+	      </listitem>
 
-		<listitem>
+	      <listitem>
 		<para>
-			<guimenuitem>ÐÑÐÑÑÐÐÐÐ</guimenuitem>
-			(ÐÐÐÐÐÑÑÐÐÐ)
+		  <guimenuitem>Back</guimenuitem>
+		  Go to the previous message.
 		</para>
-		</listitem>
+	      </listitem>
 
-		<listitem>
+	      <listitem>
 		<para>
-			<guimenuitem>ÐÐÐÐÐÑÐ</guimenuitem>
-			(ÐÐÐÐÐÑÑÐÐÐ)
+		  <guimenuitem>Next</guimenuitem>
+		  Go to the next message.
 		</para>
-		</listitem>
+	      </listitem>
 
-		<listitem>
+	      <listitem>
 		<para>
-			<guimenuitem>ÐÐÑÐÐÐÑÐ</guimenuitem>
-			(ÐÐÐÐÐÑÑÐÐÐ)
+		  <guimenuitem>Last</guimenuitem>
+		  Go to the last message.
 		</para>
-		</listitem>
+	      </listitem>
 
-		<listitem>
+	      <listitem>
 		<para>
-			<guimenuitem>ÐÐÐÐÐ ÐÑÐÑ...</guimenuitem>
-			(ÐÐÐÐÐÑÑÐÐÐ)
+		  <guimenuitem>Next fuzzy</guimenuitem>
+		  Go to the next fuzzy message.
 		</para>
-		</listitem>
+	      </listitem>
 
-		<listitem>
+	      <listitem>
 		<para>
-			<guimenuitem>ÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐ</guimenuitem>
-			(ÐÐÐÐÐÑÑÐÐÐ)
+		  <guimenuitem>Previous fuzzy</guimenuitem>
+		  Go to the previous fuzzy message.
 		</para>
-		</listitem>
+	      </listitem>
+	     
+	      <listitem>
+		<para>
+		  <guimenuitem>Next untranslated</guimenuitem>
+		  Go to the next untranslated message.
+		</para>
+	      </listitem>
+
+	      <listitem>
+		<para>
+		  <guimenuitem>Previous untranslated</guimenuitem>
+		  Go to the previous untranslated message.
+		</para>
+	      </listitem>
+
+	      <listitem>
+		<para>
+		  <guimenuitem>Next fuzzy or untranslated</guimenuitem>
+		  Go to the next fuzzy or untranslated message.
+		</para>
+	      </listitem>
+
+	      <listitem>
+		<para>
+		  <guimenuitem>Previous fuzzy or untranslated</guimenuitem>
+		  Go to the previous fuzzy or untranslated message.
+		</para>
+	      </listitem>
 
 		<listitem>
 		<para>
-			<guimenuitem>ÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÐÐÐÐ</guimenuitem>
-			(ÐÐÐÐÐÑÑÐÐÐ)
+		  <guimenuitem>Jump to</guimenuitem>
+		  Go to the message with a specific number.
 		</para>
-		</listitem>
+	      </listitem>
 
 	    </itemizedlist>
 	  </listitem>
 	</varlistentry>
 
+	<!-- ================ Search menu ================= -->
+	<varlistentry>
+	  <term><guimenu>Search</guimenu></term>
+	  <listitem>
+	    <para>This menu contains:</para> 
+
+	    <itemizedlist>
+
+	      <listitem>
+		<para>
+		  <guimenuitem>Find</guimenuitem>
+		  This command opens the 
+                  <guilabel>Find</guilabel> dialog.
+		</para>
+	      </listitem>
+	   
+	      <listitem>
+		<para>
+		  <guimenuitem>Replace</guimenuitem>
+		  This opens the <guilabel>Replace</guilabel> dialog.
+		</para>
+	      </listitem>
+
+            </itemizedlist>
+          </listitem>
+        </varlistentry>
+
 	<!-- ================ Help menu ================= -->
 	<varlistentry>
-	  <term><guimenu>ÐÐÐÐÑ</guimenu></term>
+	  <term><guimenu>Help</guimenu></term>
 	  <listitem>
-	    <para>ÐÐÐÑ ÐÐÐÐ ÑÐÐÑÐÐ:</para>
+	    <para>This menu contains:</para>
 	    <itemizedlist>
 
-		<listitem>
+	      <listitem>
 		<para>
-			<guimenuitem>ÐÐÐÑÐÐÑ</guimenuitem>
-			ÐÐÐÐ ÑÐ ÐÑÐÐÑÐ
-                	<application>ÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐ</application>
-			(ÐÐÐ <application>ÐÐÑÑÐÐÑÑ</application>)
-			 Ð ÐÑÐÐÐÐÑÑÐ ÑÐ ÑÐÑÑÑÑÐÐ.
+		  <guimenuitem>Contents</guimenuitem>
+		  This opens the 
+                  <application>GNOME Help Browser</application>
+		  (or <application>Nautilus</application>)
+		  and displays this manual.
 		</para>
-		</listitem>
+	      </listitem>
 
-		<listitem>
+	      <listitem>
 		<para>
-			<guimenuitem>ÐÐÑÐÑÐÐÑ ÑÑÑÐÐÐ</guimenuitem>
-			ÐÐÐÐ ÑÐ ÐÑÐÐÑÐ <application>&app;</application> ÐÐÑÐÑÐÐÑ ÑÑÑÐÐÐ.
+		  <guimenuitem>Gtranslator website</guimenuitem>
+		  This opens the <application>Gtranslator</application> webpage.
 		</para>
-		</listitem>
+	      </listitem>
 
-		<listitem>
+	      <listitem>
 		<para>
-			<guimenuitem>Ð ÐÑÐÐÑÐÐÑ</guimenuitem>
-			ÐÐÐÐ ÑÐ ÐÑÐÐÑÐ ÐÑÐÐÐÑÑÐ <guilabel>âÐ ÐÑÐÐÑÐÐÑâ</guilabel>
-			Ñ ÐÐÐÐ ÑÑ ÐÑÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÑÐÑÐ Ð ÐÑÐÐÑÐÐÑ
-			<application>&app;</application>, ÐÐÐ ÑÑÐ ÑÑ ÐÐÐ ÐÑÑÐÑÐ, ÐÐÑÐÐÑÐ ÐÑÐÐÑÐÐÐ
-			Ð ÐÐÑÐÑÐÐÑ ÑÑÑÐÐÐ ÐÑÐÐÑÐÐÐ.
+		  <guimenuitem>About</guimenuitem>
+		  This opens the <guilabel>About</guilabel> dialog
+		  which shows basic information about 
+		  <application>Gtranslator</application>, such as author
+		  name, the application version number, and the URL
+		  for the application web page.
 		</para>
-		</listitem>
+	      </listitem>
 
 	    </itemizedlist>
 	  </listitem>
@@ -885,506 +1030,721 @@
 
 
     <sect2 id="gtranslator-commandline-option">
-      <title>ÐÐÑÑÑÐÐÐ ÐÐÑÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÐÐÐÐ</title>
+      <title>Available commandline options</title>
       <para>
-		<application>&app;</application> ÐÐÐÐ ÐÑÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐ ÐÑÐÑ ÐÐÑÐÐÐÑÐÑÐ
-		ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐÐÐ:
+	<application>Gtranslator</application> understands a number of
+	command line options:
       </para>
- 
+      
       <variablelist>
 
 	<varlistentry>
           <term><varname>--help</varname></term>
           <listitem>
-		<para>
-			ÐÑÐÐÐÐÑÑÐ ÐÑÐÑÐÑ ÐÐÐÐÑ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐÐÐ.
-		</para>
+	    <para>
+	      Shows you a short help message on the command line.
+	    </para>
 	  </listitem>
 	</varlistentry>
 
+      </variablelist>
+    </sect2>
+  </sect1>
+  <!-- ========== end of Using gtranslator ========== -->
+
+
+  <!-- ============= Customization ============ -->
+  <sect1 id="gtranslator-preferences">
+    <title>Customization</title>
+    <para>
+      To change the application settings, select 
+      <menuchoice>
+	<guimenu>Edit</guimenu>
+	<guimenuitem>Preferences</guimenuitem>
+      </menuchoice>. This opens the 
+      <interface>Preferences</interface> dialog.
+    </para>
+
+    <figure id="gtranslator-preferences-screenshot">
+      <title>Preferences Dialog</title>
+      <screenshot>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="figures/prefs.png" format="PNG"/>
+	  </imageobject>
+	  <textobject>
+	    <phrase>Gtranslator Preferences Dialog</phrase>
+	  </textobject>
+	</mediaobject>
+      </screenshot>
+    </figure>
+
+    <sect2 id="gtranslator-prefs-file">
+      <title>File Tab</title>
+      
+      <para>
+	The properties in the 
+	<guilabel>File</guilabel> tab are: 
+      </para>
+      
+      <variablelist>
 	<varlistentry>
-          <term><varname>--version</varname></term>
+	  <term><guilabel>Autosave files every x minutes</guilabel></term>
 	  <listitem>
-		<para>
-			ÐÑÐÐÐÐÑÑÐ ÐÐÑÐÐÑÑ ÐÑÐÐÑÐÐÐ <application>&app;</application>.
-		</para>
+	    <para>
+	      This option set how often <application>Gtranslator</application> must be
+	      save the current file.
+	    </para>
 	  </listitem>
 	</varlistentry>
-
 	<varlistentry>
-	  <term><varname>--display</varname></term>
+	  <term><guilabel>Create a backup copy of files before saving</guilabel></term>
 	  <listitem>
-		<para>
-			ÐÐÐÑÑÑÐ ÐÐÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÑÐÐ ÐÐÐ ÑÐ ÐÐÑÐ ÐÐÐÑÐÐÑÑ Ð ÐÑÐÐÐÐÐÐ <application>&app;</application> .
-		</para>
+	    <para>
+	      (TBD)
+	    </para>
 	  </listitem>
 	</varlistentry>
+      </variablelist>
+      
+    </sect2>
+    
+    <sect2 id="gtranslator-prefs-editor">
+      <title>Editor Tab</title>
+
+      <para>
+	The properties in the 
+	<guilabel>Editor</guilabel> tab are: 
+      </para>
+      
+      <figure id="gtranslator-preferences-editor">
+      <title>Editor Tab</title>
+      <screenshot>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="figures/prefs-editor.png" format="PNG"/>
+	  </imageobject>
+	  <textobject>
+	    <phrase>Gtranslator Editor Tab</phrase>
+	  </textobject>
+	</mediaobject>
+      </screenshot>
+      </figure>
 
+      <variablelist>
 	<varlistentry>
-	  <term>
-	    <varname>-w</varname>, <varname>--webalize=<replaceable>ÐÐÐÐÐÐÐÐ</replaceable></varname>
-	  </term>
+	  <term><guilabel>Highlight message syntax</guilabel></term>
 	  <listitem>
-		<para>
-			ÐÑÐÐÑÐ ÐÐÐÐ ÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÑ (ÐÐÑÐÑÐ ÐÐÐÐÑÑÐ ÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐ ÐÑÐÑÐÑÐ ÐÑÐÑÐÐÐÑ) ÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ.
-		</para>
-		<para>
-			ÐÐÐÐÐ ÐÑÐÐÐÑ ÐÐ ÐÐÐ:
-			<command>gtranslator --webalize=<replaceable>ÐÐÐÐÐ.html</replaceable> <replaceable>ÐÑÐÐÐÐ.po</replaceable></command>
-		</para>
+	    <para>
+	      This option allows activate the highlight syntax in the
+	      original and translated message boxes.
+	    </para>
 	  </listitem>
 	</varlistentry>
-
 	<varlistentry>
-	  <term><varname>--scheme</varname></term>
+	  <term><guilabel>Make whitespace visible</guilabel></term>
 	  <listitem>
-		<para>
-			ÐÐÑÑÐÐÑÐ ÑÐÐÑÐÐÑÐÐ ÐÑÐÐÑÑÐÐÐÑÐ ÐÐÑÐÐÐÑÐÐÐ Ñ ÐÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÑÐ ÐÐÐ ÐÐÑÐÐÐÑÑÑ.
-		</para>
-		<para>
-			ÐÐ ÐÑÐÐÐÑ: 
-			<command>gtranslator --scheme=<replaceable>ÐÐÑÐÑÐÐÐ</replaceable></command>
-		</para>
+	    <para>
+	      With this option active the withespace in the original and
+	      translated boxes are shown as a dot.
+	    </para>
 	  </listitem>
 	</varlistentry>
-
 	<varlistentry>
-	  <term><varname>--geometry</varname></term>
+	  <term><guilabel>Use custom font</guilabel></term>
 	  <listitem>
-		<para>
-			ÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ ÑÑÐÐÐÐÑÐÐÐ ÐÐÐÐÐÑÑÐÑÑÐÐ ÐÐÐ
-			ÐÑÐÐÐ ÐÐÐÐ ÑÐ ÑÐ 
-			<guilabel>ÐÑÐÐÐÑ ÐÑÐÐÑÐÐÐ</guilabel>
-			ÐÐÑÐÐÐÐÐÑÐ.
-		</para>
-		<para>
-			ÐÐ ÐÑÐÐÐÑ, ÑÐÐÐÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐÑÐ: 
-				<command>gtranslator --geometry="320x240+0+0" <replaceable>ÐÑÐÐÐÐ.po</replaceable></command>
-			(ÐÐÐ ÑÐÐÑÑÐ ÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐÑÑ (0,0), Ñ ÐÐÑÑÐÐ ÐÐÐÐÐ ÑÐÐÑ, 
-			Ð ÑÐ ÐÐÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐ 320x240).
-		</para>
+	    <para>
+	      This option lets you set a custom font for the original and
+	      translated boxes.
+	    </para>
 	  </listitem>
-        </varlistentry>
-
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Remove fuzzy status if message is changed</guilabel></term>
+	  <listitem>
+	    <para>
+	      If this option is active the status will change automatically if
+	      you edit a message.
+	    </para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Check spelling</guilabel></term>
+	  <listitem>
+	    <para>
+	      This option active the check spelling for your language in
+	      the original and translated boxes.
+	    </para>
+	  </listitem>
+	</varlistentry>
       </variablelist>
+      
     </sect2>
-  </sect1>
-<!-- ========== end of Using gtranslator ========== -->
-
-
-<!-- ============= Customization ============ -->
-  <sect1 id="gtranslator-preferences">
-    <title>ÐÑÐÐÐÐÐÑÐÐÐÑÐ</title>
-    <para>
-	ÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÐÑÐÐ, ÐÐÐÐÐÑÐÑÐ ÑÐÐÐÐ ÑÐÐÐÐÑÐ ÑÑÐÐÐÐ: 
-	<menuchoice>
-		<guimenu> âÐÑÐÑÐÐÐÑÐâ </guimenu>
-		<guimenuitem> âÐÐÑÑÐÐÐÐ...â </guimenuitem>
-	</menuchoice>. ÐÐÐÐ ÑÐ ÐÑÐÐÑÐ ÐÑÐÐÐÑÑÐ
-	<interface>âÐÐÑÐÐÐÐÐÐÐÑ â ÐÐÑÑÐÐÐÐâ</interface> .
-    </para>
-
-    <figure id="gtranslator-preference-screenshot">
-	<title>ÐÑÐÐÐÑÑÐ â ÐÐÑÑÐÐÐÐ</title>
-	<screenshot>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata fileref="figures/prefs.png" format="PNG"/>
-	    </imageobject>
-	    <textobject>
-	      <phrase>&app; Preference Dialog</phrase>
-	    </textobject>
-	  </mediaobject>
-	</screenshot>
-    </figure>
-
-<!--
-    <FIGURE FLOAT="0" id="PREFERENCES-FIG">
-      <title>Preferences Dialog</title>
-      <SCREENSHOT>
-        <SCREENINFO>Preferences Dialog</SCREENINFO>
-        <GRAPHIC FILEREF="figures/prefs" FORMAT="PNG"
-        SRCCREDIT="emese"></GRAPHIC>
-      </SCREENSHOT>
-    </FIGURE>
--->
-    <para>
-	ÐÐÑÐ ÑÐÑÑÐÑ ÑÐÐÐÑÐÐ 
-	<guilabel>âÐÐÐÐÐÐÑÐâ</guilabel> ÑÑ: 
-    </para>
 
-    <variablelist>
-	  <varlistentry>
-		<term><guilabel>ÐÐÐ ÐÑÑÐÑÐ</guilabel></term>
-		<listitem>
-		<para>
-			ÐÐÐÑÐÑÐ ÐÐÑÐ ÐÐÐ. ÐÐÐ ÐÐÑÐÑÐÐÑÐÑÐ ÑÐ ÐÐÑÐ ÑÐÑÑÐÐÐÐ ÑÐÑÑÐÑ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ.
-		</para>
-		</listitem>
-	  </varlistentry>
-	  <varlistentry>
-		<term><guilabel>ÐÐÑÐÑÐ Ð-ÐÐÑÑÐ ÐÑÑÐÑÐ</guilabel></term>
-		<listitem>
-		<para>
-			ÐÐÐÑÐÑÐ ÐÐÑÑ ÐÐÑÐÑÑ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐ. ÐÐÐ ÐÐÑÐÑÐÐÑÐÑÐ ÑÐ ÐÐÑÐ ÑÐÑÑÐÐÐÐ ÑÐÑÑÐÑ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ.
-		</para>
-		</listitem>
-	  </varlistentry>
-	  <varlistentry>
-		<term><guilabel>ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐ ÑÐÐÑÐ</guilabel></term>
-		<listitem>
-		<para>
-			ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÑÑÑÐÐ ÑÐÐÑÐÐ.
-		</para>
-		</listitem>
-	  </varlistentry>
-    </variablelist>
+    <sect2 id="gtranslator-prefs-profiles">
+      <title>Profiles Tab</title>
 
-    <para>
-	ÐÐÑÐ ÐÐÑÐ ÑÐÐÐÐÑÑ Ñ 
-	<guilabel>ÑÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐÑÐ</guilabel> ÑÑ:
-    </para>
+      <para>
+	The 
+	 <guilabel>Editor</guilabel> tab contains: 
+      </para>
+      
+      <figure id="gtranslator-preferences-profiles">
+      <title>Profiles Tab</title>
+      <screenshot>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="figures/profiles.png" format="PNG"/>
+	  </imageobject>
+	  <textobject>
+	    <phrase>Gtranslator Profiles Tab</phrase>
+	  </textobject>
+	</mediaobject>
+      </screenshot>
+      </figure>
 
-    <variablelist>
+      <variablelist>
 	<varlistentry>
-		<term><guilabel>ÐÐÐÐÐ</guilabel></term>
-		<listitem>
-		<para>
-			ÐÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÑÐÐ ÑÐÐÑÐÐ ÑÐÐÐÐ Ñ ÐÐÐÐ ÑÐ ÐÑÑÐÐÑÑÑÐ ÐÑÐÐÐÐ. 
-			<application>&app;</application> ÐÐÐÑÑÐÐÐ ÐÑÑÐÑÐÐ ÑÐÑÐÑÐÐÑÐ
-			ÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐÐ ÐÑÐÐÐÐÑÑÐÐÐ ÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐÐ. ÐÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÐ ÐÑ ÐÐÐÑÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐ ÐÐÑÐÑÑÐÑÐ.
-		</para>
-		</listitem>
+	  <term><guilabel>Add button</guilabel></term>
+	  <listitem>
+	    <para>
+	      It shows the <guilabel>Profile</guilabel> dialog in order to
+	      create a new profile.
+	    </para>
+	  </listitem>
 	</varlistentry>
 	<varlistentry>
-		<term><guilabel>ÐÐÐ ÑÐÐÐÐÐ</guilabel></term>
-		<listitem>
-		<para>
-			ÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐ 639-2 ÑÐÐÐÑÐÐ ÐÐÐ ÐÐÑÐ ÑÐ ÐÐÑÐÑÑÐ ÐÐ ÑÐÐÐÐ Ñ ÐÐÑÐÐ ÑÐ ÐÑÑÐÐÑÑÑÐ ÐÑÐÐÐÐ. ÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ ÑÐ ÐÐÐÑÐ ÐÐÑ ÐÑÐÐÐÐÑÑ.
-		</para>
-		</listitem>
+	  <term><guilabel>Edit button</guilabel></term>
+	  <listitem>
+	    <para>
+	      It shows the <guilabel>Profile</guilabel> dialog in order to
+	      edit an exists profile.
+	    </para>
+	  </listitem>
 	</varlistentry>
 	<varlistentry>
-        	<term><guilabel>Ð-ÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐÐÐ ÑÐÐÐ</guilabel></term>
-		<listitem>
-		<para>
-			ÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐÑÑÐ ÐÐÑÐÑÑ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐ ÐÐÑÑ ÐÐÑÐÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐÐ ÑÐÐ.
-		</para>
-		</listitem>
+	  <term><guilabel>Delete button</guilabel></term>
+	  <listitem>
+	    <para>
+	      It removes the selected profile.
+	    </para>
+	  </listitem>
 	</varlistentry>
-	<varlistentry>
-		<term><guilabel>ÐÐÐÐÐÐÐÐ ÑÐÑÐ</guilabel></term>
-		<listitem>
-		<para>
-			ÐÐÑÐ <guilabel>ÐÐÐÐÐÐÐÐ ÑÐÑÐ</guilabel> ÐÑÐÐÐÐÑÑÐ
-			ÐÐÐÐÑ ÐÐÑÐ ÑÐ ÐÐÑÐÑÑÐ ÐÐ ÑÑÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ.
-			<application>&app;</application> ÐÐÐ ÐÑÐÐ ÑÐÐÐÑ ÐÐÐÑÐÐÑÐÐÐÐÐÑ ÐÑÐÐÐÐÑÑ.
-		</para>
-		<note>
-		  <title>ÐÐÑÐÑÑÐÑÐ ÐÑÑÐÐÑ ÐÐÐÐÐÑ ÐÐÐÐÑÐ</title>
-		  <para>
-			ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÑÑ ÐÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐÑÑ ÐÐÑÑÐÐÑÐ  
-			<application>&app;</application> ÐÐÐÐ ÑÐ ÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÑÐÑÐ
-			ÐÐÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐ 2.x ÐÐÐÑÑÐÑÐÑ. ÐÐÐÐ 2.x
-			ÐÐÑÐÑÑÐ UTF-8 ÐÐÐÐÐ ÐÐÐÐÑ ÐÐ ÑÐÐ ÑÐÐÐÐÐ Ð ÐÑÐÐÐ ÑÐÐÐ ÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ 
-			ÐÐÑ ÐÐÐÑÐÐÑÐÐÐÐÐÑ ÐÑÐÐÐÐÑÑ ÐÐÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐ 1.x ÐÐÐÑÑÐÑÐÑ.
-		  </para>
-		</note>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-<!--
-	After you have made all the changes you want, click on 
-	<guibutton>OK</guibutton> to apply the changes
-    and close the 
-    <interface>Properties</interface>dialog. To
-    cancel the changes and return to previous values, click the 
-    <guibutton>Close</guibutton>button.
--->
-    <para>
-	ÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÐ ÐÐÐÐÐÑÐ ÐÐÐÐÑ ÑÑÑÐÐÑÑ ÐÐ ÑÐÐÐÑ.
-    </para>
-  </sect1>
+      </variablelist>
 
+     <para>
+       The entries in the <guilabel>Profiles</guilabel> dialog are:
+     </para>
+
+      <figure id="gtranslator-profiles-dialog">
+      <title>Profiles Dialog</title>
+      <screenshot>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="figures/profiles-dialog.png" format="PNG"/>
+	  </imageobject>
+	  <textobject>
+	    <phrase>GtranslatorProfiles Dialog</phrase>
+	  </textobject>
+	</mediaobject>
+      </screenshot>
+      </figure>
+
+      <variablelist>
+	<varlistentry>
+	  <term><guilabel>Profile Name</guilabel></term>
+	  <listitem>
+	    <para>
+	      It is the name of the profile. It is what identify the profile and
+	      it must be unique.
+	    </para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Translator Name</guilabel></term>
+	  <listitem>
+	    <para>
+	      This is the name of the translator to fill the value in the header.
+	    </para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Translator Email</guilabel></term>
+	  <listitem>
+	    <para>
+	      This is the email addres of the translator to fill the value in the
+	      header.
+	    </para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Language</guilabel></term>
+	  <listitem>
+	    <para>
+	      The name of the language in which they will be done the translations.
+	    </para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Language Code</guilabel></term>
+	  <listitem>
+	    <para>
+	      This is the ISO 639-2 language code used for the language 
+	      chosen above. The name of the PO file will be based on this setting.
+	    </para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Character Set</guilabel></term>
+	  <listitem>
+	    <para>
+	      This is the character set for the PO files. Gnome 2.x uses UTF-8
+	      encoding for all languages.
+	    </para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Transfer Encoding</guilabel></term>
+	  <listitem>
+	    <para>
+	      This is the encoding used to store the PO file.
+	    </para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Team Email</guilabel></term>
+	  <listitem>
+	    <para>
+	      This is the email addres of the language team.
+	    </para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Plural Forms</guilabel></term>
+	  <listitem>
+	    <para>
+	      Information about the plural forms in the PO files.
+	    </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+      
+    </sect2>
+
+    <sect2 id="gtranslator-prefs-interface">
+      <title>Interface Tab</title>
+      
+      <para>
+	The 
+	<guilabel>Interface</guilabel> tab contains: 
+      </para>
+      
+      <figure id="gtranslator-preferences-interface">
+      <title>Interface Tab</title>
+      <screenshot>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="figures/prefs-interface.png" format="PNG"/>
+	  </imageobject>
+	  <textobject>
+	    <phrase>GtranslatorInterface Tab</phrase>
+	  </textobject>
+	</mediaobject>
+      </screenshot>
+      </figure>
+
+      <variablelist>
+	<varlistentry>
+	  <term><guilabel>Anchor Style</guilabel></term>
+	  <listitem>
+	    <para>
+	      This lets you choose if you want to see in the toolbar only
+	      the icons, the icons with the text or use the gnome preferences.
+	    </para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Scheme Color</guilabel></term>
+	  <listitem>
+	    <para>
+	      This is the scheme color in the original and translated boxes.
+	    </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+
+    </sect2>
+
+    <sect2 id="gtranslator-prefs-tm">
+      <title>Translation Memory Tab</title>
+
+      <para>
+	The 
+	 <guilabel>Translation Memory</guilabel> tab contains: 
+      </para>
+      
+      <figure id="gtranslator-preferences-tm">
+      <title>Translation Memory Tab</title>
+      <screenshot>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="figures/prefs-tm.png" format="PNG"/>
+	  </imageobject>
+	  <textobject>
+	    <phrase>GtranslatorTranslation Memory Tab</phrase>
+	  </textobject>
+	</mediaobject>
+      </screenshot>
+      </figure>
+
+      <variablelist>
+	<varlistentry>
+	  <term><guilabel>Sow options in translated messages</guilabel></term>
+	  <listitem>
+	    <para>
+	      With this option active <application>Gtranslator</application> shows you
+	      the translation memory options in all the messages including the
+	      translated ones. If it is no active only show options in fuzzy and
+	      untranslated messages.
+	    </para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Use only files with this name</guilabel></term>
+	  <listitem>
+	    <para>
+	      If this option is active the translation memory will be created
+	      only using the files with this name into the directory selected.
+	    </para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Max # of missing words</guilabel></term>
+	  <listitem>
+	    <para>
+	      
+	    </para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Max difference in sentence length</guilabel></term>
+	  <listitem>
+	    <para>
+	      It removes the selected profile.
+	    </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+
+    </sect2>
+
+    <sect2 id="gtranslator-prefs-plugins">
+      <title>Plugins Tab</title>
+    </sect2>
 
-<!-- ================ Bugs ================= -->
-  <sect1 id="gtranslator-bugs">
-    <title>ÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐ Ð ÐÐÑÐÐÐÑÐÑÐ</title>
-    <para>
-	ÐÐÐÐÑÐ ÐÑÐÑÑÐÐÐÐÐÑÐ ÐÑÐÑÐÐ ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÑÐÐ
-	<application>&app;</application> Ñ 
-	<ulink url="http://bugzilla.gnome.org";>ÐÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐÑÐÐÐÑ ÐÑÐÑÐÐÐ.</ulink>.
-    </para>
   </sect1>
 
 
-<!-- ================ Authors ================= -->
+  <!-- ================ Bugs ================= -->
+  <sect1 id="gtranslator-bugs">
+    <title>Known Bugs and Limitations</title>
+    <para>
+      You can query for bugs related to 
+      <application>Gtranslator</application> in the 
+      <ulink url="http://bugzilla.gnome.org";>
+	GNOME bug tracking database.
+      </ulink>.
+    </para>
+  </sect1>
+
+
+  <!-- ================ Authors ================= -->
   <sect1 id="gtranslator-authors">
-    <title>ÐÑÑÐÑÐ</title>
+    <title>Authors</title>
 
     <sect2 id="gtranslator-application-authors">
-      <title>ÐÑÑÐÑÐ ÐÑÐÐÑÐÐÐ</title>
-	<para>
-		<application>&app;</application> ÑÑ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑ ÐÐÐÐÑ (Fatih Demir) <email>kabalak gtranslator org</email> Ð ÐÐÐÐÐÐÐÐÑ ÐÐÑÐÐÑÑÐÐÑ (Gediminas Paulauskas) <email>menesis gtranslator org</email>.
-		ÐÐÑ ÐÐÑÐÐÐÑ (Ross Golder) <email>rossg golder org</email> ÑÐ ÑÑÐÐÑÑÐÐ ÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÐÑÐ2+ 2.x ÐÐÑÐÐÑÐ ÐÑÐÐÑÐÐÐ.
-		ÐÐÐÐ ÐÐ ÐÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÑÐÑÐ Ð ÐÑÐÐÑÐÐÑ <application>&app;</application>, ÐÐÐÐÐ ÐÐÑÐÑÐÑÐ
-		<ulink url="http://www.gtranslator.org"; type="http">ÐÐÑÐÑÐÐÑ ÑÑÑÐÐÐÑÑ ÐÑÐÑÐÐÑÐ</ulink>.
-		ÐÐÐÐÐ, ÐÐÑÐÑÐÑÐ ÑÐÐ ÐÐÐÐÐÐÑÐ, ÐÑÐÐÐÐÐÐ Ð ÐÑÐÑÐÐÐ ÐÑÐÑÐÐÐ ÐÐ
-		<ulink url="http://bugzilla.gnome.org"; type="http">ÐÐÐÐ ÐÑÐÐÐÐÐÑÑ</ulink>.
-		(ÐÐÑÑÑÑÐÐ ÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑÐ ÐÐÑÐÐÑ ÐÑÐÑÐÐÑ ÐÑÐÑÐÐÐ ÐÐÐÐÑÐ ÐÑÐÐÐÑÐ
-		<ulink url="http://bugzilla.gnome.org/Reporting.html"; type="http">ÐÐÐÐ</ulink>.)
-		ÐÐÐÐÑÐ, ÐÐÐÐÑÐ ÐÐÑÐÑÑÐÑÐ Ð ÑÐÐ ÐÑÐÐÑÐÐ ÐÐ ÐÑÐÑÐÐÑ ÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÑ <application>ÐÑÐÑ ÐÑÐÐ</application>
-		(<command>bug-buddy</command>), ÐÐÑÐ ÑÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐÑÑ:
-		<menuchoice>
-			<guimenu> âÐÑÐÐÑÐÐÐâ </guimenu>
-			<guisubmenu> âÐÑÐÐÑÐÐÐÑÐÑÐâ </guisubmenu>
-			<guisubmenu> âÐÑÐÑÐÐÐ ÐÑÐÑÐÐÐâ </guisubmenu>
-		</menuchoice> ÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐÐ Ð ÐÐÑÐÐÐÐ ÐÑÐÑÐÐÑ.
-	</para>
+      <title>Application Authors</title>
+      
+      <para>
+	<application>Gtranslator</application> was written originally by Fatih Demir <email>kabalak kabalak net</email> and Gediminas Paulauskas <email>menesis kabalak net</email>.
+	Ross Golder <email>rossg golder org</email> was the maintainer of GTK+ 2.x port of Gtranslator until October 2007.
+      </para>
+      
+      <para>
+	Most of the new version 2.0 was written by Pablo Sanxiao <email>psanxiao gmail com</email> and Ignacio Casal Quinteiro <email>nacho resa gmail com</email>. The current maintainers are Pablo Sanxiao and Juan Josà SÃnchez Penas 
+	<email>jjsanchez igalia com</email>.
+      </para>
+
+      <para>
+	To find more information about <application>Gtranslator</application>, please visit the 
+	<ulink url="http://gtranslator.sourceforge.net"; type="http">Gtranslator Web page</ulink>.
+	Please send all comments, suggestions, and bug reports to the
+	<ulink url="http://bugzilla.gnome.org"; type="http">GNOME bug tracking database</ulink>.
+	(Instructions for submitting bug reports can be found
+	<ulink url="http://bugzilla.gnome.org/Reporting.html"; type="http">on-line</ulink>.)
+	You can also use <application>Bug Report Tool</application>
+	(<command>bug-buddy</command>), available in the
+	<menuchoice>
+	  <guimenu>Application</guimenu>
+	  <guisubmenu>Development</guisubmenu>
+	</menuchoice> menu,
+	for submitting bug reports.
+      </para>
     </sect2>
 
 
     <sect2 id="gtranslator-contributor">
-      <title>ÐÐÑÐÐÐÐÑÐ</title>
-	<para>
-		Ð ÐÑÐÑÐÐÑÑ &app; ÑÑ ÑÑÐÑÑÐÐÐÐÐÐ:
-	</para>
+      <title>Contributors</title>
+      <para>
+	People who have contributed to the Gtranslator project:
+      </para>
 
-	<itemizedlist>
-		<listitem>
-		<para>
-			ÐÐÐÐÑ ÐÐÐÐÑ (Thomas Ziehmer) <email>thomas gtranslator org</email>
-			ÐÐÑÐ ÑÐ ÐÐÑÐÐÐÐ ÐÑÐÐÐÑÑÐ â âÐÑÐÐÐÑÐâ.
-		</para>
-		</listitem>
+      <itemizedlist>
+	<listitem>
+	  <para>
+	    SeÃn de BÃrca 
+	    <email>leftmostcat gmail co</email>
+	  </para>
+	</listitem>
 
-		<listitem>
-		<para>
-			<emphasis>ÐÐÐ</emphasis> ÐÑÐÐÐÐÐÐÑÐ ÐÑÐÐÑÐÐÐ
-			<application>&app;</application>.
-		</para>
-		</listitem>
+	<listitem>
+	  <para>
+	    Thomas Ziehmer <email>thomas kabalak net</email>
+	    for the find dialog implementation.
+	  </para>
+	</listitem>
 
-		<listitem>
-		<para>
-			ÐÐÐÐ I18N ÐÐÐÐÑÐÐ ÐÑÑÑÑÐÐ
-			<email>gnome-i18n gnome org</email>
-		</para>
-		</listitem>
+	<listitem>
+	  <para>
+	    <emphasis>All</emphasis> translators of 
+	    <application>Gtranslator</application>.
+	  </para>
+	</listitem>
 
-		<listitem>
-		<para>
-			ÐÐÐÐÑÐÐÐÑ ÐÐÑÑÐÐÐÑÑ (Alexandre Hautequest)
-			<email>hquest fesppr br</email>
-		</para>
-		</listitem>
+	<listitem>
+	  <para>
+	    The GNOME I18N mailing list
+	    <email>gnome-i18n gnome org</email>
+	  </para>
+	</listitem>
 
-		<listitem>
-		<para>
-			ÐÐÐÐÑ ÐÐÐÐÑ
-			<email>dpleic linux hr</email>
-		</para>
-		</listitem>
+	<listitem>
+	  <para>
+	    Alexandre Hautequest 
+	    <email>hquest fesppr br</email>
+	  </para>
+	</listitem>
 
-		<listitem>
-		<para>
-			ÐÐÑ ÐÐÐÑÐÐ (Josh Jackson)
-			<email>pturing mailandnews com</email>
-		</para>
-		</listitem>
+	<listitem>
+	  <para>
+	    Denis PleiÄ
+	    <email>dpleic linux hr</email>
+	  </para>
+	</listitem>
 
-		<listitem>
-		<para>
-			ÐÐÐÐÑÑ ÐÑÐÑÐÐ (Robert Brady)
-			<email>robert suse co uk</email>
-		</para>
-		</listitem>
+	<listitem>
+	  <para>
+	    Josh Jackson
+	    <email>pturing mailandnews com</email>
+	  </para>
+	</listitem>
+
+	<listitem>
+	  <para>
+	    Robert Brady
+	    <email>robert suse co uk</email>
+	  </para>
+	</listitem>
       </itemizedlist>
     </sect2>
 
-
     <sect2 id="gtranslator-packagers">
-      <title>ÐÑÑÐÑÐ ÐÐÐÐÑÐ</title>
+      <title>Packagers</title>
 
       <para>
-	ÐÐÐÐÐÐ ÐÐ ÐÐ ÐÐÑÐÐÐÐÐÐ ÑÐÐÐÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐÑ ÐÐÐÐÐÐÑÐÑÑÑÐÑ ÐÐÐÐÐÐ ÐÐÐÐÑÐ
-	ÐÐ ÐÑÐÐÑÐÐ <application>&app;</application>:
+	We would want to thank those persons for providing
+	packages in the corresponding formats of <application>Gtranslator</application>. 
       </para>
 
       <itemizedlist>
 	<listitem>
-	<para>
-		ÐÐÑ ÐÐÐÑÐÐ <email>pturing mailandnews com</email> ÑÐ ÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐ (ÐÐÐÐ. Mandrake)
-		ÐÐÐÐÑÐ ÐÑÐÐÑÐÐÐ <application>&app;</application> ÐÐ ÐÐÑÐÐÑÑ 0.34
-	</para>
+	  <para>
+	    Josh Jackshon <email>pturing mailandnews com</email> for
+	    his Mandrake packages of <application>Gtranslator</application> 0.34
+	  </para>
 	</listitem>
 
 	<listitem>
-	<para>
-		ÐÐÑÐ ÐÑÐÐÐ (Mike Newman) <email>mike gtnorthern demon co uk</email> ÑÐ ÐÑÐÑÐÐÐÐ
-		ÐÑÐÐÐÐÐÐÐ (RedHat) ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐ ÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐ (ÐÐÐÐ. (S)RPM) ÐÑÐÐÑÐÐÐ <application>&app;</application>.
-	</para>
+	  <para>
+	    Mike Newman <email>mike gtnorthern demon co uk</email> for
+	    his RH7 (S)RPMs of <application>Gtranslator</application>.
+	  </para>
 	</listitem>
 
 	<listitem>
-	<para>
-		ÐÐÑÑÐÐ ÐÐÐ ÐÐ ÐÑÑÐÐ (Martijn van de Streek) <email>martijn foodfight org</email> ÑÐ ÐÑÐÑÐÐÐÐ
-		<application>&app;</application> ÐÐÐÐÐÐ (Debian) ÐÐÐÐÑÐ.
-	</para>
+	  <para>
+	    Martijn van de Streek <email>martijn foodfight org</email> for
+	    his Debian packages of <application>Gtranslator</application>.
+	  </para>
 	</listitem>
 
 	<listitem>
-	<para>
-		ÐÐÐÑÐÐ ÐÐÐÐÐÐÐ (Maxim Sobolev) <email>sobomax freebsd org</email> ÑÐ ÐÑÐÑÐÐÐÐ
-		ÐÑÐÐÐÐ (FreeBSD) <application>&app;</application> ÐÐÑÑÐÐÐ.
-	</para>
+	  <para>
+	    Maxim Sobolev <email>sobomax freebsd org</email> for his
+	    FreeBSD ports of <application>Gtranslator</application>.
+	  </para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2 id="gtranslator-document-author">
-      <title>ÐÐÐÑÐÐÐÑÐÑÐÑÐ</title>
-	<para>
-		ÐÐÐ ÑÐÑÑÑÑÐÐ ÑÐ ÐÐÐÐÑÐÐ ÐÐÐÐ ÐÐÐÐÑ
-		(<email>emese gnome hu</email>). ÐÐÐÐÐ, ÐÐÑÐÑÐÑÐ ÑÐÐ ÐÐÐÐÐÐÑÐ 
-		Ð ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐ ÑÐÑÑÑÑÐÐ
-		<ulink url="http://developer.gnome.org/projects/gdp"; type="http">
-			ÐÐÐÐ ÐÑÐÑÐÐÑÑ ÐÐÐÑÐÐÐÑÐÑÐÑÐ
-		</ulink>
-		ÐÐÐÐÐÐÑÐ ÐÐÑÐÑÑ
-		<email>docs gnome org</email>.
-		ÐÐÐÐÑÐ, ÐÐÐÐÑÐ ÑÐÐÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÐÑÑÐÑÐÐ
-		<ulink url="http://developer.gnome.org/projects/gdp/doctable/"; type="http">
-			ÐÐÐÐ ÑÐÐÐÐÐ ÑÑÐÑÐ ÐÐÐÑÐÐÐÑÐÑÐÑÐ.
-		</ulink>.
-	</para>
+      <title>Documentation Authors</title>
+      <para>
+	This manual was written by Pablo Sanxiao (<email>psanxiao gmail com</email>) based on the
+	last version of the manual written by Emese Kovacs (<email>emese gnome hu</email>). 
+	Please send all comments and suggestions regarding this manual to the 
+	<ulink url="http://developer.gnome.org/projects/gdp"; type="http">
+	  GNOME Documentation Project
+	</ulink>
+	by sending an email to 
+	<email>docs gnome org</email>.
+	You can also add your comments online by using the 
+	<ulink url="http://developer.gnome.org/projects/gdp/doctable/"; type="http">
+	  GNOME Documentation Status Table
+	</ulink>.
+      </para>
     </sect2>
   </sect1>
 
-<!-- ================ Application License ================= -->
+  <!-- ================ Application License ================= -->
   <sect1 id="gtranslator-license">
-    <title>ÐÐÑÐÐÑÐ</title>
-	  <para>
-                  ÐÐÐÑ ÐÑÐÐÑÐÐ ÑÐ ÑÐÐÐÐÐÐÐ ÑÐÑÑÐÐÑ; ÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÐÐÑÐÐÐÑÐ Ð (ÐÐÐ) ÐÐÑÐÑÐ ÐÐÐ ÑÑÐÐÐÐÐÐ  
-		  <ulink type="help" url="gnome-help:gpl">
-			  <citetitle>ÐÐÐ-ÐÐÐ ÐÐÑÑÐ ÐÐÐÐÐ ÐÐÑÐÐÑÐ</citetitle>
-	          </ulink>
-                  ÐÐÑÑ ÑÐ ÐÐÑÐÐÐÐÐ âÐÐÐÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐÑâ ; ÐÐÐÐ Ñ ÐÐÑÐÐÑÐ 2 ÐÐÑÐÐÑÐ, ÐÐÐ (ÐÐ ÐÐÑÐÐ ÐÐÑÐÑÐÑÑ) Ñ ÐÐÐÐ ÐÐÑÐÑ ÐÐÐÐÐÐÐÐÑ ÐÐÑÐÐÑÐ.
-		  
-	  </para>
-	  <para>
-                  ÐÐÐÑ ÐÑÐÐÑÐÐ ÑÐ ÐÑÐÐÑÑÑÑÑÐ Ñ ÐÐÐÐ ÐÐ ÑÐ ÐÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐ, ÐÐÐ ÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ; ÑÐÐ Ð ÐÐÐ ÐÐÐÐÑÑÐÐÐÐÐ ÑÐÑÑÑÐÐÐÑÐ ÐÐÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐÐÐÐ ÐÑÐÑÐÐÑÑÐÐ ÐÐÐÐÐÑÐÑ ÐÐÐ ÑÐÐÐÐÐÑÐ Ñ ÐÐÑÐÑÐÐÑ ÐÐÐÐÐÑ.
-ÐÐ ÐÐÑÐ ÐÐÑÐÑÐ, ÐÐÐÐÐÐÐÑÑÐ
-		  <citetitle>ÐÐÐ-ÐÐÑ ÐÐÑÑÑ ÐÐÐÐÑ ÐÐÑÐÐÑÑ</citetitle>.
-          </para>
-	  <para>
-		  ÐÑÐÐÐÑÐÐ
-		  <citetitle>ÐÐÐ-ÐÐÐ ÐÐÑÑÐ ÐÐÐÐÐ ÐÐÑÐÐÑÐ</citetitle>
-ÑÐ ÑÐÑÑÑÐÐ ÐÐÐ ÑÐÐÐÐ ÐÐÐÐÑÐÐ ÑÐ
-		  <citetitle>ÐÐÐÐ-ÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐÐÐÑ</citetitle>.
-ÐÐÐÐÑÐ, ÐÐ ÐÐÐÐÑÐ ÐÐÑÑÐÐÐÑÐ ÐÑÐÐÐÑÐÐ 
-		  <citetitle>ÐÐÐ-ÐÐÐ ÐÐÑÑÐ ÐÐÐÐÐ ÐÐÑÐÐÑÐ</citetitle>
-ÐÐ âÐÐÐÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐÑâ ÐÐÐÐÑÐÐÐ ÐÐ 
-		  <ulink type="http" url="http://www.fsf.org";>
-			  ÑÐÑÐÐÑ ÐÐÑÐÑÐÐÑ ÑÑÑÐÐÑ
-		  </ulink>
-		  ÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÑÑ:
-		  <address>Free Software Foundation, Inc.
-			  <street>59 Temple Place</street> - Suite 330
-			  <city>Boston</city>,
-			  <state>MA</state>
-			  <postcode>02111-1307</postcode>
-			  <country>USA</country>
-		  </address>
-	  </para>
-  </sect1>
-
-
-  <sect1 id="gtranslator-glossary">
-    <title>ÐÐÑÐÐÐ</title>
+    <title>License</title>
     <para>
-      <variablelist>
-        <varlistentry>
-          <term>
-            <command>gettext</command>
-          </term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>ÐÐÑÐÑÐÐÑÐÐÐÐÐÐÐÐÑÐÑÐ</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>ÐÐÐÐÐÐÐÐÑÐÑÐ</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>l10n</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>i18n</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>ÐÑÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐ</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>ISO 3166 ÐÐÐ ÐÐÐÑÐ</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>ISO 639-2 ÑÐÐÐÑÐÐ ÐÐÐ</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐ ÑÐÐÑÐ</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>ÑÐÑÐ ÐÐÐÐÐÐÐ</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>ÐÐÐÐÑ</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>ÑÐÐÐÐÐÐÐÑÐÐ ÐÐÑÐÑÐ</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
+      This program is free software; you can redistribute
+      it and/or modify it under the terms of the 
+      <ulink type="help" url="gnome-help:gpl">
+	<citetitle>GNU General Public License</citetitle>
+      </ulink>
+      as published by the Free Software Foundation; either 
+      version 2 of the License, of (at your option) any later
+      version.
+    </para>
+    <para>
+      This program is distributed in the hope that it will be
+      useful, but WITHOUT ANY WARRANTY; without even the
+      implied warranty of MERCHANTABILITY or FITNESS FOR A 
+      PARTICULAR PURPOSE. See the
+      <citetitle>GNU General Public License</citetitle>
+      for more details.
+    </para>
+    <para>
+      A copy of the 
+      <citetitle>GNU General Public License</citetitle>
+      is included as an appendix to the 
+      <citetitle>GNOME Users Guide</citetitle>
+      . You may also obtain a copy of the 
+      <citetitle>GNU General Public License</citetitle>
+      from the Free Software Foundation by visiting
+      <ulink type="http" url="http://www.fsf.org";>
+	their Web site
+      </ulink>
+      or by writing to 
+      <address>Free Software Foundation, Inc.
+	<street>59 Temple Place</street> - Suite 330
+	<city>Boston</city>,
+	<state>MA</state>
+	<postcode>02111-1307</postcode>
+	<country>USA</country>
+      </address>
     </para>
   </sect1>
+
+
+  <!--   <sect1 id="gtranslator-glossary"> -->
+  <!--     <title>Glossary</title> -->
+  <!--     <para> -->
+  <!--       <variablelist> -->
+  <!--         <varlistentry> -->
+  <!--           <term> -->
+  <!--             <command>gettext</command> -->
+  <!--           </term> -->
+  <!--           <listitem> -->
+  <!--             <para></para> -->
+  <!--           </listitem> -->
+  <!--         </varlistentry> -->
+  <!--         <varlistentry> -->
+  <!--           <term>po file</term> -->
+  <!--           <listitem> -->
+  <!--             <para></para> -->
+  <!--           </listitem> -->
+  <!--         </varlistentry> -->
+  <!--         <varlistentry> -->
+  <!--           <term>internationalization</term> -->
+  <!--           <listitem> -->
+  <!--             <para></para> -->
+  <!--           </listitem> -->
+  <!--         </varlistentry> -->
+  <!--         <varlistentry> -->
+  <!--           <term>localization</term> -->
+  <!--           <listitem> -->
+  <!--             <para></para> -->
+  <!--           </listitem> -->
+  <!--         </varlistentry> -->
+  <!--         <varlistentry> -->
+  <!--           <term>l10n</term> -->
+  <!--           <listitem> -->
+  <!--             <para></para> -->
+  <!--           </listitem> -->
+  <!--         </varlistentry> -->
+  <!--         <varlistentry> -->
+  <!--           <term>i18n</term> -->
+  <!--           <listitem> -->
+  <!--             <para></para> -->
+  <!--           </listitem> -->
+  <!--         </varlistentry> -->
+  <!--         <varlistentry> -->
+  <!--           <term>translation memory</term> -->
+  <!--           <listitem> -->
+  <!--             <para></para> -->
+  <!--           </listitem> -->
+  <!--         </varlistentry> -->
+  <!--         <varlistentry> -->
+  <!--           <term>ISO 3166 coutry code</term> -->
+  <!--           <listitem> -->
+  <!--             <para></para> -->
+  <!--           </listitem> -->
+  <!--         </varlistentry> -->
+  <!--         <varlistentry> -->
+  <!--           <term>ISO 639-2 language code</term> -->
+  <!--           <listitem> -->
+  <!--             <para></para> -->
+  <!--           </listitem> -->
+  <!--         </varlistentry> -->
+  <!--         <varlistentry> -->
+  <!--           <term>default query domain</term> -->
+  <!--           <listitem> -->
+  <!--             <para></para> -->
+  <!--           </listitem> -->
+  <!--         </varlistentry> -->
+  <!--         <varlistentry> -->
+  <!--           <term>charset</term> -->
+  <!--           <listitem> -->
+  <!--             <para></para> -->
+  <!--           </listitem> -->
+  <!--         </varlistentry> -->
+  <!--         <varlistentry> -->
+  <!--           <term>encoding</term> -->
+  <!--           <listitem> -->
+  <!--             <para></para> -->
+  <!--           </listitem> -->
+  <!--         </varlistentry> -->
+  <!--         <varlistentry> -->
+  <!--           <term>URI</term> -->
+  <!--           <listitem> -->
+  <!--             <para></para> -->
+  <!--           </listitem> -->
+  <!--         </varlistentry> -->
+  <!--       </variablelist> -->
+  <!--     </para> -->
+  <!--   </sect1> -->
 </article>

Modified: trunk/src/actions-file.c
==============================================================================
--- trunk/src/actions-file.c	(original)
+++ trunk/src/actions-file.c	Mon Oct 27 16:55:27 2008
@@ -704,31 +704,53 @@
 	GList *list = NULL;
 	GList *profiles_list = NULL;
 	gchar *config_folder;
-	gchar *filename;
-	GFile *file;
-        
+	gchar *filename, *filename_temp;
+	GFile *file, *file_temp;
+	gint r;
+	
         config_folder = gtranslator_utils_get_user_config_dir ();
  	filename = g_build_filename (config_folder,
  				     "profiles.xml",
  				     NULL);
+	filename_temp = g_build_filename (g_get_tmp_dir (),
+					"profiles.xml",
+					NULL);
+	g_print ("Temp: %s\n", filename_temp);
 	
 	file = g_file_new_for_path (filename);
+	file_temp = g_file_new_for_path (filename_temp);
 	
 	profiles_list = gtranslator_application_get_profiles (GTR_APP);
-
-	if (profiles_list != NULL) {
-	  if (g_file_query_exists (file, NULL)) {
-	    g_file_delete (file, NULL, NULL);
-	    gtranslator_profile_save_profiles_in_xml (filename);
+	
+	
+	if (profiles_list != NULL) {		
+	  if (g_file_query_exists (file_temp, NULL)) {
+	    r = gtranslator_profile_save_profiles_in_xml (filename_temp);
 	  } else {
-	    g_file_create (file,
+	    g_file_create (file_temp,
 			   G_FILE_CREATE_NONE,
 			   NULL,
 			   NULL);
-	    gtranslator_profile_save_profiles_in_xml (filename);
+	    r = gtranslator_profile_save_profiles_in_xml (filename_temp);
 	  }
+	  if (r != -1)
+		{
+		  g_file_move (file_temp,
+			       file,
+			       G_FILE_COPY_OVERWRITE,
+			       NULL,
+			       NULL,
+			       NULL,
+			       NULL);
+		}
+		else
+		{
+			g_warning (N_("Failed to write profile data into profiles file '%s'"), filename);
+		}	
 	}
+	
 	g_free (config_folder);
+	g_object_unref (file_temp);
 	g_object_unref (file);
 
 	nb = gtranslator_window_get_notebook (window);

Modified: trunk/src/profile.c
==============================================================================
--- trunk/src/profile.c	(original)
+++ trunk/src/profile.c	Mon Oct 27 16:55:27 2008
@@ -339,7 +339,8 @@
   return profiles_list;
 }
 
-void gtranslator_profile_save_profiles_in_xml (gchar *filename) {
+gint
+gtranslator_profile_save_profiles_in_xml (gchar *filename) {
   
   xmlNodePtr root;
   xmlDocPtr doc;
@@ -361,5 +362,5 @@
     gtranslator_profile_xml_new_entry (doc, profile);
   }
   
-  xmlSaveFile (filename, doc);
+  return xmlSaveFile (filename, doc);
 }

Modified: trunk/src/profile.h
==============================================================================
--- trunk/src/profile.h	(original)
+++ trunk/src/profile.h	Mon Oct 27 16:55:27 2008
@@ -106,6 +106,6 @@
 
 GList          *gtranslator_profile_get_profiles_from_xml_file   (gchar *filename);
 
-void           gtranslator_profile_save_profiles_in_xml (gchar *filename);
+gint           gtranslator_profile_save_profiles_in_xml (gchar *filename);
 
 #endif /* __PROFILE_H__ */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]